diff options
| author | Danilo de Klerk <danilodeklerk@gmail.com> | 2020-08-06 19:36:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 10:36:26 -0700 |
| commit | c8b721d7c6cf683473bcf3d0af6ec561471b1dcc (patch) | |
| tree | 380de15fcd2c9ce1047fc3f2cefbeb8684f2a4c4 /keyboards/miniaxe | |
| parent | 60d8d8677aa596120e4f3f0926b93b4d5cc0201a (diff) | |
| download | qmk_firmware-c8b721d7c6cf683473bcf3d0af6ec561471b1dcc.tar.gz qmk_firmware-c8b721d7c6cf683473bcf3d0af6ec561471b1dcc.zip | |
split_3x5_3 layout support (#9624)
* Add split_3x5_3 support to Minidox
* Add split_3x5_3 support to Miniaxe
* Add LAYOUT_mini to Centromere
This layout macro removes the need or KC_NO keycodes in the keymap.
* Add split_3x5_3 support to Centromere
* Add split_3x5_3 support to suihankey split
* Add LAYOUT_mini to centromere/info.json
* Add LAYOUT_mini to crkbd
* Add split_3x5_3 support to crkbd
* Change mini layout names
* Rename main layouts for split_3x6_3 keyboards
* Use split_3x5_3 macro for remaining keyboards
* Update relevant info.json files
* Fix suihankey/split/alpha macro
* Add layout aliases for suihankey
Diffstat (limited to 'keyboards/miniaxe')
| -rw-r--r-- | keyboards/miniaxe/info.json | 2 | ||||
| -rw-r--r-- | keyboards/miniaxe/keymaps/default/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/miniaxe/miniaxe.h | 4 | ||||
| -rw-r--r-- | keyboards/miniaxe/rules.mk | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json index 5fee787b5..7461a548d 100644 --- a/keyboards/miniaxe/info.json +++ b/keyboards/miniaxe/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 11, | 5 | "width": 11, |
| 6 | "height": 4, | 6 | "height": 4, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_split_3x5_3": { |
| 9 | "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Cmd", "x":2, "y":3}, {"label":"⇓", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"Opt", "x":8, "y":3}] | 9 | "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Cmd", "x":2, "y":3}, {"label":"⇓", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"Opt", "x":8, "y":3}] |
| 10 | } | 10 | } |
| 11 | } | 11 | } |
diff --git a/keyboards/miniaxe/keymaps/default/keymap.c b/keyboards/miniaxe/keymaps/default/keymap.c index 4b405e202..fb8f6ca97 100644 --- a/keyboards/miniaxe/keymaps/default/keymap.c +++ b/keyboards/miniaxe/keymaps/default/keymap.c | |||
| @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 42 | * | GUI | LOWER|Ctrl/Esc| |Spc/Sft| RAISE|Alt/BkSp | | 42 | * | GUI | LOWER|Ctrl/Esc| |Spc/Sft| RAISE|Alt/BkSp | |
| 43 | * `--------------------' `--------------------' | 43 | * `--------------------' `--------------------' |
| 44 | */ | 44 | */ |
| 45 | [_QWERTY] = LAYOUT( \ | 45 | [_QWERTY] = LAYOUT_split_3x5_3( \ |
| 46 | KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ | 46 | KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ |
| 47 | KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ | 47 | KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ |
| 48 | KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ | 48 | KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ |
| @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 61 | * | | LOWER| | | Esc | RAISE| | | 61 | * | | LOWER| | | Esc | RAISE| | |
| 62 | * `--------------------' `--------------------' | 62 | * `--------------------' `--------------------' |
| 63 | */ | 63 | */ |
| 64 | [_RAISE] = LAYOUT( \ | 64 | [_RAISE] = LAYOUT_split_3x5_3( \ |
| 65 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ | 65 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ |
| 66 | KC_TAB, KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, KC_COLN, KC_DQUO, KC_GT, KC_LCBR, KC_RCBR, \ | 66 | KC_TAB, KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, KC_COLN, KC_DQUO, KC_GT, KC_LCBR, KC_RCBR, \ |
| 67 | KC_CAPS, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_SCLN, KC_QUOT, KC_LT, KC_LBRC, KC_RBRC, \ | 67 | KC_CAPS, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_SCLN, KC_QUOT, KC_LT, KC_LBRC, KC_RBRC, \ |
| @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 80 | * | | LOWER| | | | RAISE| | | 80 | * | | LOWER| | | | RAISE| | |
| 81 | * `--------------------' `--------------------' | 81 | * `--------------------' `--------------------' |
| 82 | */ | 82 | */ |
| 83 | [_LOWER] = LAYOUT( \ | 83 | [_LOWER] = LAYOUT_split_3x5_3( \ |
| 84 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ | 84 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ |
| 85 | KC_TAB, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ENT, \ | 85 | KC_TAB, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ENT, \ |
| 86 | KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, KC_DEL, KC_BSPC, KC_PGUP, KC_PGDN, KC_BSLS, KC_QUOT, \ | 86 | KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, KC_DEL, KC_BSPC, KC_PGUP, KC_PGDN, KC_BSLS, KC_QUOT, \ |
| @@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 100 | * | | LOWER| | | | RAISE| | | 100 | * | | LOWER| | | | RAISE| | |
| 101 | * `--------------------' `--------------------' | 101 | * `--------------------' `--------------------' |
| 102 | */ | 102 | */ |
| 103 | [_ADJUST] = LAYOUT( \ | 103 | [_ADJUST] = LAYOUT_split_3x5_3( \ |
| 104 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ | 104 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ |
| 105 | KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, \ | 105 | KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 106 | RESET, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \ | 106 | RESET, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, \ |
diff --git a/keyboards/miniaxe/miniaxe.h b/keyboards/miniaxe/miniaxe.h index a0130ad28..b6a605112 100644 --- a/keyboards/miniaxe/miniaxe.h +++ b/keyboards/miniaxe/miniaxe.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | // readability | 30 | // readability |
| 31 | #define ___ KC_NO | 31 | #define ___ KC_NO |
| 32 | 32 | ||
| 33 | #define LAYOUT( \ | 33 | #define LAYOUT_split_3x5_3( \ |
| 34 | L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ | 34 | L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ |
| 35 | L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ | 35 | L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ |
| 36 | L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ | 36 | L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ |
| @@ -48,3 +48,5 @@ | |||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | #endif | 50 | #endif |
| 51 | |||
| 52 | #define LAYOUT LAYOUT_split_3x5_3 | ||
diff --git a/keyboards/miniaxe/rules.mk b/keyboards/miniaxe/rules.mk index cf5efab09..7c5ef7d20 100644 --- a/keyboards/miniaxe/rules.mk +++ b/keyboards/miniaxe/rules.mk | |||
| @@ -35,3 +35,5 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs | |||
| 35 | DEBUG_ENABLE = no | 35 | DEBUG_ENABLE = no |
| 36 | CUSTOM_MATRIX = no # Use custom matrix code | 36 | CUSTOM_MATRIX = no # Use custom matrix code |
| 37 | SPLIT_KEYBOARD = yes # Use shared split_common code | 37 | SPLIT_KEYBOARD = yes # Use shared split_common code |
| 38 | |||
| 39 | LAYOUTS = split_3x5_3 | ||
