diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-12-03 14:07:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 14:07:41 -0800 |
| commit | 138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b (patch) | |
| tree | 88649cb18f904e520115ddaef52901b4da8f7e50 | |
| parent | a5a65fb1e27dcbcdb3e489f1cbde9e7306522693 (diff) | |
| download | qmk_firmware-138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b.tar.gz qmk_firmware-138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b.zip | |
Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)
* Add LAYOUT_alice support: fallacy
* Add LAYOUT_alice support: kb_elmo/sesame
* Add LAYOUT_alice support: cheshire/curiosity
* Add LAYOUT_alice support: evyd13/wonderland
* Add LAYOUT_alice support: mechlovin/adelais
* Update LAYOUT_alice support: projectkb/alice
The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice.
This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added.
Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions.
* Update ramonimbao/aelith info.json
Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json.
* Fork `alice` Community Layout...
... into Standard and Split Backspace versions
Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version.
* Update LAYOUT_alice support: sneakbox/aliceclone
Rework the sneakbox/aliceclone to use the Split Backspace Alice layout.
* Update LAYOUT_alice support: zoo/wampus
The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added.
Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support.
* Update keyboards for `LAYOUT_alice_split_bs` support
* LAYOUT_alice_split_bs support: ergosaurus
* LAYOUT_alice_split_bs support: handwired/colorlice
* LAYOUT_alice(_split_bs) support: handwired/owlet60
* LAYOUT_alice_split_bs support: nightly_boards/alter/rev1
* LAYOUT_alice(_split_bs) support: sck/osa
* LAYOUT_alice_split_bs support: tgr/alice
* LAYOUT_alice(_split_bs) support: tkc/osav2
* LAYOUT_alice_split_bs support: xelus/valor/rev1
74 files changed, 933 insertions, 123 deletions
diff --git a/keyboards/cheshire/curiosity/curiosity.h b/keyboards/cheshire/curiosity/curiosity.h index e250eda8f..c26b03e20 100644 --- a/keyboards/cheshire/curiosity/curiosity.h +++ b/keyboards/cheshire/curiosity/curiosity.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * The second converts the arguments into a two-dimensional array which | 26 | * The second converts the arguments into a two-dimensional array which |
| 27 | * represents the switch matrix. | 27 | * represents the switch matrix. |
| 28 | */ | 28 | */ |
| 29 | #define LAYOUT_default( \ | 29 | #define LAYOUT_alice_split_bs( \ |
| 30 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ | 30 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ |
| 31 | K100, K101, K102, K103, K104, K105, K106, K108, K109, K110, K111, K112, K113, K114, K115, \ | 31 | K100, K101, K102, K103, K104, K105, K106, K108, K109, K110, K111, K112, K113, K114, K115, \ |
| 32 | K200, K201, K202, K203, K204, K205, K206, K208, K209, K210, K211, K212, K213, K215, \ | 32 | K200, K201, K202, K203, K204, K205, K206, K208, K209, K210, K211, K212, K213, K215, \ |
| @@ -40,3 +40,20 @@ | |||
| 40 | { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \ | 40 | { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \ |
| 41 | { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \ | 41 | { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \ |
| 42 | } | 42 | } |
| 43 | |||
| 44 | #define LAYOUT_alice( \ | ||
| 45 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ | ||
| 46 | K100, K101, K102, K103, K104, K105, K106, K108, K109, K110, K111, K112, K113, K114, K115, \ | ||
| 47 | K200, K201, K202, K203, K204, K205, K206, K208, K209, K210, K211, K212, K213, K215, \ | ||
| 48 | K301, K302, K303, K304, K305, K306, K308, K309, K310, K311, K312, K313, K314, K315, \ | ||
| 49 | K401, K403, K405, K406, K409, K411, K414 \ | ||
| 50 | ) \ | ||
| 51 | { \ | ||
| 52 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \ | ||
| 53 | { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \ | ||
| 54 | { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \ | ||
| 55 | { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \ | ||
| 56 | { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \ | ||
| 57 | } | ||
| 58 | |||
| 59 | #define LAYOUT_default LAYOUT_alice_split_bs | ||
diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json index f98954658..d9a28d016 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/info.json | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | "width": 19.75, | 4 | "width": 19.75, |
| 5 | "height": 5.25, | 5 | "height": 5.25, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "LAYOUT_default": { | 7 | "LAYOUT_alice_split_bs": { |
| 8 | "layout": [ | 8 | "layout": [ |
| 9 | {"label":"Esc", "x":0.5, "y":0}, | 9 | {"label":"Esc", "x":0.5, "y":0}, |
| 10 | {"label":"`", "x":1.75, "y":0.25}, | 10 | {"label":"`", "x":1.75, "y":0.25}, |
| @@ -77,6 +77,79 @@ | |||
| 77 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | 77 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, |
| 78 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | 78 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} |
| 79 | ] | 79 | ] |
| 80 | }, | ||
| 81 | "LAYOUT_alice": { | ||
| 82 | "layout": [ | ||
| 83 | {"label":"Esc", "x":0.5, "y":0}, | ||
| 84 | {"label":"`", "x":1.75, "y":0.25}, | ||
| 85 | {"label":"1", "x":2.75, "y":0.25}, | ||
| 86 | {"label":"2", "x":3.75, "y":0}, | ||
| 87 | {"label":"3", "x":4.75, "y":0.25}, | ||
| 88 | {"label":"4", "x":5.75, "y":0.25}, | ||
| 89 | {"label":"5", "x":6.75, "y":0.25}, | ||
| 90 | {"label":"6", "x":7.75, "y":0.25}, | ||
| 91 | {"label":"7", "x":11, "y":0.25}, | ||
| 92 | {"label":"8", "x":12, "y":0.25}, | ||
| 93 | {"label":"9", "x":13, "y":0.25}, | ||
| 94 | {"label":"0", "x":14, "y":0.25}, | ||
| 95 | {"label":"-", "x":15, "y":0}, | ||
| 96 | {"label":"=", "x":16, "y":0.25}, | ||
| 97 | {"label":"Backspace", "x":17, "y":0.25, "w":2}, | ||
| 98 | |||
| 99 | {"label":"PgUp", "x":0.25, "y":1}, | ||
| 100 | {"label":"Tab", "x":1.5, "y":1.25, "w":1.5}, | ||
| 101 | {"label":"Q", "x":3, "y":1.25}, | ||
| 102 | {"label":"W", "x":4.25, "y":1.25}, | ||
| 103 | {"label":"E", "x":5.25, "y":1.25}, | ||
| 104 | {"label":"R", "x":6.25, "y":1.25}, | ||
| 105 | {"label":"T", "x":7.25, "y":1.25}, | ||
| 106 | {"label":"Y", "x":10.5, "y":1.25}, | ||
| 107 | {"label":"U", "x":11.5, "y":1.25}, | ||
| 108 | {"label":"I", "x":12.5, "y":1.25}, | ||
| 109 | {"label":"O", "x":13.5, "y":1.25}, | ||
| 110 | {"label":"P", "x":14.75, "y":1.25}, | ||
| 111 | {"label":"{", "x":15.75, "y":1.25}, | ||
| 112 | {"label":"}", "x":16.75, "y":1.25}, | ||
| 113 | {"label":"|", "x":17.75, "y":1.25, "w":1.5}, | ||
| 114 | |||
| 115 | {"label":"PgDn", "x":0, "y":2}, | ||
| 116 | {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75}, | ||
| 117 | {"label":"A", "x":3.25, "y":2.25}, | ||
| 118 | {"label":"S", "x":4.5, "y":2.25}, | ||
| 119 | {"label":"D", "x":5.5, "y":2.25}, | ||
| 120 | {"label":"F", "x":6.5, "y":2.25}, | ||
| 121 | {"label":"G", "x":7.5, "y":2.25}, | ||
| 122 | {"label":"H", "x":10.75, "y":2.25}, | ||
| 123 | {"label":"J", "x":11.75, "y":2.25}, | ||
| 124 | {"label":"K", "x":12.75, "y":2.25}, | ||
| 125 | {"label":"L", "x":13.75, "y":2.25}, | ||
| 126 | {"label":":", "x":15.25, "y":2.25}, | ||
| 127 | {"label":"\"", "x":16.25, "y":2.25}, | ||
| 128 | {"label":"Enter", "x":17.25, "y":2.25, "w":2.25}, | ||
| 129 | |||
| 130 | {"label":"Shift", "x":1.5, "y":3.25, "w":2.25}, | ||
| 131 | {"label":"Z", "x":3.75, "y":3.25}, | ||
| 132 | {"label":"X", "x":5, "y":3.25}, | ||
| 133 | {"label":"C", "x":6, "y":3.25}, | ||
| 134 | {"label":"V", "x":7, "y":3.25}, | ||
| 135 | {"label":"B", "x":8, "y":3.25}, | ||
| 136 | {"label":"Fn", "x":10.25, "y":3.25}, | ||
| 137 | {"label":"N", "x":11.25, "y":3.25}, | ||
| 138 | {"label":"M", "x":12.25, "y":3.25}, | ||
| 139 | {"label":"<", "x":13.25, "y":3.25}, | ||
| 140 | {"label":">", "x":15, "y":3.25}, | ||
| 141 | {"label":"?", "x":16, "y":3.25}, | ||
| 142 | {"label":"Shift", "x":17, "y":3.25, "w":1.75}, | ||
| 143 | {"label":"Fn", "x":18.75, "y":3.25}, | ||
| 144 | |||
| 145 | {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5}, | ||
| 146 | {"label":"Alt", "x":5, "y":4.25, "w":1.5}, | ||
| 147 | {"label":"Space", "x":6.5, "y":4.25, "w":2}, | ||
| 148 | {"label":"Menu", "x":8.5, "y":4.25}, | ||
| 149 | {"label":"Space", "x":10.25, "y":4.25, "w":2.75}, | ||
| 150 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | ||
| 151 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | ||
| 152 | ] | ||
| 80 | } | 153 | } |
| 81 | } | 154 | } |
| 82 | } | 155 | } |
diff --git a/keyboards/cheshire/curiosity/rules.mk b/keyboards/cheshire/curiosity/rules.mk index 354465a08..d9a7d86ab 100644 --- a/keyboards/cheshire/curiosity/rules.mk +++ b/keyboards/cheshire/curiosity/rules.mk | |||
| @@ -15,3 +15,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 15 | NKRO_ENABLE = no # USB Nkey Rollover | 15 | NKRO_ENABLE = no # USB Nkey Rollover |
| 16 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 16 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 17 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 17 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 18 | |||
| 19 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk index 462340c73..d35a6a659 100644 --- a/keyboards/coarse/cordillera/rules.mk +++ b/keyboards/coarse/cordillera/rules.mk | |||
| @@ -18,5 +18,7 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
| 18 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 18 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 19 | AUDIO_ENABLE = no # Audio output | 19 | AUDIO_ENABLE = no # Audio output |
| 20 | 20 | ||
| 21 | LAYOUTS = alice alice_split_bs | ||
| 22 | |||
| 21 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 23 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
| 22 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 24 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/ergosaurus/ergosaurus.h index c78a2db32..cef594993 100644 --- a/keyboards/ergosaurus/ergosaurus.h +++ b/keyboards/ergosaurus/ergosaurus.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #define KNO KC_NO | 20 | #define KNO KC_NO |
| 21 | 21 | ||
| 22 | #define LAYOUT( \ | 22 | #define LAYOUT_alice_split_bs( \ |
| 23 | K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ | 23 | K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ |
| 24 | K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ | 24 | K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ |
| 25 | K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \ | 25 | K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \ |
| @@ -36,3 +36,5 @@ | |||
| 36 | { KNO, K71, K72, K73, K74, K75, K76, KNO }, \ | 36 | { KNO, K71, K72, K73, K74, K75, K76, KNO }, \ |
| 37 | { K80, K81, K82, K83, K84, K85, KNO, K87 } \ | 37 | { K80, K81, K82, K83, K84, K85, KNO, K87 } \ |
| 38 | } | 38 | } |
| 39 | |||
| 40 | #define LAYOUT LAYOUT_alice_split_bs | ||
diff --git a/keyboards/ergosaurus/info.json b/keyboards/ergosaurus/info.json index 97873afd2..13fda81f8 100644 --- a/keyboards/ergosaurus/info.json +++ b/keyboards/ergosaurus/info.json | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | "width": 19.75, | 4 | "width": 19.75, |
| 5 | "height": 5.25, | 5 | "height": 5.25, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "LAYOUT": { | 7 | "LAYOUT_alice_split_bs": { |
| 8 | "layout": [ | 8 | "layout": [ |
| 9 | {"label":"`", "x":0.5, "y":0}, | 9 | {"label":"`", "x":0.5, "y":0}, |
| 10 | {"label":"Esc", "x":1.75, "y":0.25}, | 10 | {"label":"Esc", "x":1.75, "y":0.25}, |
diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/ergosaurus/keymaps/default/keymap.c index 565906e03..42cf9082e 100644 --- a/keyboards/ergosaurus/keymaps/default/keymap.c +++ b/keyboards/ergosaurus/keymaps/default/keymap.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 23 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 24 | [BASE] = LAYOUT( | 24 | [BASE] = LAYOUT_alice_split_bs( |
| 25 | KC_GRV, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, | 25 | KC_GRV, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, |
| 26 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | 26 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, |
| 27 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 27 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 29 | KC_LGUI, KC_LALT, KC_ENT, MO(RAISE), KC_SPC, KC_RALT, KC_RCTL | 29 | KC_LGUI, KC_LALT, KC_ENT, MO(RAISE), KC_SPC, KC_RALT, KC_RCTL |
| 30 | ), | 30 | ), |
| 31 | 31 | ||
| 32 | [LOWER] = LAYOUT( | 32 | [LOWER] = LAYOUT_alice_split_bs( |
| 33 | _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 33 | _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
| 34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, | 34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, |
| 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, | 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, |
| @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 37 | _______, _______, _______, _______, _______, _______, _______ | 37 | _______, _______, _______, _______, _______, _______, _______ |
| 38 | ), | 38 | ), |
| 39 | 39 | ||
| 40 | [RAISE] = LAYOUT( | 40 | [RAISE] = LAYOUT_alice_split_bs( |
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, | 42 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, |
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, | 43 | _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, |
diff --git a/keyboards/ergosaurus/rules.mk b/keyboards/ergosaurus/rules.mk index 62676d1c5..f504ffaeb 100644 --- a/keyboards/ergosaurus/rules.mk +++ b/keyboards/ergosaurus/rules.mk | |||
| @@ -30,3 +30,5 @@ UNICODE_ENABLE = no # Unicode | |||
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 31 | AUDIO_ENABLE = no # Audio output on port C6 |
| 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 33 | |||
| 34 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 678b08142..a98ee650c 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 18.25, | 5 | "width": 18.25, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "key_count": 66, | 9 | "key_count": 66, |
| 10 | "layout": [ | 10 | "layout": [ |
| 11 | {"label":"k10", "x":0, "y":0}, | 11 | {"label":"k10", "x":0, "y":0}, |
| @@ -75,6 +75,75 @@ | |||
| 75 | {"label":"k4a", "x":12.25, "y":4, "w":1.5}, | 75 | {"label":"k4a", "x":12.25, "y":4, "w":1.5}, |
| 76 | {"label":"k4e", "x":16.75, "y":4, "w":1.5} | 76 | {"label":"k4e", "x":16.75, "y":4, "w":1.5} |
| 77 | ] | 77 | ] |
| 78 | }, | ||
| 79 | "LAYOUT_alice": { | ||
| 80 | "layout": [ | ||
| 81 | {"label":"k10", "x":0, "y":0}, | ||
| 82 | {"label":"k00", "x":1.25, "y":0}, | ||
| 83 | {"label":"k01", "x":2.25, "y":0}, | ||
| 84 | {"label":"k02", "x":3.25, "y":0}, | ||
| 85 | {"label":"k03", "x":4.25, "y":0}, | ||
| 86 | {"label":"k04", "x":5.25, "y":0}, | ||
| 87 | {"label":"k05", "x":6.25, "y":0}, | ||
| 88 | {"label":"k06", "x":7.25, "y":0}, | ||
| 89 | {"label":"k07", "x":10.25, "y":0}, | ||
| 90 | {"label":"k08", "x":11.25, "y":0}, | ||
| 91 | {"label":"k09", "x":12.25, "y":0}, | ||
| 92 | {"label":"k0a", "x":13.25, "y":0}, | ||
| 93 | {"label":"k0b", "x":14.25, "y":0}, | ||
| 94 | {"label":"k0c", "x":15.25, "y":0}, | ||
| 95 | {"label":"k0e", "x":16.25, "y":0, "w":2}, | ||
| 96 | {"label":"k20", "x":0, "y":1}, | ||
| 97 | {"label":"k11", "x":1.25, "y":1, "w":1.5}, | ||
| 98 | {"label":"k12", "x":2.75, "y":1}, | ||
| 99 | {"label":"k13", "x":3.75, "y":1}, | ||
| 100 | {"label":"k14", "x":4.75, "y":1}, | ||
| 101 | {"label":"k15", "x":5.75, "y":1}, | ||
| 102 | {"label":"k16", "x":6.75, "y":1}, | ||
| 103 | {"label":"k17", "x":9.75, "y":1}, | ||
| 104 | {"label":"k18", "x":10.75, "y":1}, | ||
| 105 | {"label":"k19", "x":11.75, "y":1}, | ||
| 106 | {"label":"k1a", "x":12.75, "y":1}, | ||
| 107 | {"label":"k1b", "x":13.75, "y":1}, | ||
| 108 | {"label":"k1c", "x":14.75, "y":1}, | ||
| 109 | {"label":"k1d", "x":15.75, "y":1}, | ||
| 110 | {"label":"k1e", "x":16.75, "y":1, "w":1.5}, | ||
| 111 | {"label":"k30", "x":0, "y":2}, | ||
| 112 | {"label":"k21", "x":1.25, "y":2, "w":1.75}, | ||
| 113 | {"label":"k22", "x":3, "y":2}, | ||
| 114 | {"label":"k23", "x":4, "y":2}, | ||
| 115 | {"label":"k24", "x":5, "y":2}, | ||
| 116 | {"label":"k25", "x":6, "y":2}, | ||
| 117 | {"label":"k26", "x":7, "y":2}, | ||
| 118 | {"label":"k27", "x":10, "y":2}, | ||
| 119 | {"label":"k28", "x":11, "y":2}, | ||
| 120 | {"label":"k29", "x":12, "y":2}, | ||
| 121 | {"label":"k2a", "x":13, "y":2}, | ||
| 122 | {"label":"k2b", "x":14, "y":2}, | ||
| 123 | {"label":"k2c", "x":15, "y":2}, | ||
| 124 | {"label":"k2e", "x":16, "y":2, "w":2.25}, | ||
| 125 | {"label":"k31", "x":1.25, "y":3, "w":2.25}, | ||
| 126 | {"label":"k32", "x":3.5, "y":3}, | ||
| 127 | {"label":"k33", "x":4.5, "y":3}, | ||
| 128 | {"label":"k34", "x":5.5, "y":3}, | ||
| 129 | {"label":"k35", "x":6.5, "y":3}, | ||
| 130 | {"label":"k36", "x":7.5, "y":3}, | ||
| 131 | {"label":"k37", "x":9.5, "y":3}, | ||
| 132 | {"label":"k38", "x":10.5, "y":3}, | ||
| 133 | {"label":"k39", "x":11.5, "y":3}, | ||
| 134 | {"label":"k3a", "x":12.5, "y":3}, | ||
| 135 | {"label":"k3b", "x":13.5, "y":3}, | ||
| 136 | {"label":"k3c", "x":14.5, "y":3}, | ||
| 137 | {"label":"k3d", "x":15.5, "y":3, "w":1.75}, | ||
| 138 | {"label":"k3e", "x":17.25, "y":3}, | ||
| 139 | {"label":"k41", "x":1.25, "y":4, "w":1.5}, | ||
| 140 | {"label":"k43", "x":4.25, "y":4, "w":1.5}, | ||
| 141 | {"label":"k45", "x":5.75, "y":4, "w":2}, | ||
| 142 | {"label":"k46", "x":7.75, "y":4, "w":1.25}, | ||
| 143 | {"label":"k48", "x":9.5, "y":4, "w":2.75}, | ||
| 144 | {"label":"k4a", "x":12.25, "y":4, "w":1.5}, | ||
| 145 | {"label":"k4e", "x":16.75, "y":4, "w":1.5} | ||
| 146 | ] | ||
| 78 | } | 147 | } |
| 79 | } | 148 | } |
| 80 | } | 149 | } |
diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk index 3a7e92f4d..1f671c37c 100644 --- a/keyboards/evyd13/wonderland/rules.mk +++ b/keyboards/evyd13/wonderland/rules.mk | |||
| @@ -29,3 +29,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 29 | AUTO_SHIFT_ENABLE = no | 29 | AUTO_SHIFT_ENABLE = no |
| 30 | VELOCIKEY_ENABLE = yes | 30 | VELOCIKEY_ENABLE = yes |
| 31 | 31 | ||
| 32 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h index 075e3f64b..13ea14763 100644 --- a/keyboards/evyd13/wonderland/wonderland.h +++ b/keyboards/evyd13/wonderland/wonderland.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | // readability | 4 | // readability |
| 5 | #define XXX KC_NO | 5 | #define XXX KC_NO |
| 6 | #define LAYOUT( \ | 6 | #define LAYOUT_alice_split_bs( \ |
| 7 | k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ | 7 | k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ |
| 8 | k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ | 8 | k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ |
| 9 | k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ | 9 | k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ |
| @@ -18,5 +18,22 @@ | |||
| 18 | {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \ | 18 | {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \ |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | #define LAYOUT_alice( \ | ||
| 22 | k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \ | ||
| 23 | k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ | ||
| 24 | k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ | ||
| 25 | k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ | ||
| 26 | k41, k43, k45, k46, k48, k4a, k4e \ | ||
| 27 | ) \ | ||
| 28 | { \ | ||
| 29 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \ | ||
| 30 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ | ||
| 31 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \ | ||
| 32 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ | ||
| 33 | {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \ | ||
| 34 | } | ||
| 35 | |||
| 36 | #define LAYOUT LAYOUT_alice_split_bs | ||
| 37 | |||
| 21 | void matrix_init_user(void); | 38 | void matrix_init_user(void); |
| 22 | void matrix_scan_user(void); | 39 | void matrix_scan_user(void); |
diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h index 46480e668..b77c81fa1 100755 --- a/keyboards/fallacy/fallacy.h +++ b/keyboards/fallacy/fallacy.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * - Split Backspace | 21 | * - Split Backspace |
| 22 | * - Split Right Shift | 22 | * - Split Right Shift |
| 23 | */ | 23 | */ |
| 24 | #define LAYOUT_all( \ | 24 | #define LAYOUT_alice_split_bs( \ |
| 25 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | 25 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ |
| 26 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | 26 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ |
| 27 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ | 27 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ |
| @@ -39,7 +39,7 @@ | |||
| 39 | * - Full size Backspace | 39 | * - Full size Backspace |
| 40 | * - Full size Right Shift | 40 | * - Full size Right Shift |
| 41 | */ | 41 | */ |
| 42 | #define LAYOUT_default( \ | 42 | #define LAYOUT_alice( \ |
| 43 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ | 43 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ |
| 44 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | 44 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ |
| 45 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ | 45 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ |
| @@ -52,3 +52,6 @@ | |||
| 52 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ | 52 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ |
| 53 | { KC_NO, K401, KC_NO, K403, KC_NO, K405, K406, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, KC_NO, K414 } \ | 53 | { KC_NO, K401, KC_NO, K403, KC_NO, K405, K406, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, KC_NO, K414 } \ |
| 54 | } | 54 | } |
| 55 | |||
| 56 | #define LAYOUT_default LAYOUT_alice | ||
| 57 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index fe30e1bfe..a8cf6b0a5 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | "width": 18.75, | 4 | "width": 18.75, |
| 5 | "height": 5, | 5 | "height": 5, |
| 6 | "layouts": { | 6 | "layouts": { |
| 7 | "LAYOUT_all": { | 7 | "LAYOUT_alice_split_bs": { |
| 8 | "layout": [ | 8 | "layout": [ |
| 9 | {"label":"Esc", "x":0.5, "y":0}, | 9 | {"label":"Esc", "x":0.5, "y":0}, |
| 10 | {"label":"~", "x":1.75, "y":0}, | 10 | {"label":"~", "x":1.75, "y":0}, |
| @@ -74,7 +74,7 @@ | |||
| 74 | {"label":"RCtl", "x":17, "y":4, "w":1.5} | 74 | {"label":"RCtl", "x":17, "y":4, "w":1.5} |
| 75 | ] | 75 | ] |
| 76 | }, | 76 | }, |
| 77 | "LAYOUT_default": { | 77 | "LAYOUT_alice": { |
| 78 | "layout": [ | 78 | "layout": [ |
| 79 | {"label":"Esc", "x":0.5, "y":0}, | 79 | {"label":"Esc", "x":0.5, "y":0}, |
| 80 | {"label":"~", "x":1.75, "y":0}, | 80 | {"label":"~", "x":1.75, "y":0}, |
diff --git a/keyboards/fallacy/keymaps/default/keymap.c b/keyboards/fallacy/keymaps/default/keymap.c index d0e32c42c..45afc4542 100755 --- a/keyboards/fallacy/keymaps/default/keymap.c +++ b/keyboards/fallacy/keymaps/default/keymap.c | |||
| @@ -17,14 +17,14 @@ | |||
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | 19 | ||
| 20 | [0] = LAYOUT_default( | 20 | [0] = LAYOUT_alice( |
| 21 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 21 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 22 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 22 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 23 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 23 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_RGUI, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_RGUI, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), |
| 25 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), | 25 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), |
| 26 | 26 | ||
| 27 | [1] = LAYOUT_default( | 27 | [1] = LAYOUT_alice( |
| 28 | KC_TRNS, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | 28 | KC_TRNS, RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F11, KC_F12, KC_TRNS, KC_TRNS, |
| 29 | 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, | 29 | 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, |
| 30 | 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, | 30 | 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/fallacy/rules.mk b/keyboards/fallacy/rules.mk index 1ab94f774..c3c94521b 100755 --- a/keyboards/fallacy/rules.mk +++ b/keyboards/fallacy/rules.mk | |||
| @@ -27,3 +27,5 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
| 27 | SRC += indicators.c \ | 27 | SRC += indicators.c \ |
| 28 | drivers/issi/is31fl3731-simple.c | 28 | drivers/issi/is31fl3731-simple.c |
| 29 | QUANTUM_LIB_SRC += i2c_master.c | 29 | QUANTUM_LIB_SRC += i2c_master.c |
| 30 | |||
| 31 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h index c1e88abe8..dbf31f568 100644 --- a/keyboards/handwired/colorlice/colorlice.h +++ b/keyboards/handwired/colorlice/colorlice.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * The second converts the arguments into a two-dimensional array which | 26 | * The second converts the arguments into a two-dimensional array which |
| 27 | * represents the switch matrix. | 27 | * represents the switch matrix. |
| 28 | */ | 28 | */ |
| 29 | #define LAYOUT( \ | 29 | #define LAYOUT_alice_split_bs( \ |
| 30 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ | 30 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ |
| 31 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ | 31 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ |
| 32 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, \ | 32 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, \ |
| @@ -40,3 +40,4 @@ | |||
| 40 | { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO,KC_NO, KC_NO, k4e, KC_NO }, \ | 40 | { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO,KC_NO, KC_NO, k4e, KC_NO }, \ |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | #define LAYOUT LAYOUT_alice_split_bs | ||
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 0b2887625..85deaed42 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 17.75, | 5 | "width": 17.75, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"K63", "x":0, "y":0}, | 10 | {"label":"K63", "x":0, "y":0}, |
| 11 | {"label":"K00", "x":1.25, "y":0}, | 11 | {"label":"K00", "x":1.25, "y":0}, |
diff --git a/keyboards/handwired/colorlice/keymaps/default/keymap.c b/keyboards/handwired/colorlice/keymaps/default/keymap.c index 84257a120..e94aeaae4 100644 --- a/keyboards/handwired/colorlice/keymaps/default/keymap.c +++ b/keyboards/handwired/colorlice/keymaps/default/keymap.c | |||
| @@ -17,14 +17,14 @@ | |||
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | 19 | ||
| 20 | [0] = LAYOUT( | 20 | [0] = LAYOUT_alice_split_bs( |
| 21 | RGB_TOG, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, | 21 | RGB_TOG, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, |
| 22 | RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | 22 | RGB_MOD, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, |
| 23 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 23 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), |
| 25 | KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), | 25 | KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL), |
| 26 | 26 | ||
| 27 | [1] = LAYOUT( | 27 | [1] = LAYOUT_alice_split_bs( |
| 28 | _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, | 28 | _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL, |
| 29 | _______, _______, _______, KC_UP, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD , _______, _______, | 29 | _______, _______, _______, KC_UP, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD , _______, _______, |
| 30 | _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, RESET, | 30 | _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, RESET, |
diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index 9e043adf4..1c0ec5c91 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk | |||
| @@ -33,3 +33,5 @@ LTO_ENABLE = no # Use link time optimization | |||
| 33 | RGB_MATRIX_ENABLE = yes | 33 | RGB_MATRIX_ENABLE = yes |
| 34 | RGB_MATRIX_DRIVER = WS2812 | 34 | RGB_MATRIX_DRIVER = WS2812 |
| 35 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 35 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 36 | |||
| 37 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index 6e5345c33..7163bd455 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json | |||
| @@ -13,11 +13,11 @@ | |||
| 13 | "key_count": 72, | 13 | "key_count": 72, |
| 14 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}] | 14 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}] |
| 15 | }, | 15 | }, |
| 16 | "LAYOUT_owlet60_60_percent_split_bsp": { | 16 | "LAYOUT_alice_split_bs": { |
| 17 | "key_count": 66, | 17 | "key_count": 66, |
| 18 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] | 18 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] |
| 19 | }, | 19 | }, |
| 20 | "LAYOUT_owlet60_60_percent_full_bsp": { | 20 | "LAYOUT_alice": { |
| 21 | "key_count": 65, | 21 | "key_count": 65, |
| 22 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] | 22 | "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] |
| 23 | } | 23 | } |
diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h index f17f40fda..b54c3df0e 100644 --- a/keyboards/handwired/owlet60/owlet60.h +++ b/keyboards/handwired/owlet60/owlet60.h | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ | 61 | { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | #define LAYOUT_owlet60_60_percent_split_bsp( \ | 64 | #define LAYOUT_alice_split_bs( \ |
| 65 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ | 65 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ |
| 66 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ | 66 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ |
| 67 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ | 67 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ |
| @@ -79,7 +79,7 @@ | |||
| 79 | { k01, k03, k05, k06, k09, k0b, k0d, k0e} \ | 79 | { k01, k03, k05, k06, k09, k0b, k0d, k0e} \ |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | #define LAYOUT_owlet60_60_percent_full_bsp( \ | 82 | #define LAYOUT_alice( \ |
| 83 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ | 83 | k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ |
| 84 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ | 84 | k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ |
| 85 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ | 85 | k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ |
| @@ -96,3 +96,6 @@ | |||
| 96 | { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \ | 96 | { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \ |
| 97 | { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ | 97 | { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ |
| 98 | } | 98 | } |
| 99 | |||
| 100 | #define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs | ||
| 101 | #define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice | ||
diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk index c3c94c91d..126ec8962 100644 --- a/keyboards/handwired/owlet60/rules.mk +++ b/keyboards/handwired/owlet60/rules.mk | |||
| @@ -33,4 +33,6 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
| 33 | CUSTOM_MATRIX = yes | 33 | CUSTOM_MATRIX = yes |
| 34 | OLED_DRIVER_ENABLE = no | 34 | OLED_DRIVER_ENABLE = no |
| 35 | 35 | ||
| 36 | SRC += matrix.c \ No newline at end of file | 36 | SRC += matrix.c |
| 37 | |||
| 38 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json index 2dedbfb80..b738a376f 100644 --- a/keyboards/kb_elmo/sesame/info.json +++ b/keyboards/kb_elmo/sesame/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 17.75, | 5 | "width": 17.75, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_alice": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"x":0, "y":0}, | 10 | {"x":0, "y":0}, |
| 11 | {"x":1.25, "y":0}, | 11 | {"x":1.25, "y":0}, |
| @@ -74,7 +74,7 @@ | |||
| 74 | {"x":16.75, "y":4, "w":1.5} | 74 | {"x":16.75, "y":4, "w":1.5} |
| 75 | ] | 75 | ] |
| 76 | }, | 76 | }, |
| 77 | "LAYOUT_all": { | 77 | "LAYOUT_alice_split_bs": { |
| 78 | "layout": [ | 78 | "layout": [ |
| 79 | {"x":0, "y":0}, | 79 | {"x":0, "y":0}, |
| 80 | {"x":1.25, "y":0}, | 80 | {"x":1.25, "y":0}, |
diff --git a/keyboards/kb_elmo/sesame/keymaps/default/keymap.c b/keyboards/kb_elmo/sesame/keymaps/default/keymap.c index e1c74203e..0236edb94 100644 --- a/keyboards/kb_elmo/sesame/keymaps/default/keymap.c +++ b/keyboards/kb_elmo/sesame/keymaps/default/keymap.c | |||
| @@ -17,14 +17,14 @@ | |||
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | /* Base */ | 19 | /* Base */ |
| 20 | [0] = LAYOUT( | 20 | [0] = LAYOUT_alice( |
| 21 | KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 21 | KC_PAUS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 22 | KC_PSCR, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 22 | KC_PSCR, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 23 | KC_F5, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 23 | KC_F5, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | 24 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), |
| 25 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | 25 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL |
| 26 | ), | 26 | ), |
| 27 | [1] = LAYOUT( | 27 | [1] = LAYOUT_alice( |
| 28 | KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, | 28 | KC_TRNS, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, |
| 29 | KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | KC_TRNS, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 30 | KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk index e5b427e5a..0198f3038 100644 --- a/keyboards/kb_elmo/sesame/rules.mk +++ b/keyboards/kb_elmo/sesame/rules.mk | |||
| @@ -23,3 +23,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | |||
| 23 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 23 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 24 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 24 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 25 | AUDIO_ENABLE = no # Audio output | 25 | AUDIO_ENABLE = no # Audio output |
| 26 | |||
| 27 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/kb_elmo/sesame/sesame.h b/keyboards/kb_elmo/sesame/sesame.h index a51023be4..d596619c3 100644 --- a/keyboards/kb_elmo/sesame/sesame.h +++ b/keyboards/kb_elmo/sesame/sesame.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * The second converts the arguments into a two-dimensional array which | 26 | * The second converts the arguments into a two-dimensional array which |
| 27 | * represents the switch matrix. | 27 | * represents the switch matrix. |
| 28 | */ | 28 | */ |
| 29 | #define LAYOUT( \ | 29 | #define LAYOUT_alice( \ |
| 30 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ | 30 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ |
| 31 | k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ | 31 | k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ |
| 32 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \ | 32 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \ |
| @@ -40,7 +40,7 @@ | |||
| 40 | { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \ | 40 | { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \ |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | #define LAYOUT_all( \ | 43 | #define LAYOUT_alice_split_bs( \ |
| 44 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \ | 44 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \ |
| 45 | k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ | 45 | k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ |
| 46 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \ | 46 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k44, \ |
| @@ -81,3 +81,6 @@ | |||
| 81 | { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO }, \ | 81 | { KC_NO, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, KC_NO }, \ |
| 82 | { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \ | 82 | { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, KC_NO, k65, KC_NO } \ |
| 83 | } | 83 | } |
| 84 | |||
| 85 | #define LAYOUT LAYOUT_alice | ||
| 86 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h index d28502da2..5a5673abc 100644 --- a/keyboards/mechlovin/adelais/adelais.h +++ b/keyboards/mechlovin/adelais/adelais.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include "quantum.h" | 19 | #include "quantum.h" |
| 20 | 20 | ||
| 21 | #define LAYOUT_all( \ | 21 | #define LAYOUT_alice_split_bs( \ |
| 22 | K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\ | 22 | K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\ |
| 23 | K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\ | 23 | K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\ |
| 24 | K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\ | 24 | K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\ |
| @@ -31,3 +31,19 @@ | |||
| 31 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | 31 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ |
| 32 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \ | 32 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \ |
| 33 | } | 33 | } |
| 34 | |||
| 35 | #define LAYOUT_alice( \ | ||
| 36 | K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \ | ||
| 37 | K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\ | ||
| 38 | K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\ | ||
| 39 | K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\ | ||
| 40 | K40, K42, K44, K46, K48, K4A, K4E \ | ||
| 41 | ) { \ | ||
| 42 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \ | ||
| 43 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ | ||
| 44 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \ | ||
| 45 | { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ | ||
| 46 | { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \ | ||
| 47 | } | ||
| 48 | |||
| 49 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 4babd9078..d65935a4f 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 18.5, | 5 | "width": 18.5, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_all": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "key_count": 66, | 9 | "key_count": 66, |
| 10 | "layout": [ | 10 | "layout": [ |
| 11 | {"label":"K1E", "x":0, "y":0}, | 11 | {"label":"K1E", "x":0, "y":0}, |
| @@ -75,6 +75,75 @@ | |||
| 75 | {"label":"K4A", "x":12.5, "y":4, "w":1.25}, | 75 | {"label":"K4A", "x":12.5, "y":4, "w":1.25}, |
| 76 | {"label":"K4E", "x":17, "y":4, "w":1.5} | 76 | {"label":"K4E", "x":17, "y":4, "w":1.5} |
| 77 | ] | 77 | ] |
| 78 | }, | ||
| 79 | "LAYOUT_alice": { | ||
| 80 | "layout": [ | ||
| 81 | {"label":"K1E", "x":0, "y":0}, | ||
| 82 | {"label":"K00", "x":1.5, "y":0}, | ||
| 83 | {"label":"K01", "x":2.5, "y":0}, | ||
| 84 | {"label":"K02", "x":3.5, "y":0}, | ||
| 85 | {"label":"K03", "x":4.5, "y":0}, | ||
| 86 | {"label":"K04", "x":5.5, "y":0}, | ||
| 87 | {"label":"K05", "x":6.5, "y":0}, | ||
| 88 | {"label":"K06", "x":7.5, "y":0}, | ||
| 89 | {"label":"K07", "x":10.5, "y":0}, | ||
| 90 | {"label":"K08", "x":11.5, "y":0}, | ||
| 91 | {"label":"K09", "x":12.5, "y":0}, | ||
| 92 | {"label":"K0A", "x":13.5, "y":0}, | ||
| 93 | {"label":"K0B", "x":14.5, "y":0}, | ||
| 94 | {"label":"K0C", "x":15.5, "y":0}, | ||
| 95 | {"label":"K0D", "x":16.5, "y":0, "w":2}, | ||
| 96 | {"label":"K2E", "x":0, "y":1}, | ||
| 97 | {"label":"K10", "x":1.5, "y":1, "w":1.5}, | ||
| 98 | {"label":"K11", "x":3, "y":1}, | ||
| 99 | {"label":"K12", "x":4, "y":1}, | ||
| 100 | {"label":"K13", "x":5, "y":1}, | ||
| 101 | {"label":"K14", "x":6, "y":1}, | ||
| 102 | {"label":"K15", "x":7, "y":1}, | ||
| 103 | {"label":"K16", "x":10, "y":1}, | ||
| 104 | {"label":"K17", "x":11, "y":1}, | ||
| 105 | {"label":"K18", "x":12, "y":1}, | ||
| 106 | {"label":"K19", "x":13, "y":1}, | ||
| 107 | {"label":"K1A", "x":14, "y":1}, | ||
| 108 | {"label":"K1B", "x":15, "y":1}, | ||
| 109 | {"label":"K1C", "x":16, "y":1}, | ||
| 110 | {"label":"K1D", "x":17, "y":1, "w":1.5}, | ||
| 111 | {"label":"K3E", "x":0, "y":2}, | ||
| 112 | {"label":"K20", "x":1.5, "y":2, "w":1.75}, | ||
| 113 | {"label":"K21", "x":3.25, "y":2}, | ||
| 114 | {"label":"K22", "x":4.25, "y":2}, | ||
| 115 | {"label":"K23", "x":5.25, "y":2}, | ||
| 116 | {"label":"K24", "x":6.25, "y":2}, | ||
| 117 | {"label":"K25", "x":7.25, "y":2}, | ||
| 118 | {"label":"K26", "x":10.25, "y":2}, | ||
| 119 | {"label":"K27", "x":11.25, "y":2}, | ||
| 120 | {"label":"K28", "x":12.25, "y":2}, | ||
| 121 | {"label":"K29", "x":13.25, "y":2}, | ||
| 122 | {"label":"K2A", "x":14.25, "y":2}, | ||
| 123 | {"label":"K2B", "x":15.25, "y":2}, | ||
| 124 | {"label":"K2D", "x":16.25, "y":2, "w":2.25}, | ||
| 125 | {"label":"K30", "x":1.5, "y":3, "w":2.25}, | ||
| 126 | {"label":"K32", "x":3.75, "y":3}, | ||
| 127 | {"label":"K33", "x":4.75, "y":3}, | ||
| 128 | {"label":"K34", "x":5.75, "y":3}, | ||
| 129 | {"label":"K35", "x":6.75, "y":3}, | ||
| 130 | {"label":"K36", "x":7.75, "y":3}, | ||
| 131 | {"label":"K37", "x":9.75, "y":3}, | ||
| 132 | {"label":"K38", "x":10.75, "y":3}, | ||
| 133 | {"label":"K39", "x":11.75, "y":3}, | ||
| 134 | {"label":"K3A", "x":12.75, "y":3}, | ||
| 135 | {"label":"K3B", "x":13.75, "y":3}, | ||
| 136 | {"label":"K4D", "x":14.75, "y":3}, | ||
| 137 | {"label":"K3C", "x":15.75, "y":3, "w":1.75}, | ||
| 138 | {"label":"K3D", "x":17.5, "y":3}, | ||
| 139 | {"label":"K40", "x":1.5, "y":4, "w":1.5}, | ||
| 140 | {"label":"K42", "x":4.5, "y":4, "w":1.25}, | ||
| 141 | {"label":"K44", "x":5.75, "y":4, "w":2.25}, | ||
| 142 | {"label":"K46", "x":8, "y":4, "w":1.25}, | ||
| 143 | {"label":"K48", "x":9.75, "y":4, "w":2.75}, | ||
| 144 | {"label":"K4A", "x":12.5, "y":4, "w":1.25}, | ||
| 145 | {"label":"K4E", "x":17, "y":4, "w":1.5} | ||
| 146 | ] | ||
| 78 | } | 147 | } |
| 79 | } | 148 | } |
| 80 | ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" | 149 | ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" |
diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk index e1d36928f..0b6e62c60 100644 --- a/keyboards/mechlovin/adelais/rules.mk +++ b/keyboards/mechlovin/adelais/rules.mk | |||
| @@ -19,4 +19,6 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
| 19 | AUDIO_ENABLE = no # Audio output on port C6 | 19 | AUDIO_ENABLE = no # Audio output on port C6 |
| 20 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | 20 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 21 | 21 | ||
| 22 | LAYOUTS = alice alice_split_bs | ||
| 23 | |||
| 22 | DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2 \ No newline at end of file | 24 | DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2 \ No newline at end of file |
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index abf155f1c..4d4574f9d 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 20, | 5 | "width": 20, |
| 6 | "height": 5.25, | 6 | "height": 5.25, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"x":0.5, "y":0}, | 10 | {"x":0.5, "y":0}, |
| 11 | {"x":2, "y":0}, | 11 | {"x":2, "y":0}, |
diff --git a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c index cf2e561c7..aff0c916a 100644 --- a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c | |||
| @@ -16,14 +16,14 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_ESC, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, | 20 | KC_ESC, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, |
| 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), |
| 24 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | RESET, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 27 | RESET, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
| 28 | KC_BRIU, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, KC_DEL, | 28 | KC_BRIU, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, KC_DEL, |
| 29 | KC_BRID, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 29 | KC_BRID, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/nightly_boards/alter/rev1/rev1.h b/keyboards/nightly_boards/alter/rev1/rev1.h index ee919c56d..8fbbc71aa 100644 --- a/keyboards/nightly_boards/alter/rev1/rev1.h +++ b/keyboards/nightly_boards/alter/rev1/rev1.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * The second converts the arguments into a two-dimensional array which | 26 | * The second converts the arguments into a two-dimensional array which |
| 27 | * represents the switch matrix. | 27 | * represents the switch matrix. |
| 28 | */ | 28 | */ |
| 29 | #define LAYOUT( \ | 29 | #define LAYOUT_alice_split_bs( \ |
| 30 | K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K07, \ | 30 | K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K07, \ |
| 31 | K20, K30, K21, K31, K22, K32, K23, K24, K34, K25, K35, K26, K36, K27, K37, \ | 31 | K20, K30, K21, K31, K22, K32, K23, K24, K34, K25, K35, K26, K36, K27, K37, \ |
| 32 | K40, K50, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \ | 32 | K40, K50, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \ |
| @@ -44,3 +44,5 @@ | |||
| 44 | { KC_NO, KC_NO, K82, K83, K84, KC_NO, KC_NO, K87 }, \ | 44 | { KC_NO, KC_NO, K82, K83, K84, KC_NO, KC_NO, K87 }, \ |
| 45 | { K90, KC_NO, K92, KC_NO, KC_NO, K95, KC_NO, KC_NO }, \ | 45 | { K90, KC_NO, K92, KC_NO, KC_NO, K95, KC_NO, KC_NO }, \ |
| 46 | } | 46 | } |
| 47 | |||
| 48 | #define LAYOUT LAYOUT_alice_split_bs | ||
diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk index 5dbee69a1..dafed5b01 100644 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ b/keyboards/nightly_boards/alter/rev1/rules.mk | |||
| @@ -28,4 +28,6 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | |||
| 28 | MIDI_ENABLE = no # MIDI support | 28 | MIDI_ENABLE = no # MIDI support |
| 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 29 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 30 | AUDIO_ENABLE = no # Audio output | 30 | AUDIO_ENABLE = no # Audio output |
| 31 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches \ No newline at end of file | 31 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 32 | |||
| 33 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/projectkb/alice/alice.h b/keyboards/projectkb/alice/alice.h index 00bec92b9..19052c43f 100644 --- a/keyboards/projectkb/alice/alice.h +++ b/keyboards/projectkb/alice/alice.h | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | #include "quantum.h" | 3 | #include "quantum.h" |
| 4 | 4 | ||
| 5 | #define KNO KC_NO | 5 | #define KNO KC_NO |
| 6 | #define LAYOUT_default LAYOUT_alice | 6 | #define LAYOUT_default LAYOUT_alice_split_bs |
| 7 | 7 | ||
| 8 | #define LAYOUT_alice( \ | 8 | #define LAYOUT_alice_split_bs( \ |
| 9 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ | 9 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ |
| 10 | K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ | 10 | K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ |
| 11 | K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \ | 11 | K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \ |
| @@ -18,3 +18,17 @@ | |||
| 18 | { KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ | 18 | { KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ |
| 19 | { KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \ | 19 | { KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \ |
| 20 | } | 20 | } |
| 21 | |||
| 22 | #define LAYOUT_alice( \ | ||
| 23 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \ | ||
| 24 | K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ | ||
| 25 | K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \ | ||
| 26 | K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ | ||
| 27 | K41, K43, K44, K46, K49, K4B, K4F \ | ||
| 28 | ) { \ | ||
| 29 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F }, \ | ||
| 30 | { K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | ||
| 31 | { K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F }, \ | ||
| 32 | { KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ | ||
| 33 | { KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \ | ||
| 34 | } | ||
diff --git a/keyboards/projectkb/alice/info.json b/keyboards/projectkb/alice/info.json index 99311265a..299612c1a 100644 --- a/keyboards/projectkb/alice/info.json +++ b/keyboards/projectkb/alice/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 19.75, | 5 | "width": 19.75, |
| 6 | "height": 5.25, | 6 | "height": 5.25, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_alice": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"Esc", "x":0.5, "y":0}, | 10 | {"label":"Esc", "x":0.5, "y":0}, |
| 11 | {"label":"`", "x":1.75, "y":0.25}, | 11 | {"label":"`", "x":1.75, "y":0.25}, |
| @@ -78,6 +78,79 @@ | |||
| 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, |
| 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} |
| 80 | ] | 80 | ] |
| 81 | }, | ||
| 82 | "LAYOUT_alice": { | ||
| 83 | "layout": [ | ||
| 84 | {"label":"Esc", "x":0.5, "y":0}, | ||
| 85 | {"label":"`", "x":1.75, "y":0.25}, | ||
| 86 | {"label":"1", "x":2.75, "y":0.25}, | ||
| 87 | {"label":"2", "x":3.75, "y":0}, | ||
| 88 | {"label":"3", "x":4.75, "y":0.25}, | ||
| 89 | {"label":"4", "x":5.75, "y":0.25}, | ||
| 90 | {"label":"5", "x":6.75, "y":0.25}, | ||
| 91 | {"label":"6", "x":7.75, "y":0.25}, | ||
| 92 | {"label":"7", "x":11, "y":0.25}, | ||
| 93 | {"label":"8", "x":12, "y":0.25}, | ||
| 94 | {"label":"9", "x":13, "y":0.25}, | ||
| 95 | {"label":"0", "x":14, "y":0.25}, | ||
| 96 | {"label":"-", "x":15, "y":0}, | ||
| 97 | {"label":"=", "x":16, "y":0.25}, | ||
| 98 | {"label":"Backspace", "x":17, "y":0.25, "w":2}, | ||
| 99 | |||
| 100 | {"label":"PgUp", "x":0.25, "y":1}, | ||
| 101 | {"label":"Tab", "x":1.5, "y":1.25, "w":1.5}, | ||
| 102 | {"label":"Q", "x":3, "y":1.25}, | ||
| 103 | {"label":"W", "x":4.25, "y":1.25}, | ||
| 104 | {"label":"E", "x":5.25, "y":1.25}, | ||
| 105 | {"label":"R", "x":6.25, "y":1.25}, | ||
| 106 | {"label":"T", "x":7.25, "y":1.25}, | ||
| 107 | {"label":"Y", "x":10.5, "y":1.25}, | ||
| 108 | {"label":"U", "x":11.5, "y":1.25}, | ||
| 109 | {"label":"I", "x":12.5, "y":1.25}, | ||
| 110 | {"label":"O", "x":13.5, "y":1.25}, | ||
| 111 | {"label":"P", "x":14.75, "y":1.25}, | ||
| 112 | {"label":"{", "x":15.75, "y":1.25}, | ||
| 113 | {"label":"}", "x":16.75, "y":1.25}, | ||
| 114 | {"label":"|", "x":17.75, "y":1.25, "w":1.5}, | ||
| 115 | |||
| 116 | {"label":"PgDn", "x":0, "y":2}, | ||
| 117 | {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75}, | ||
| 118 | {"label":"A", "x":3.25, "y":2.25}, | ||
| 119 | {"label":"S", "x":4.5, "y":2.25}, | ||
| 120 | {"label":"D", "x":5.5, "y":2.25}, | ||
| 121 | {"label":"F", "x":6.5, "y":2.25}, | ||
| 122 | {"label":"G", "x":7.5, "y":2.25}, | ||
| 123 | {"label":"H", "x":10.75, "y":2.25}, | ||
| 124 | {"label":"J", "x":11.75, "y":2.25}, | ||
| 125 | {"label":"K", "x":12.75, "y":2.25}, | ||
| 126 | {"label":"L", "x":13.75, "y":2.25}, | ||
| 127 | {"label":":", "x":15.25, "y":2.25}, | ||
| 128 | {"label":"\"", "x":16.25, "y":2.25}, | ||
| 129 | {"label":"Enter", "x":17.25, "y":2.25, "w":2.25}, | ||
| 130 | |||
| 131 | {"label":"Shift", "x":1.5, "y":3.25, "w":2.25}, | ||
| 132 | {"label":"Z", "x":3.75, "y":3.25}, | ||
| 133 | {"label":"X", "x":5, "y":3.25}, | ||
| 134 | {"label":"C", "x":6, "y":3.25}, | ||
| 135 | {"label":"V", "x":7, "y":3.25}, | ||
| 136 | {"label":"B", "x":8, "y":3.25}, | ||
| 137 | {"label":"Fn", "x":10.25, "y":3.25}, | ||
| 138 | {"label":"N", "x":11.25, "y":3.25}, | ||
| 139 | {"label":"M", "x":12.25, "y":3.25}, | ||
| 140 | {"label":"<", "x":13.25, "y":3.25}, | ||
| 141 | {"label":">", "x":15, "y":3.25}, | ||
| 142 | {"label":"?", "x":16, "y":3.25}, | ||
| 143 | {"label":"Shift", "x":17, "y":3.25, "w":1.75}, | ||
| 144 | {"label":"Fn", "x":18.75, "y":3.25}, | ||
| 145 | |||
| 146 | {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5}, | ||
| 147 | {"label":"Alt", "x":5, "y":4.25, "w":1.5}, | ||
| 148 | {"label":"Space", "x":6.5, "y":4.25, "w":2}, | ||
| 149 | {"label":"Menu", "x":8.5, "y":4.25}, | ||
| 150 | {"label":"Space", "x":10.25, "y":4.25, "w":2.75}, | ||
| 151 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | ||
| 152 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | ||
| 153 | ] | ||
| 81 | } | 154 | } |
| 82 | } | 155 | } |
| 83 | } | 156 | } |
diff --git a/keyboards/projectkb/alice/keymaps/default/keymap.c b/keyboards/projectkb/alice/keymaps/default/keymap.c index 1566f128c..a6d222b02 100644 --- a/keyboards/projectkb/alice/keymaps/default/keymap.c +++ b/keyboards/projectkb/alice/keymaps/default/keymap.c | |||
| @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | #define _FN1 1 | 25 | #define _FN1 1 |
| 26 | 26 | ||
| 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 28 | [_BASE] = LAYOUT_alice( | 28 | [_BASE] = LAYOUT_alice_split_bs( |
| 29 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, | 29 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, |
| 30 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 30 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 31 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 31 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 33 | KC_LCTL, KC_LALT, KC_SPC, MO(_FN1), KC_SPC, KC_RALT, KC_RCTL | 33 | KC_LCTL, KC_LALT, KC_SPC, MO(_FN1), KC_SPC, KC_RALT, KC_RCTL |
| 34 | ), | 34 | ), |
| 35 | 35 | ||
| 36 | [_FN1] = LAYOUT_alice( | 36 | [_FN1] = LAYOUT_alice_split_bs( |
| 37 | RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, | 37 | RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, |
| 38 | RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, | 38 | RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______, |
| 39 | RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, | 39 | RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______, |
diff --git a/keyboards/projectkb/alice/keymaps/via/keymap.c b/keyboards/projectkb/alice/keymaps/via/keymap.c index 57095e991..f2e14aaa0 100644 --- a/keyboards/projectkb/alice/keymaps/via/keymap.c +++ b/keyboards/projectkb/alice/keymaps/via/keymap.c | |||
| @@ -24,28 +24,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 27 | [0] = LAYOUT_alice( | 27 | [0] = LAYOUT_alice_split_bs( |
| 28 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, | 28 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC, |
| 29 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 29 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 30 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 30 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 31 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, | 31 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, |
| 32 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL | 32 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL |
| 33 | ), | 33 | ), |
| 34 | [1] = LAYOUT_alice( | 34 | [1] = LAYOUT_alice_split_bs( |
| 35 | 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, KC_TRNS, | 35 | 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, KC_TRNS, |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| 38 | 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, | 38 | 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, |
| 39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 40 | ), | 40 | ), |
| 41 | [2] = LAYOUT_alice( | 41 | [2] = LAYOUT_alice_split_bs( |
| 42 | 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, KC_TRNS, | 42 | 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, KC_TRNS, |
| 43 | 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, | 43 | 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, |
| 44 | 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, | 44 | 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, |
| 45 | 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, | 45 | 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, |
| 46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 46 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 47 | ), | 47 | ), |
| 48 | [3] = LAYOUT_alice( | 48 | [3] = LAYOUT_alice_split_bs( |
| 49 | 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, KC_TRNS, | 49 | 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, KC_TRNS, |
| 50 | 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, | 50 | 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, |
| 51 | 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, | 51 | 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/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk index ddf0b6a88..aea9f17ac 100644 --- a/keyboards/projectkb/alice/rev2/rules.mk +++ b/keyboards/projectkb/alice/rev2/rules.mk | |||
| @@ -24,4 +24,3 @@ WS2812_DRIVER = spi | |||
| 24 | 24 | ||
| 25 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 25 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
| 26 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 26 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
| 27 | LAYOUTS = alice | ||
diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk index d67257699..39e431df8 100644 --- a/keyboards/projectkb/alice/rules.mk +++ b/keyboards/projectkb/alice/rules.mk | |||
| @@ -1 +1,2 @@ | |||
| 1 | LAYOUTS = alice alice_split_bs | ||
| 1 | DEFAULT_FOLDER = projectkb/alice/rev1 | 2 | DEFAULT_FOLDER = projectkb/alice/rev1 |
diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/ramonimbao/aelith/info.json index e001c1d4d..47e11dcc1 100644 --- a/keyboards/ramonimbao/aelith/info.json +++ b/keyboards/ramonimbao/aelith/info.json | |||
| @@ -85,6 +85,86 @@ | |||
| 85 | {"x":13, "y":4, "w":1.5}, | 85 | {"x":13, "y":4, "w":1.5}, |
| 86 | {"x":17.5, "y":4, "w":1.5} | 86 | {"x":17.5, "y":4, "w":1.5} |
| 87 | ] | 87 | ] |
| 88 | }, | ||
| 89 | "LAYOUT_alice": { | ||
| 90 | "layout": [ | ||
| 91 | {"x":0.5, "y":0}, | ||
| 92 | |||
| 93 | {"x":1.75, "y":0}, | ||
| 94 | {"x":2.75, "y":0}, | ||
| 95 | {"x":3.75, "y":0}, | ||
| 96 | {"x":4.75, "y":0}, | ||
| 97 | {"x":5.75, "y":0}, | ||
| 98 | {"x":6.75, "y":0}, | ||
| 99 | {"x":7.75, "y":0}, | ||
| 100 | |||
| 101 | {"x":11, "y":0}, | ||
| 102 | {"x":12, "y":0}, | ||
| 103 | {"x":13, "y":0}, | ||
| 104 | {"x":14, "y":0}, | ||
| 105 | {"x":15, "y":0}, | ||
| 106 | {"x":16, "y":0}, | ||
| 107 | {"x":17, "y":0, "w":2}, | ||
| 108 | |||
| 109 | {"x":0.25, "y":1}, | ||
| 110 | {"x":1.75, "y":1, "w":1.5}, | ||
| 111 | {"x":3.25, "y":1}, | ||
| 112 | {"x":4.25, "y":1}, | ||
| 113 | {"x":5.25, "y":1}, | ||
| 114 | {"x":6.25, "y":1}, | ||
| 115 | {"x":7.25, "y":1}, | ||
| 116 | |||
| 117 | {"x":10.5, "y":1}, | ||
| 118 | {"x":11.5, "y":1}, | ||
| 119 | {"x":12.5, "y":1}, | ||
| 120 | {"x":13.5, "y":1}, | ||
| 121 | {"x":14.5, "y":1}, | ||
| 122 | {"x":15.5, "y":1}, | ||
| 123 | {"x":16.5, "y":1}, | ||
| 124 | {"x":17.5, "y":1, "w":1.5}, | ||
| 125 | |||
| 126 | {"x":0, "y":2}, | ||
| 127 | |||
| 128 | {"x":1.75, "y":2, "w":1.75}, | ||
| 129 | {"x":3.5, "y":2}, | ||
| 130 | {"x":4.5, "y":2}, | ||
| 131 | {"x":5.5, "y":2}, | ||
| 132 | {"x":6.5, "y":2}, | ||
| 133 | {"x":7.5, "y":2}, | ||
| 134 | |||
| 135 | {"x":10.75, "y":2}, | ||
| 136 | {"x":11.75, "y":2}, | ||
| 137 | {"x":12.75, "y":2}, | ||
| 138 | {"x":13.75, "y":2}, | ||
| 139 | {"x":14.75, "y":2}, | ||
| 140 | {"x":15.75, "y":2}, | ||
| 141 | {"x":16.75, "y":2, "w":2.25}, | ||
| 142 | |||
| 143 | {"x":1.75, "y":3, "w":2.25}, | ||
| 144 | {"x":4, "y":3}, | ||
| 145 | {"x":5, "y":3}, | ||
| 146 | {"x":6, "y":3}, | ||
| 147 | {"x":7, "y":3}, | ||
| 148 | {"x":8, "y":3}, | ||
| 149 | |||
| 150 | {"x":10.25, "y":3}, | ||
| 151 | {"x":11.25, "y":3}, | ||
| 152 | {"x":12.25, "y":3}, | ||
| 153 | {"x":13.25, "y":3}, | ||
| 154 | {"x":14.25, "y":3}, | ||
| 155 | {"x":15.25, "y":3}, | ||
| 156 | {"x":16.25, "y":3, "w":1.75}, | ||
| 157 | {"x":18, "y":3}, | ||
| 158 | |||
| 159 | {"x":1.75, "y":4, "w":1.5}, | ||
| 160 | {"x":4.5, "y":4, "w":1.5}, | ||
| 161 | {"x":6, "y":4, "w":2.25}, | ||
| 162 | {"x":8.25, "y":4}, | ||
| 163 | |||
| 164 | {"x":10.25, "y":4, "w":2.75}, | ||
| 165 | {"x":13, "y":4, "w":1.5}, | ||
| 166 | {"x":17.5, "y":4, "w":1.5} | ||
| 167 | ] | ||
| 88 | } | 168 | } |
| 89 | } | 169 | } |
| 90 | } | 170 | } |
diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/ramonimbao/aelith/rules.mk index 5e4cc3d68..530426307 100644 --- a/keyboards/ramonimbao/aelith/rules.mk +++ b/keyboards/ramonimbao/aelith/rules.mk | |||
| @@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
| 24 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 24 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 25 | AUDIO_ENABLE = no # Audio output | 25 | AUDIO_ENABLE = no # Audio output |
| 26 | 26 | ||
| 27 | LAYOUTS = alice | 27 | LAYOUTS = alice alice_split_bs |
diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 64ed057e4..3736ebeec 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json | |||
| @@ -13,11 +13,11 @@ | |||
| 13 | "key_count": 65, | 13 | "key_count": 65, |
| 14 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 14 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 15 | }, | 15 | }, |
| 16 | "LAYOUT_split_right_shift": { | 16 | "LAYOUT_alice": { |
| 17 | "key_count": 65, | 17 | "key_count": 65, |
| 18 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 18 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 19 | }, | 19 | }, |
| 20 | "LAYOUT_all": { | 20 | "LAYOUT_alice_split_bs": { |
| 21 | "key_count": 66, | 21 | "key_count": 66, |
| 22 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 22 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 23 | } | 23 | } |
diff --git a/keyboards/sck/osa/keymaps/all/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c index 378f8ed58..01bd9da25 100644 --- a/keyboards/sck/osa/keymaps/all/keymap.c +++ b/keyboards/sck/osa/keymaps/all/keymap.c | |||
| @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 36 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| | 36 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| |
| 37 | * `----------------------------------------------------------------------' | 37 | * `----------------------------------------------------------------------' |
| 38 | */ | 38 | */ |
| 39 | [0] = LAYOUT_all( /* OSA Base */ | 39 | [0] = LAYOUT_alice_split_bs( /* OSA Base */ |
| 40 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, | 40 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, |
| 41 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | 41 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, |
| 42 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 42 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| | 56 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| |
| 57 | * `----------------------------------------------------------------------' | 57 | * `----------------------------------------------------------------------' |
| 58 | */ | 58 | */ |
| 59 | [1] = LAYOUT_all( /* OSA Layer 1 */ | 59 | [1] = LAYOUT_alice_split_bs( /* OSA Layer 1 */ |
| 60 | KC_SLCK, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, | 60 | KC_SLCK, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, |
| 61 | KC_NLCK, KC_TAB, KC_Q, KC_UP, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, | 61 | KC_NLCK, KC_TAB, KC_Q, KC_UP, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, |
| 62 | KC_CLCK, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, KC_ENT, | 62 | KC_CLCK, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F, KC_G, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_SCLN, KC_QUOT, KC_ENT, |
diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c index a59b66334..3c6430066 100644 --- a/keyboards/sck/osa/keymaps/splitrs/keymap.c +++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c | |||
| @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 36 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| | 36 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| |
| 37 | * `----------------------------------------------------------------------' | 37 | * `----------------------------------------------------------------------' |
| 38 | */ | 38 | */ |
| 39 | [0] = LAYOUT_split_right_shift( /* OSA Base */ | 39 | [0] = LAYOUT_alice( /* OSA Base */ |
| 40 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 40 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 41 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 41 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 42 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 42 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| | 56 | * |CAPS| | Alt | Space | Fn | | Space | Alt | | Ctrl| |
| 57 | * `----------------------------------------------------------------------' | 57 | * `----------------------------------------------------------------------' |
| 58 | */ | 58 | */ |
| 59 | [1] = LAYOUT_split_right_shift( /* OSA Layer 1 */ | 59 | [1] = LAYOUT_alice( /* OSA Layer 1 */ |
| 60 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, | 60 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 61 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 61 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 62 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 62 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
diff --git a/keyboards/sck/osa/keymaps/via/keymap.c b/keyboards/sck/osa/keymaps/via/keymap.c index 2c1af0731..793680243 100644 --- a/keyboards/sck/osa/keymaps/via/keymap.c +++ b/keyboards/sck/osa/keymaps/via/keymap.c | |||
| @@ -16,14 +16,14 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT_all( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, | 20 | KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, |
| 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, |
| 24 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_all( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | 27 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, |
| 28 | 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, | 28 | 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, |
| 29 | 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, | 29 | 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, |
| @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 32 | ), | 32 | ), |
| 33 | 33 | ||
| 34 | [2] = LAYOUT_all( | 34 | [2] = LAYOUT_alice_split_bs( |
| 35 | 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, KC_TRNS, | 35 | 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, KC_TRNS, |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 39 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 40 | ), | 40 | ), |
| 41 | 41 | ||
| 42 | [3] = LAYOUT_all( | 42 | [3] = LAYOUT_alice_split_bs( |
| 43 | 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, KC_TRNS, | 43 | 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, KC_TRNS, |
| 44 | 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, | 44 | 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, |
| 45 | 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, | 45 | 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/sck/osa/osa.h b/keyboards/sck/osa/osa.h index 46cb3cd85..d6ac51c7b 100644 --- a/keyboards/sck/osa/osa.h +++ b/keyboards/sck/osa/osa.h | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ | 77 | { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 78 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 78 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 79 | } | 79 | } |
| 80 | #define LAYOUT_split_right_shift( \ | 80 | #define LAYOUT_alice( \ |
| 81 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ | 81 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ |
| 82 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ | 82 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ |
| 83 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ | 83 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ |
| @@ -96,7 +96,7 @@ | |||
| 96 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ | 96 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 97 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 97 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 98 | } | 98 | } |
| 99 | #define LAYOUT_all( \ | 99 | #define LAYOUT_alice_split_bs( \ |
| 100 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ | 100 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ |
| 101 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ | 101 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ |
| 102 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ | 102 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ |
| @@ -115,3 +115,6 @@ | |||
| 115 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ | 115 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 116 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 116 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 117 | } | 117 | } |
| 118 | |||
| 119 | #define LAYOUT_split_right_shift LAYOUT_alice | ||
| 120 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index c1b724e71..0faf76e7a 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk | |||
| @@ -30,3 +30,5 @@ UNICODE_ENABLE = no # Unicode | |||
| 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 30 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 31 | AUDIO_ENABLE = no # Audio output on port C6 | 31 | AUDIO_ENABLE = no # Audio output on port C6 |
| 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 33 | |||
| 34 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.h b/keyboards/sneakbox/aliceclone/aliceclone.h index 1976a555c..26ab4472c 100644 --- a/keyboards/sneakbox/aliceclone/aliceclone.h +++ b/keyboards/sneakbox/aliceclone/aliceclone.h | |||
| @@ -19,9 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | 19 | ||
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | 21 | ||
| 22 | #define LAYOUT_all LAYOUT_alice | 22 | #define LAYOUT_all LAYOUT_alice_split_bs |
| 23 | 23 | ||
| 24 | #define LAYOUT_alice( \ | 24 | #define LAYOUT_alice_split_bs( \ |
| 25 | K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, K017, \ | 25 | K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, K017, \ |
| 26 | K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \ | 26 | K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \ |
| 27 | K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \ | 27 | K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \ |
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json index 461542509..d5601c930 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 18.25, | 5 | "width": 18.25, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_alice": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, | 10 | {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, |
| 11 | {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5}, | 11 | {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5}, |
diff --git a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c index 6a6f7fecc..0dee1fb03 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c | |||
| @@ -24,13 +24,13 @@ enum layer_names { | |||
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 27 | [_BASE] = LAYOUT_alice( | 27 | [_BASE] = LAYOUT_alice_split_bs( |
| 28 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, | 28 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, |
| 29 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 29 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 30 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 30 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 31 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LGUI, | 31 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LGUI, |
| 32 | KC_LCTL, KC_LALT, KC_SPC, LT(_FN, KC_SPC), KC_SPC, KC_RALT, KC_RCTL), | 32 | KC_LCTL, KC_LALT, KC_SPC, LT(_FN, KC_SPC), KC_SPC, KC_RALT, KC_RCTL), |
| 33 | [_FN] = LAYOUT_alice( | 33 | [_FN] = LAYOUT_alice_split_bs( |
| 34 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | 34 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, |
| 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 35 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 36 | RESET, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 36 | RESET, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
diff --git a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c index 6a08a15f2..a8f44e60d 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c | |||
| @@ -27,25 +27,25 @@ enum layer_names { | |||
| 27 | 27 | ||
| 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 29 | 29 | ||
| 30 | [_BASE] = LAYOUT_alice( | 30 | [_BASE] = LAYOUT_alice_split_bs( |
| 31 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, | 31 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, |
| 32 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 32 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 33 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 33 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 34 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LGUI, | 34 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LGUI, |
| 35 | KC_LCTL, KC_LALT, KC_SPC, LT(_FN, KC_SPC), KC_SPC, KC_RALT, KC_RCTL), | 35 | KC_LCTL, KC_LALT, KC_SPC, LT(_FN, KC_SPC), KC_SPC, KC_RALT, KC_RCTL), |
| 36 | [_FN] = LAYOUT_alice( | 36 | [_FN] = LAYOUT_alice_split_bs( |
| 37 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | 37 | KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, |
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 39 | RESET, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 39 | RESET, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 40 | 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, | 40 | 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, |
| 41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 41 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 42 | [_L3] = LAYOUT_alice( | 42 | [_L3] = LAYOUT_alice_split_bs( |
| 43 | 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, KC_TRNS, | 43 | 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, KC_TRNS, |
| 44 | 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, | 44 | 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, |
| 45 | 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, | 45 | 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, |
| 46 | 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, | 46 | 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, |
| 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 47 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
| 48 | [_L4] = LAYOUT_alice( | 48 | [_L4] = LAYOUT_alice_split_bs( |
| 49 | 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, KC_TRNS, | 49 | 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, KC_TRNS, |
| 50 | 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, | 50 | 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, |
| 51 | 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, | 51 | 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/sneakbox/aliceclone/rules.mk b/keyboards/sneakbox/aliceclone/rules.mk index f47795602..c69b4e563 100644 --- a/keyboards/sneakbox/aliceclone/rules.mk +++ b/keyboards/sneakbox/aliceclone/rules.mk | |||
| @@ -21,4 +21,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | |||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
| 23 | ENCODER_ENABLE = yes | 23 | ENCODER_ENABLE = yes |
| 24 | LAYOUTS = alice | 24 | |
| 25 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/tgr/alice/alice.h b/keyboards/tgr/alice/alice.h index 1486612f9..8525fd85f 100644 --- a/keyboards/tgr/alice/alice.h +++ b/keyboards/tgr/alice/alice.h | |||
| @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | 19 | ||
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | 21 | ||
| 22 | /* LAYOUT | 22 | /* Layout |
| 23 | * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ | 23 | * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ |
| 24 | * │50 │ │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │ | 24 | * │50 │ │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │ |
| 25 | * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ | 25 | * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ |
| @@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 32 | * │40 │ │41 │42 │43 │ │46 │47 │ │48 │ | 32 | * │40 │ │41 │42 │43 │ │46 │47 │ │48 │ |
| 33 | * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ | 33 | * └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ |
| 34 | */ | 34 | */ |
| 35 | #define LAYOUT( \ | 35 | #define LAYOUT_alice_split_bs( \ |
| 36 | K50, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ | 36 | K50, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ |
| 37 | K51, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ | 37 | K51, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ |
| 38 | K52, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ | 38 | K52, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ |
| @@ -48,3 +48,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 48 | { K50 , K51 , K52 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ | 48 | { K50 , K51 , K52 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | #define LAYOUT LAYOUT_alice_split_bs | ||
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index b26209332..13377293c 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 17.75, | 5 | "width": 17.75, |
| 6 | "height": 5, | 6 | "height": 5, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "key_count": 66, | 9 | "key_count": 66, |
| 10 | "layout": [ | 10 | "layout": [ |
| 11 | {"label":"K63", "x":0, "y":0}, | 11 | {"label":"K63", "x":0, "y":0}, |
diff --git a/keyboards/tgr/alice/keymaps/default/keymap.c b/keyboards/tgr/alice/keymaps/default/keymap.c index 29fff6618..4d4a3ecc7 100644 --- a/keyboards/tgr/alice/keymaps/default/keymap.c +++ b/keyboards/tgr/alice/keymaps/default/keymap.c | |||
| @@ -18,14 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [0] = LAYOUT( | 21 | [0] = LAYOUT_alice_split_bs( |
| 22 | KC_ESC, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, \ | 22 | KC_ESC, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, \ |
| 23 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ | 23 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ |
| 24 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 24 | KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 25 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ | 25 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ |
| 26 | KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL \ | 26 | KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL \ |
| 27 | ), | 27 | ), |
| 28 | [1] = LAYOUT( | 28 | [1] = LAYOUT_alice_split_bs( |
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, \ | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, \ |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ |
diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk index 20f0222c1..39af20ef9 100644 --- a/keyboards/tgr/alice/rules.mk +++ b/keyboards/tgr/alice/rules.mk | |||
| @@ -20,3 +20,5 @@ COMMAND_ENABLE = yes | |||
| 20 | BACKLIGHT_ENABLE = yes | 20 | BACKLIGHT_ENABLE = yes |
| 21 | RGBLIGHT_ENABLE = yes | 21 | RGBLIGHT_ENABLE = yes |
| 22 | WS2812_DRIVER = i2c | 22 | WS2812_DRIVER = i2c |
| 23 | |||
| 24 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index adbc6ee1a..5a6155212 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json | |||
| @@ -11,10 +11,10 @@ | |||
| 11 | "LAYOUT_split_backspace": { | 11 | "LAYOUT_split_backspace": { |
| 12 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 12 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 13 | }, | 13 | }, |
| 14 | "LAYOUT_split_right_shift": { | 14 | "LAYOUT_alice": { |
| 15 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 15 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 16 | }, | 16 | }, |
| 17 | "LAYOUT_all": { | 17 | "LAYOUT_alice_split_bs": { |
| 18 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] | 18 | "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}] |
| 19 | } | 19 | } |
| 20 | } | 20 | } |
diff --git a/keyboards/tkc/osav2/osav2.h b/keyboards/tkc/osav2/osav2.h index 46cb3cd85..d6ac51c7b 100644 --- a/keyboards/tkc/osav2/osav2.h +++ b/keyboards/tkc/osav2/osav2.h | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ | 77 | { KC_NO, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 78 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 78 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 79 | } | 79 | } |
| 80 | #define LAYOUT_split_right_shift( \ | 80 | #define LAYOUT_alice( \ |
| 81 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ | 81 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K57, \ |
| 82 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ | 82 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ |
| 83 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ | 83 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ |
| @@ -96,7 +96,7 @@ | |||
| 96 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ | 96 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 97 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 97 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 98 | } | 98 | } |
| 99 | #define LAYOUT_all( \ | 99 | #define LAYOUT_alice_split_bs( \ |
| 100 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ | 100 | K10, K00, K01, K02, K03, K04, K05, K06, K56, K55, K54, K53, K52, K51, K50, K57, \ |
| 101 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ | 101 | K20, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, K67, \ |
| 102 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ | 102 | K30, K21, K22, K23, K24, K25, K26, K76, K75, K74, K73, K72, K71, K77, \ |
| @@ -115,3 +115,6 @@ | |||
| 115 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ | 115 | { K80, K81, K82, K83, K84, K85, K86, K87 }, \ |
| 116 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ | 116 | { K90, KC_NO, KC_NO, K93, KC_NO, K95, KC_NO, KC_NO } \ |
| 117 | } | 117 | } |
| 118 | |||
| 119 | #define LAYOUT_split_right_shift LAYOUT_alice | ||
| 120 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/tkc/osav2/rules.mk b/keyboards/tkc/osav2/rules.mk index a11aa7aee..6a6f28d49 100644 --- a/keyboards/tkc/osav2/rules.mk +++ b/keyboards/tkc/osav2/rules.mk | |||
| @@ -31,3 +31,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth | |||
| 31 | AUDIO_ENABLE = no # Audio output | 31 | AUDIO_ENABLE = no # Audio output |
| 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | 32 | FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches |
| 33 | LTO_ENABLE = yes # Reduces compile size | 33 | LTO_ENABLE = yes # Reduces compile size |
| 34 | |||
| 35 | LAYOUTS = alice alice_split_bs | ||
diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json new file mode 100644 index 000000000..35d8e275d --- /dev/null +++ b/keyboards/xelus/valor/rev1/info.json | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Xelus Valor rev1", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "Xelus22", | ||
| 5 | "width": 17.75, | ||
| 6 | "height": 5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT_alice_split_bs": { | ||
| 9 | "layout": [ | ||
| 10 | {"x":0, "y":0}, | ||
| 11 | {"x":1.25, "y":0}, | ||
| 12 | {"x":2.25, "y":0}, | ||
| 13 | {"x":3.25, "y":0}, | ||
| 14 | {"x":4.25, "y":0}, | ||
| 15 | {"x":5.25, "y":0}, | ||
| 16 | {"x":6.25, "y":0}, | ||
| 17 | {"x":7.25, "y":0}, | ||
| 18 | {"x":10.25, "y":0}, | ||
| 19 | {"x":11.25, "y":0}, | ||
| 20 | {"x":12.25, "y":0}, | ||
| 21 | {"x":13.25, "y":0}, | ||
| 22 | {"x":14.25, "y":0}, | ||
| 23 | {"x":15.25, "y":0}, | ||
| 24 | {"x":16.25, "y":0}, | ||
| 25 | {"x":17.25, "y":0}, | ||
| 26 | |||
| 27 | {"x":0, "y":1}, | ||
| 28 | {"x":1.25, "y":1, "w":1.5}, | ||
| 29 | {"x":2.75, "y":1}, | ||
| 30 | {"x":3.75, "y":1}, | ||
| 31 | {"x":4.75, "y":1}, | ||
| 32 | {"x":5.75, "y":1}, | ||
| 33 | {"x":6.75, "y":1}, | ||
| 34 | {"x":9.75, "y":1}, | ||
| 35 | {"x":10.75, "y":1}, | ||
| 36 | {"x":11.75, "y":1}, | ||
| 37 | {"x":12.75, "y":1}, | ||
| 38 | {"x":13.75, "y":1}, | ||
| 39 | {"x":14.75, "y":1}, | ||
| 40 | {"x":15.75, "y":1}, | ||
| 41 | {"x":16.75, "y":1, "w":1.5}, | ||
| 42 | |||
| 43 | {"x":0, "y":2}, | ||
| 44 | {"x":1.25, "y":2, "w":1.75}, | ||
| 45 | {"x":3, "y":2}, | ||
| 46 | {"x":4, "y":2}, | ||
| 47 | {"x":5, "y":2}, | ||
| 48 | {"x":6, "y":2}, | ||
| 49 | {"x":7, "y":2}, | ||
| 50 | {"x":10, "y":2}, | ||
| 51 | {"x":11, "y":2}, | ||
| 52 | {"x":12, "y":2}, | ||
| 53 | {"x":13, "y":2}, | ||
| 54 | {"x":14, "y":2}, | ||
| 55 | {"x":15, "y":2}, | ||
| 56 | {"x":16, "y":2, "w":2.25}, | ||
| 57 | |||
| 58 | {"x":1.25, "y":3, "w":2.25}, | ||
| 59 | {"x":3.5, "y":3}, | ||
| 60 | {"x":4.5, "y":3}, | ||
| 61 | {"x":5.5, "y":3}, | ||
| 62 | {"x":6.5, "y":3}, | ||
| 63 | {"x":7.5, "y":3}, | ||
| 64 | {"x":9.5, "y":3}, | ||
| 65 | {"x":10.5, "y":3}, | ||
| 66 | {"x":11.5, "y":3}, | ||
| 67 | {"x":12.5, "y":3}, | ||
| 68 | {"x":13.5, "y":3}, | ||
| 69 | {"x":14.5, "y":3}, | ||
| 70 | {"x":15.5, "y":3, "w":1.75}, | ||
| 71 | {"x":17.25, "y":3}, | ||
| 72 | |||
| 73 | {"x":1.25, "y":4, "w":1.5}, | ||
| 74 | {"x":4.25, "y":4, "w":1.5}, | ||
| 75 | {"x":5.75, "y":4, "w":2}, | ||
| 76 | {"x":7.75, "y":4, "w":1.25}, | ||
| 77 | {"x":9.5, "y":4, "w":2.75}, | ||
| 78 | {"x":12.25, "y":4, "w":1.5}, | ||
| 79 | {"x":16.75, "y":4, "w":1.5} | ||
| 80 | ] | ||
| 81 | } | ||
| 82 | } | ||
| 83 | } | ||
diff --git a/keyboards/xelus/valor/rev1/rev1.h b/keyboards/xelus/valor/rev1/rev1.h index c43274605..3e05ae5e2 100644 --- a/keyboards/xelus/valor/rev1/rev1.h +++ b/keyboards/xelus/valor/rev1/rev1.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #define ____ KC_NO | 21 | #define ____ KC_NO |
| 22 | 22 | ||
| 23 | #define LAYOUT_all( \ | 23 | #define LAYOUT_alice_split_bs( \ |
| 24 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \ | 24 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \ |
| 25 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | 25 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ |
| 26 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | 26 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ |
| @@ -33,3 +33,5 @@ | |||
| 33 | { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ | 33 | { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ |
| 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ } \ | 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ } \ |
| 35 | } | 35 | } |
| 36 | |||
| 37 | #define LAYOUT_all LAYOUT_alice_split_bs | ||
diff --git a/keyboards/xelus/valor/rev1/rules.mk b/keyboards/xelus/valor/rev1/rules.mk index d3eb6989d..2840d97f2 100644 --- a/keyboards/xelus/valor/rev1/rules.mk +++ b/keyboards/xelus/valor/rev1/rules.mk | |||
| @@ -21,3 +21,5 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | |||
| 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 21 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 22 | AUDIO_ENABLE = no # Audio output | 22 | AUDIO_ENABLE = no # Audio output |
| 23 | LTO_ENABLE = yes | 23 | LTO_ENABLE = yes |
| 24 | |||
| 25 | LAYOUTS = alice_split_bs | ||
diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 5353a094e..283d36673 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | "width": 19.75, | 5 | "width": 19.75, |
| 6 | "height": 5.25, | 6 | "height": 5.25, |
| 7 | "layouts": { | 7 | "layouts": { |
| 8 | "LAYOUT_alice": { | 8 | "LAYOUT_alice_split_bs": { |
| 9 | "layout": [ | 9 | "layout": [ |
| 10 | {"label":"Esc", "x":0.5, "y":0}, | 10 | {"label":"Esc", "x":0.5, "y":0}, |
| 11 | {"label":"`", "x":1.75, "y":0.25}, | 11 | {"label":"`", "x":1.75, "y":0.25}, |
| @@ -78,6 +78,79 @@ | |||
| 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | 78 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, |
| 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | 79 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} |
| 80 | ] | 80 | ] |
| 81 | }, | ||
| 82 | "LAYOUT_alice": { | ||
| 83 | "layout": [ | ||
| 84 | {"label":"Esc", "x":0.5, "y":0}, | ||
| 85 | {"label":"`", "x":1.75, "y":0.25}, | ||
| 86 | {"label":"1", "x":2.75, "y":0.25}, | ||
| 87 | {"label":"2", "x":3.75, "y":0}, | ||
| 88 | {"label":"3", "x":4.75, "y":0.25}, | ||
| 89 | {"label":"4", "x":5.75, "y":0.25}, | ||
| 90 | {"label":"5", "x":6.75, "y":0.25}, | ||
| 91 | {"label":"6", "x":7.75, "y":0.25}, | ||
| 92 | {"label":"7", "x":11, "y":0.25}, | ||
| 93 | {"label":"8", "x":12, "y":0.25}, | ||
| 94 | {"label":"9", "x":13, "y":0.25}, | ||
| 95 | {"label":"0", "x":14, "y":0.25}, | ||
| 96 | {"label":"-", "x":15, "y":0}, | ||
| 97 | {"label":"=", "x":16, "y":0.25}, | ||
| 98 | {"label":"Backspace", "x":17, "y":0.25, "w":2}, | ||
| 99 | |||
| 100 | {"label":"PgUp", "x":0.25, "y":1}, | ||
| 101 | {"label":"Tab", "x":1.5, "y":1.25, "w":1.5}, | ||
| 102 | {"label":"Q", "x":3, "y":1.25}, | ||
| 103 | {"label":"W", "x":4.25, "y":1.25}, | ||
| 104 | {"label":"E", "x":5.25, "y":1.25}, | ||
| 105 | {"label":"R", "x":6.25, "y":1.25}, | ||
| 106 | {"label":"T", "x":7.25, "y":1.25}, | ||
| 107 | {"label":"Y", "x":10.5, "y":1.25}, | ||
| 108 | {"label":"U", "x":11.5, "y":1.25}, | ||
| 109 | {"label":"I", "x":12.5, "y":1.25}, | ||
| 110 | {"label":"O", "x":13.5, "y":1.25}, | ||
| 111 | {"label":"P", "x":14.75, "y":1.25}, | ||
| 112 | {"label":"{", "x":15.75, "y":1.25}, | ||
| 113 | {"label":"}", "x":16.75, "y":1.25}, | ||
| 114 | {"label":"|", "x":17.75, "y":1.25, "w":1.5}, | ||
| 115 | |||
| 116 | {"label":"PgDn", "x":0, "y":2}, | ||
| 117 | {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75}, | ||
| 118 | {"label":"A", "x":3.25, "y":2.25}, | ||
| 119 | {"label":"S", "x":4.5, "y":2.25}, | ||
| 120 | {"label":"D", "x":5.5, "y":2.25}, | ||
| 121 | {"label":"F", "x":6.5, "y":2.25}, | ||
| 122 | {"label":"G", "x":7.5, "y":2.25}, | ||
| 123 | {"label":"H", "x":10.75, "y":2.25}, | ||
| 124 | {"label":"J", "x":11.75, "y":2.25}, | ||
| 125 | {"label":"K", "x":12.75, "y":2.25}, | ||
| 126 | {"label":"L", "x":13.75, "y":2.25}, | ||
| 127 | {"label":":", "x":15.25, "y":2.25}, | ||
| 128 | {"label":"\"", "x":16.25, "y":2.25}, | ||
| 129 | {"label":"Enter", "x":17.25, "y":2.25, "w":2.25}, | ||
| 130 | |||
| 131 | {"label":"Shift", "x":1.5, "y":3.25, "w":2.25}, | ||
| 132 | {"label":"Z", "x":3.75, "y":3.25}, | ||
| 133 | {"label":"X", "x":5, "y":3.25}, | ||
| 134 | {"label":"C", "x":6, "y":3.25}, | ||
| 135 | {"label":"V", "x":7, "y":3.25}, | ||
| 136 | {"label":"B", "x":8, "y":3.25}, | ||
| 137 | {"label":"Fn", "x":10.25, "y":3.25}, | ||
| 138 | {"label":"N", "x":11.25, "y":3.25}, | ||
| 139 | {"label":"M", "x":12.25, "y":3.25}, | ||
| 140 | {"label":"<", "x":13.25, "y":3.25}, | ||
| 141 | {"label":">", "x":15, "y":3.25}, | ||
| 142 | {"label":"?", "x":16, "y":3.25}, | ||
| 143 | {"label":"Shift", "x":17, "y":3.25, "w":1.75}, | ||
| 144 | {"label":"Fn", "x":18.75, "y":3.25}, | ||
| 145 | |||
| 146 | {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5}, | ||
| 147 | {"label":"Alt", "x":5, "y":4.25, "w":1.5}, | ||
| 148 | {"label":"Space", "x":6.5, "y":4.25, "w":2}, | ||
| 149 | {"label":"Menu", "x":8.5, "y":4.25}, | ||
| 150 | {"label":"Space", "x":10.25, "y":4.25, "w":2.75}, | ||
| 151 | {"label":"Alt", "x":13, "y":4.25, "w":1.5}, | ||
| 152 | {"label":"Ctrl", "x":18, "y":4.25, "w":1.5} | ||
| 153 | ] | ||
| 81 | } | 154 | } |
| 82 | } | 155 | } |
| 83 | } | 156 | } |
diff --git a/keyboards/zoo/wampus/keymaps/default/keymap.c b/keyboards/zoo/wampus/keymaps/default/keymap.c index 0c3a6d0c3..83d49b0ef 100644 --- a/keyboards/zoo/wampus/keymaps/default/keymap.c +++ b/keyboards/zoo/wampus/keymaps/default/keymap.c | |||
| @@ -16,18 +16,18 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT_alice( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_DEL, | 20 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, |
| 21 | KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, | 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 22 | KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_PGDN, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT, KC_RGUI, | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, |
| 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_alice( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, | 27 | RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, |
| 28 | RGB_TOG, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 28 | RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 29 | RGB_MOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | RGB_RMOD, 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, | 30 | 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, |
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 32 | ), | 32 | ), |
| 33 | }; | 33 | }; |
diff --git a/keyboards/zoo/wampus/keymaps/via/keymap.c b/keyboards/zoo/wampus/keymaps/via/keymap.c index 2126be5e9..b9620c67b 100644 --- a/keyboards/zoo/wampus/keymaps/via/keymap.c +++ b/keyboards/zoo/wampus/keymaps/via/keymap.c | |||
| @@ -16,32 +16,32 @@ | |||
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | [0] = LAYOUT_alice( | 19 | [0] = LAYOUT_alice_split_bs( |
| 20 | KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPC, KC_DEL, | 20 | KC_ESC, KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, |
| 21 | KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH, | 21 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 22 | KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_QUOTE, KC_ENT, | 22 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 23 | KC_PGDN, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT, KC_RGUI, | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGUI, |
| 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | 24 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL |
| 25 | ), | 25 | ), |
| 26 | [1] = LAYOUT_alice( | 26 | [1] = LAYOUT_alice_split_bs( |
| 27 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, | 27 | RGB_TOG, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, |
| 28 | RGB_TOG, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 28 | RGB_MOD, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 29 | RGB_MOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 29 | RGB_RMOD, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 30 | RGB_RMOD, 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, | 30 | 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, |
| 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 31 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 32 | ), | 32 | ), |
| 33 | [2] = LAYOUT_alice( | 33 | [2] = LAYOUT_alice_split_bs( |
| 34 | 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, | 34 | 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, KC_TRNS, |
| 35 | 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, | 35 | 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, |
| 36 | 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, | 36 | 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, |
| 37 | 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, | 37 | 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, |
| 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 38 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 39 | ), | 39 | ), |
| 40 | [3] = LAYOUT_alice( | 40 | [3] = LAYOUT_alice_split_bs( |
| 41 | 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, | 41 | 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, KC_TRNS, |
| 42 | 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, | 42 | 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, |
| 43 | 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, | 43 | 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, |
| 44 | 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, | 44 | 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, |
| 45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | 45 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS |
| 46 | ) | 46 | ) |
| 47 | }; | 47 | }; |
diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk index 9b587fe31..889e4d858 100644 --- a/keyboards/zoo/wampus/rules.mk +++ b/keyboards/zoo/wampus/rules.mk | |||
| @@ -23,4 +23,4 @@ OLED_DRIVER_ENABLE = no # Enables the use of OLED displays | |||
| 23 | # Enter lower-power sleep mode when on the ChibiOS idle thread | 23 | # Enter lower-power sleep mode when on the ChibiOS idle thread |
| 24 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE | 24 | OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |
| 25 | 25 | ||
| 26 | LAYOUTS = alice | 26 | LAYOUTS = alice alice_split_bs |
diff --git a/keyboards/zoo/wampus/wampus.h b/keyboards/zoo/wampus/wampus.h index a5cdeaf01..f74b58b51 100644 --- a/keyboards/zoo/wampus/wampus.h +++ b/keyboards/zoo/wampus/wampus.h | |||
| @@ -20,12 +20,12 @@ | |||
| 20 | 20 | ||
| 21 | #define ____ KC_NO | 21 | #define ____ KC_NO |
| 22 | 22 | ||
| 23 | #define LAYOUT_alice( \ | 23 | #define LAYOUT_alice_split_bs( \ |
| 24 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | 24 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ |
| 25 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | 25 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ |
| 26 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | 26 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ |
| 27 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ | 27 | K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ |
| 28 | K401, K403, K405, K406, K408, K410, K414 \ | 28 | K401, K403, K405, K406, K408, K410, K414 \ |
| 29 | ) { \ | 29 | ) { \ |
| 30 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \ | 30 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \ |
| 31 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ | 31 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ |
| @@ -33,3 +33,17 @@ | |||
| 33 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ | 33 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ |
| 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ | 34 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ |
| 35 | } | 35 | } |
| 36 | |||
| 37 | #define LAYOUT_alice( \ | ||
| 38 | K100, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ | ||
| 39 | K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ | ||
| 40 | K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | ||
| 41 | K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ | ||
| 42 | K401, K403, K405, K406, K408, K410, K414 \ | ||
| 43 | ) { \ | ||
| 44 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \ | ||
| 45 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ | ||
| 46 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \ | ||
| 47 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ | ||
| 48 | { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ | ||
| 49 | } | ||
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c index 2adaabcd6..a2998f009 100644 --- a/layouts/community/alice/stanrc85-alice/keymap.c +++ b/layouts/community/alice/stanrc85-alice/keymap.c | |||
| @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | 19 | ||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [_QWERTY] = LAYOUT_alice( | 21 | [_QWERTY] = LAYOUT_alice( |
| 22 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, | 22 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 23 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 23 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 24 | KC_PGDN, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 24 | KC_PGDN, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 25 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), | 25 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), |
| @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 27 | ), | 27 | ), |
| 28 | 28 | ||
| 29 | [_DEFAULT] = LAYOUT_alice( | 29 | [_DEFAULT] = LAYOUT_alice( |
| 30 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, | 30 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 31 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 31 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 32 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 32 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 33 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), | 33 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), |
| @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 35 | ), | 35 | ), |
| 36 | 36 | ||
| 37 | [_FN1_60] = LAYOUT_alice( | 37 | [_FN1_60] = LAYOUT_alice( |
| 38 | _______, KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, | 38 | _______, KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, |
| 39 | _______, _______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP, KC_END, KC_PSCR, _______, _______, KC_INS, | 39 | _______, _______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP, KC_END, KC_PSCR, _______, _______, KC_INS, |
| 40 | _______, KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, | 40 | _______, KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, |
| 41 | _______, KC_RDP, _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______, | 41 | _______, KC_RDP, _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______, |
| @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 43 | ), | 43 | ), |
| 44 | 44 | ||
| 45 | [_FN2_60] = LAYOUT_alice( | 45 | [_FN2_60] = LAYOUT_alice( |
| 46 | BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, | 46 | BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, |
| 47 | BL_INC, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, | 47 | BL_INC, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, |
| 48 | BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, | 48 | BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, |
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/layouts/default/alice/default_alice/keymap.c b/layouts/default/alice/default_alice/keymap.c index 28ab21958..d65ee309a 100644 --- a/layouts/default/alice/default_alice/keymap.c +++ b/layouts/default/alice/default_alice/keymap.c | |||
| @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 30 | * └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘ | 30 | * └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘ |
| 31 | */ | 31 | */ |
| 32 | [0] = LAYOUT_alice( | 32 | [0] = LAYOUT_alice( |
| 33 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, | 33 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, |
| 34 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 34 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
| 35 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 35 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| 36 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, | 36 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, |
diff --git a/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c b/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c new file mode 100644 index 000000000..9237652d9 --- /dev/null +++ b/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | /* Copyright 2020 MudkipMao, noroadsleft | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include QMK_KEYBOARD_H | ||
| 17 | |||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 19 | /* | ||
| 20 | * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ | ||
| 21 | * │Esc│ │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│ | ||
| 22 | * ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐ | ||
| 23 | * │PUp│ │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ | ||
| 24 | * ┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ | ||
| 25 | * │PDn│ │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │ | ||
| 26 | * └───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐ | ||
| 27 | * │ Shift │ Z │ X │ C │ V │ B │ │ B │ N │ M │ , │ . │ / │ Shift │Shf│ | ||
| 28 | * ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐ ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘ | ||
| 29 | * │ Ctl │ │ Alt │ │ GUI │ │ │ Alt │ │ Ctl │ | ||
| 30 | * └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘ | ||
| 31 | */ | ||
| 32 | [0] = LAYOUT_alice_split_bs( | ||
| 33 | KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, | ||
| 34 | KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | ||
| 35 | KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | ||
| 36 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, | ||
| 37 | KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL | ||
| 38 | ) | ||
| 39 | }; | ||
diff --git a/layouts/default/alice_split_bs/info.json b/layouts/default/alice_split_bs/info.json new file mode 100644 index 000000000..f7b4a68b5 --- /dev/null +++ b/layouts/default/alice_split_bs/info.json | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | { | ||
| 2 | "keyboard_name": "Alice layout with Split Backspace", | ||
| 3 | "url": "", | ||
| 4 | "maintainer": "qmk", | ||
| 5 | "width": 18.35, | ||
| 6 | "height": 5.1, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT_alice_split_bs": { | ||
| 9 | "layout": [ | ||
| 10 | {"x":0.4, "y":0}, | ||
| 11 | {"x":1.55, "y":0.1}, | ||
| 12 | {"x":2.55, "y":0.1}, | ||
| 13 | {"x":3.55, "y":0}, | ||
| 14 | {"x":4.55, "y":0.1}, | ||
| 15 | {"x":5.55, "y":0.1}, | ||
| 16 | {"x":6.55, "y":0.1}, | ||
| 17 | {"x":7.55, "y":0.1}, | ||
| 18 | {"x":9.75, "y":0.1}, | ||
| 19 | {"x":10.75, "y":0.1}, | ||
| 20 | {"x":11.75, "y":0.1}, | ||
| 21 | {"x":12.75, "y":0.1}, | ||
| 22 | {"x":13.75, "y":0}, | ||
| 23 | {"x":14.75, "y":0.1}, | ||
| 24 | {"x":15.75, "y":0.1}, | ||
| 25 | {"x":16.75, "y":0.1}, | ||
| 26 | |||
| 27 | {"x":0.2, "y":1.0}, | ||
| 28 | {"x":1.35, "y":1.1, "w":1.5}, | ||
| 29 | {"x":2.85, "y":1.1}, | ||
| 30 | {"x":3.85, "y":1.1}, | ||
| 31 | {"x":4.85, "y":1.1}, | ||
| 32 | {"x":5.85, "y":1.1}, | ||
| 33 | {"x":6.85, "y":1.1}, | ||
| 34 | {"x":9.45, "y":1.1}, | ||
| 35 | {"x":10.45, "y":1.1}, | ||
| 36 | {"x":11.45, "y":1.1}, | ||
| 37 | {"x":12.45, "y":1.1}, | ||
| 38 | {"x":13.45, "y":1.1}, | ||
| 39 | {"x":14.45, "y":1.1}, | ||
| 40 | {"x":15.45, "y":1.1}, | ||
| 41 | {"x":16.45, "y":1.1, "w":1.5}, | ||
| 42 | |||
| 43 | {"x":0, "y":2.0}, | ||
| 44 | {"x":1.15, "y":2.1, "w":1.75}, | ||
| 45 | {"x":2.9, "y":2.1}, | ||
| 46 | {"x":3.9, "y":2.1}, | ||
| 47 | {"x":4.9, "y":2.1}, | ||
| 48 | {"x":5.9, "y":2.1}, | ||
| 49 | {"x":6.9, "y":2.1}, | ||
| 50 | {"x":9.9, "y":2.1}, | ||
| 51 | {"x":10.9, "y":2.1}, | ||
| 52 | {"x":11.9, "y":2.1}, | ||
| 53 | {"x":12.9, "y":2.1}, | ||
| 54 | {"x":13.9, "y":2.1}, | ||
| 55 | {"x":14.9, "y":2.1}, | ||
| 56 | {"x":15.9, "y":2.1, "w":2.25}, | ||
| 57 | |||
| 58 | {"x":0.95, "y":3.1, "w":2.25}, | ||
| 59 | {"x":3.2, "y":3.1}, | ||
| 60 | {"x":4.2, "y":3.1}, | ||
| 61 | {"x":5.2, "y":3.1}, | ||
| 62 | {"x":6.2, "y":3.1}, | ||
| 63 | {"x":7.2, "y":3.1}, | ||
| 64 | {"x":9.6, "y":3.1}, | ||
| 65 | {"x":10.6, "y":3.1}, | ||
| 66 | {"x":11.6, "y":3.1}, | ||
| 67 | {"x":12.6, "y":3.1}, | ||
| 68 | {"x":13.6, "y":3.1}, | ||
| 69 | {"x":14.6, "y":3.1}, | ||
| 70 | {"x":15.6, "y":3.1, "w":1.75}, | ||
| 71 | {"x":17.35, "y":3.1}, | ||
| 72 | |||
| 73 | {"x":0.95, "y":4.1, "w":1.5}, | ||
| 74 | {"x":3.85, "y":4.1, "w":1.5}, | ||
| 75 | {"x":5.35, "y":4.1, "w":2}, | ||
| 76 | {"x":7.35, "y":4.1, "w":1.25}, | ||
| 77 | {"x":9.6, "y":4.1, "w":2.75}, | ||
| 78 | {"x":12.35, "y":4.1, "w":1.5}, | ||
| 79 | {"x":16.65, "y":4.1, "w":1.5} | ||
| 80 | ] | ||
| 81 | } | ||
| 82 | } | ||
| 83 | } | ||
diff --git a/layouts/default/alice_split_bs/layout.json b/layouts/default/alice_split_bs/layout.json new file mode 100644 index 000000000..87d811c2e --- /dev/null +++ b/layouts/default/alice_split_bs/layout.json | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | [{y:0.9,x:0.55,a:7},"",{x:2.15},"",{x:8.55},""], | ||
| 2 | [{y:-0.9,x:1.7},"","",{x:10.55},"","",""], | ||
| 3 | [{y:-0.1,x:0.35},""], | ||
| 4 | [{y:-0.95,x:12.95},""], | ||
| 5 | [{y:-0.95,x:1.5,w:1.5},"","",{x:9.95},"","",{w:1.5},""], | ||
| 6 | [{y:-0.1,x:0.15},""], | ||
| 7 | [{y:-0.9,x:1.3,w:1.75},"","",{x:9.35},"","",{w:2.25},""], | ||
| 8 | [{x:1.1,w:2.25},"","",{x:8.75},"","",{w:1.75},"",""], | ||
| 9 | [{x:1.1,w:1.5},"",{x:13.55,w:1.5},""], | ||
| 10 | [{r:12,y:-6,x:5},"","","",""], | ||
| 11 | [{x:4.5},"","","",""], | ||
| 12 | [{x:4.8},"","","",""], | ||
| 13 | [{x:5.3},"","","",""], | ||
| 14 | [{x:6.45,w:2},"",{w:1.25},""], | ||
| 15 | [{y:-0.95,x:4.95,w:1.5},""], | ||
| 16 | [{r:-12,y:-1.45,x:8.55},"","","",""], | ||
| 17 | [{x:8.05},"","","",""], | ||
| 18 | [{x:8.2},"","","",""], | ||
| 19 | [{x:7.75},"","","",""], | ||
| 20 | [{x:7.75,w:2.75},""], | ||
| 21 | [{y:-0.95,x:10.5,w:1.5},""] | ||
diff --git a/layouts/default/alice_split_bs/readme.md b/layouts/default/alice_split_bs/readme.md new file mode 100644 index 000000000..705defa81 --- /dev/null +++ b/layouts/default/alice_split_bs/readme.md | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # alice_split_bs | ||
| 2 | |||
| 3 | LAYOUT_alice_split_bs | ||
diff --git a/layouts/default/readme.md b/layouts/default/readme.md index d053c8267..96f9c8e0d 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md | |||
| @@ -497,6 +497,21 @@ LAYOUT_alice | |||
| 497 | ``` | 497 | ``` |
| 498 | 498 | ||
| 499 | ``` | 499 | ``` |
| 500 | LAYOUT_alice_split_bs | ||
| 501 | ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ | ||
| 502 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 503 | ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐ | ||
| 504 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 505 | ┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ | ||
| 506 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 507 | └───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐ | ||
| 508 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | ||
| 509 | ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐ ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘ | ||
| 510 | │ │ │ │ │ │ │ │ │ │ │ | ||
| 511 | └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘ | ||
| 512 | ``` | ||
| 513 | |||
| 514 | ``` | ||
| 500 | LAYOUT_ergodox | 515 | LAYOUT_ergodox |
| 501 | ┌─────┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬─────┐ | 516 | ┌─────┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬─────┐ |
| 502 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 517 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
