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 /keyboards/projectkb | |
| 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
Diffstat (limited to 'keyboards/projectkb')
| -rw-r--r-- | keyboards/projectkb/alice/alice.h | 18 | ||||
| -rw-r--r-- | keyboards/projectkb/alice/info.json | 75 | ||||
| -rw-r--r-- | keyboards/projectkb/alice/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/projectkb/alice/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/projectkb/alice/rev2/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/projectkb/alice/rules.mk | 1 |
6 files changed, 97 insertions, 10 deletions
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 |
