diff options
| author | QMK Bot <hello@qmk.fm> | 2023-01-20 05:44:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-01-20 05:44:42 +0000 |
| commit | 560b981746ad5fb173d4f6e28e4b3b7dda317309 (patch) | |
| tree | f2657032e3ff7c3447fab8f4ecfdd30348fdac36 /keyboards/flehrad | |
| parent | 64c04640ce4f997eb564d21cdef9502aa24caa12 (diff) | |
| parent | 53cc6170ae2687b0c894f05738181a2f16ad0d6c (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/flehrad')
| -rw-r--r-- | keyboards/flehrad/numbrero/info.json | 8 | ||||
| -rw-r--r-- | keyboards/flehrad/numbrero/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/flehrad/numbrero/numbrero.h | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json index 30c93d035c..b900919920 100644 --- a/keyboards/flehrad/numbrero/info.json +++ b/keyboards/flehrad/numbrero/info.json @@ -8,8 +8,12 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT_numbrero_numpad": "LAYOUT_numpad", + "LAYOUT_numbrero_ortho": "LAYOUT_ortho" + }, "layouts": { - "LAYOUT_numbrero_numpad": { + "LAYOUT_numpad": { "layout": [ {"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, @@ -34,7 +38,7 @@ {"label":"K34", "x":4, "y":3, "h":2} ] }, - "LAYOUT_numbrero_ortho": { + "LAYOUT_ortho": { "layout": [ {"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, diff --git a/keyboards/flehrad/numbrero/keymaps/default/keymap.c b/keyboards/flehrad/numbrero/keymaps/default/keymap.c index 018839f779..9546c946da 100644 --- a/keyboards/flehrad/numbrero/keymaps/default/keymap.c +++ b/keyboards/flehrad/numbrero/keymaps/default/keymap.c @@ -2,14 +2,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_numbrero_numpad( + LAYOUT_numpad( KC_TRNS, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PENT), - LAYOUT_numbrero_ortho( + LAYOUT_ortho( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/flehrad/numbrero/numbrero.h b/keyboards/flehrad/numbrero/numbrero.h index c72e654078..e4de28bf96 100644 --- a/keyboards/flehrad/numbrero/numbrero.h +++ b/keyboards/flehrad/numbrero/numbrero.h @@ -2,7 +2,7 @@ #include "quantum.h" -#define LAYOUT_numbrero_numpad( \ +#define LAYOUT_numpad( \ K00, K01, K02, K03, K04, \ K10, K11, K12, K13, \ K20, K21, K22, K23, K14, \ @@ -15,7 +15,7 @@ { K30, K31, K32, K33, K34 }, \ { KC_NO, K41, KC_NO, K43, KC_NO } \ } -#define LAYOUT_numbrero_ortho(\ +#define LAYOUT_ortho(\ K00, K01, K02, K03, K04, \ K10, K11, K12, K13, K14, \ K20, K21, K22, K23, K24, \ |