diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-11 01:34:34 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-11 01:34:34 +0000 |
commit | 90a290ea62c7fce24bf5ded8ac33870762e042d1 (patch) | |
tree | ea549bbb963f790bff7fcf586d0ff54c9e72715b /keyboards/macrocat/keymaps | |
parent | 63915e84dc451ee4f39b04b1dc1d3ff765ebd950 (diff) | |
parent | c230d0658eb1e8293695d16ad93549b81059449f (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/macrocat/keymaps')
-rw-r--r-- | keyboards/macrocat/keymaps/default/keymap.c | 24 | ||||
-rw-r--r-- | keyboards/macrocat/keymaps/oled/keymap.c | 48 | ||||
-rw-r--r-- | keyboards/macrocat/keymaps/via/keymap.c | 48 |
3 files changed, 60 insertions, 60 deletions
diff --git a/keyboards/macrocat/keymaps/default/keymap.c b/keyboards/macrocat/keymaps/default/keymap.c index b173938b70..538dd03295 100644 --- a/keyboards/macrocat/keymaps/default/keymap.c +++ b/keyboards/macrocat/keymaps/default/keymap.c @@ -4,16 +4,16 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PLUS, KC_9, KC_8, KC_7 }, - {KC_MINS, KC_6, KC_5, KC_4 }, - {KC_DOT, KC_3, KC_2, KC_1 }, - {KC_ENT, KC_SPACE, KC_0, MO(1)} - }, - [1] = { - {KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, - {KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_0, KC_TRNS} - } + [0] = LAYOUT_ortho_4x4( + KC_PLUS, KC_9, KC_8, KC_7 , + KC_MINS, KC_6, KC_5, KC_4 , + KC_DOT, KC_3, KC_2, KC_1 , + KC_ENT, KC_SPACE, KC_0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT, + KC_SLSH, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_0, KC_TRNS + ) }; diff --git a/keyboards/macrocat/keymaps/oled/keymap.c b/keyboards/macrocat/keymaps/oled/keymap.c index b9d5d9a9df..c9864c1dc7 100644 --- a/keyboards/macrocat/keymaps/oled/keymap.c +++ b/keyboards/macrocat/keymaps/oled/keymap.c @@ -4,28 +4,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PLUS, KC_9, KC_8, KC_7 }, - {KC_MINS, KC_6, KC_5, KC_4 }, - {KC_DOT, KC_3, KC_2, KC_1 }, - {KC_ENT, KC_SPACE, KC_0, MO(1)} - }, - [1] = { - {KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT}, - {KC_SLSH, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_0, KC_TRNS} - }, - [2] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - }, - [3] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - } + [0] = LAYOUT_ortho_4x4( + KC_PLUS, KC_9, KC_8, KC_7 , + KC_MINS, KC_6, KC_5, KC_4 , + KC_DOT, KC_3, KC_2, KC_1 , + KC_ENT, KC_SPACE, KC_0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_ASTR, KC_MPRV, KC_MPLY,KC_MNXT, + KC_SLSH, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_0, KC_TRNS + ), + [2] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ), + [3] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ) }; diff --git a/keyboards/macrocat/keymaps/via/keymap.c b/keyboards/macrocat/keymaps/via/keymap.c index c10d6e1357..3a0df45fb7 100644 --- a/keyboards/macrocat/keymaps/via/keymap.c +++ b/keyboards/macrocat/keymaps/via/keymap.c @@ -4,28 +4,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = { - {KC_PPLS, KC_9, KC_8, KC_7 }, - {KC_PMNS, KC_6, KC_5, KC_4 }, - {KC_PDOT, KC_3, KC_2, KC_1 }, - {KC_PENT, KC_SPACE, KC_P0, MO(1)} - }, - [1] = { - {KC_PAST, KC_NO, KC_NO, KC_NO}, - {KC_PSLS, KC_LPRN, KC_UP, KC_RPRN}, - {KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT}, - {KC_TAB, KC_BSPC, KC_P0, KC_TRNS} - }, - [2] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - }, - [3] = { - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO}, - {KC_NO, KC_NO, KC_NO, KC_NO} - } + [0] = LAYOUT_ortho_4x4( + KC_PPLS, KC_9, KC_8, KC_7 , + KC_PMNS, KC_6, KC_5, KC_4 , + KC_PDOT, KC_3, KC_2, KC_1 , + KC_PENT, KC_SPACE, KC_P0, MO(1) + ), + [1] = LAYOUT_ortho_4x4( + KC_PAST, KC_NO, KC_NO, KC_NO, + KC_PSLS, KC_LPRN, KC_UP, KC_RPRN, + KC_COMM, KC_LEFT, KC_DOWN,KC_RIGHT, + KC_TAB, KC_BSPC, KC_P0, KC_TRNS + ), + [2] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ), + [3] = LAYOUT_ortho_4x4( + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO + ) }; |