Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
48a7b50238
3 changed files with 28 additions and 28 deletions
|
@ -11,29 +11,29 @@
|
||||||
{"label":"=", "x":1, "y":0},
|
{"label":"=", "x":1, "y":0},
|
||||||
{"label":"(", "x":2, "y":0},
|
{"label":"(", "x":2, "y":0},
|
||||||
{"label":")", "x":3, "y":0},
|
{"label":")", "x":3, "y":0},
|
||||||
|
|
||||||
{"label":"-", "x":0, "y":1},
|
{"label":"-", "x":0, "y":1},
|
||||||
{"label":"*", "x":1, "y":1},
|
{"label":"*", "x":1, "y":1},
|
||||||
{"label":"/", "x":2, "y":1},
|
{"label":"/", "x":2, "y":1},
|
||||||
{"label":"Num Lock", "x":3, "y":1},
|
{"label":"Num Lock", "x":3, "y":1},
|
||||||
|
|
||||||
{"label":"+", "x":0, "y":2, "h":2},
|
|
||||||
{"label":"9", "x":1, "y":2},
|
{"label":"9", "x":1, "y":2},
|
||||||
{"label":"8", "x":2, "y":2},
|
{"label":"8", "x":2, "y":2},
|
||||||
{"label":"7", "x":3, "y":2},
|
{"label":"7", "x":3, "y":2},
|
||||||
|
|
||||||
|
{"label":"+", "x":0, "y":2, "h":2},
|
||||||
{"label":"6", "x":1, "y":3},
|
{"label":"6", "x":1, "y":3},
|
||||||
{"label":"5", "x":2, "y":3},
|
{"label":"5", "x":2, "y":3},
|
||||||
{"label":"4", "x":3, "y":3},
|
{"label":"4", "x":3, "y":3},
|
||||||
|
|
||||||
{"label":"Enter", "x":0, "y":4, "h":2},
|
|
||||||
{"label":"3", "x":1, "y":4},
|
{"label":"3", "x":1, "y":4},
|
||||||
{"label":"2", "x":2, "y":4},
|
{"label":"2", "x":2, "y":4},
|
||||||
{"label":"1", "x":3, "y":4},
|
{"label":"1", "x":3, "y":4},
|
||||||
|
|
||||||
|
{"label":"Enter", "x":0, "y":4, "h":2},
|
||||||
{"label":".", "x":1, "y":5},
|
{"label":".", "x":1, "y":5},
|
||||||
{"label":"0", "x":2, "y":5, "w":2}
|
{"label":"0", "x":2, "y":5, "w":2}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[0] = LAYOUT_numpad_6x4_southpaw( /* Base */
|
[0] = LAYOUT_numpad_6x4_southpaw( /* Base */
|
||||||
KC_BSPC, KC_EQL, KC_LPRN, KC_RPRN,
|
KC_BSPC, KC_EQL, KC_LPRN, KC_RPRN,
|
||||||
KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK,
|
KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK,
|
||||||
KC_P9, KC_P8, KC_P7,
|
KC_P9, KC_P8, KC_P7,
|
||||||
KC_PPLS, KC_P6, KC_P5, KC_P4,
|
KC_PPLS, KC_P6, KC_P5, KC_P4,
|
||||||
KC_P3, KC_P2, KC_P1,
|
KC_P3, KC_P2, KC_P1,
|
||||||
KC_PENT, KC_PDOT, KC_P0
|
KC_PENT, KC_PDOT, KC_P0
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,19 +26,19 @@
|
||||||
* represents the switch matrix.
|
* represents the switch matrix.
|
||||||
*/
|
*/
|
||||||
#define LAYOUT_numpad_6x4_southpaw( \
|
#define LAYOUT_numpad_6x4_southpaw( \
|
||||||
k00, k01, k02, k03, \
|
k00, k01, k02, k03, \
|
||||||
k10, k11, k12, k13, \
|
k10, k11, k12, k13, \
|
||||||
k21, k22, k23, \
|
k21, k22, k23, \
|
||||||
k20, k31, k32, k33, \
|
k20, k31, k32, k33, \
|
||||||
k41, k42, k43, \
|
k41, k42, k43, \
|
||||||
k40, k51, k53 \
|
k40, k51, k53 \
|
||||||
) \
|
) \
|
||||||
{ \
|
{ \
|
||||||
{ k00, k01, k02, k03 }, \
|
{ k00, k01, k02, k03 }, \
|
||||||
{ k10, k11, k12, k13 }, \
|
{ k10, k11, k12, k13 }, \
|
||||||
{ k20, k21, k22, k23 }, \
|
{ k20, k21, k22, k23 }, \
|
||||||
{ KC_NO, k31, k32, k33 }, \
|
{ KC_NO, k31, k32, k33 }, \
|
||||||
{ k40, k41, k42, k43 }, \
|
{ k40, k41, k42, k43 }, \
|
||||||
{ KC_NO, k51, KC_NO, k53 } \
|
{ KC_NO, k51, KC_NO, k53 } \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue