diff options
| author | QMK Bot <hello@qmk.fm> | 2023-09-19 23:42:53 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-09-19 23:42:53 +0000 |
| commit | 7bfd775a5c32942f9cdc65a2779920bc784c1549 (patch) | |
| tree | a35e4b9d7b2a7f91d2fe2bc6b2043a472b2e9b92 | |
| parent | f7f775a4efc39a3fc421ddee95b1d78ff26396be (diff) | |
| parent | 2742935c548bbd3506079eaf5d464e46d66218e2 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/sapuseven/macropad12/info.json | 5 | ||||
| -rw-r--r-- | keyboards/sapuseven/macropad12/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/sapuseven/macropad12/keymaps/via/keymap.c | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/keyboards/sapuseven/macropad12/info.json b/keyboards/sapuseven/macropad12/info.json index aafd8fcd0f..28e8c19bf8 100644 --- a/keyboards/sapuseven/macropad12/info.json +++ b/keyboards/sapuseven/macropad12/info.json @@ -22,8 +22,11 @@ "vid": "0x1209", "pid": "0x7337" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_3x4" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_3x4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/sapuseven/macropad12/keymaps/default/keymap.c b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c index 1cfa260103..3a498e6aaf 100644 --- a/keyboards/sapuseven/macropad12/keymaps/default/keymap.c +++ b/keyboards/sapuseven/macropad12/keymaps/default/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_3x4( KC_1, KC_2, KC_3, KC_PLUS, KC_4, KC_5, KC_6, KC_MINUS, KC_7, KC_8, KC_9, KC_0 diff --git a/keyboards/sapuseven/macropad12/keymaps/via/keymap.c b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c index 771c3efc9a..06879d1b43 100644 --- a/keyboards/sapuseven/macropad12/keymaps/via/keymap.c +++ b/keyboards/sapuseven/macropad12/keymaps/via/keymap.c @@ -17,22 +17,22 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_3x4( KC_1, KC_2, KC_3, KC_PLUS, KC_4, KC_5, KC_6, KC_MINUS, KC_7, KC_8, KC_9, KC_0 ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_3x4( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_3x4( KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24 ), - [3] = LAYOUT( + [3] = LAYOUT_ortho_3x4( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO |