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/kb_elmo | |
| 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/kb_elmo')
| -rw-r--r-- | keyboards/kb_elmo/sesame/info.json | 4 | ||||
| -rw-r--r-- | keyboards/kb_elmo/sesame/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/kb_elmo/sesame/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/kb_elmo/sesame/sesame.h | 7 |
4 files changed, 11 insertions, 6 deletions
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 | ||
