drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)

Browse source 
* 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
This commit is contained in:
James Young 2020-12-03 14:07:41 -08:00 • committed by GitHub
parent a5a65fb1e2
commit 138c3e7042
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 933 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

71
keyboards/evyd13/wonderland/info.json
View file

@ -5,7 +5,7 @@
"width": 18.25,
"height": 5,
"layouts": {
"LAYOUT": {
"LAYOUT_alice_split_bs": {
"key_count": 66,
"layout": [
{"label":"k10", "x":0, "y":0},
@ -75,6 +75,75 @@
{"label":"k4a", "x":12.25, "y":4, "w":1.5},
{"label":"k4e", "x":16.75, "y":4, "w":1.5}
]
},
"LAYOUT_alice": {
"layout": [
{"label":"k10", "x":0, "y":0},
{"label":"k00", "x":1.25, "y":0},
{"label":"k01", "x":2.25, "y":0},
{"label":"k02", "x":3.25, "y":0},
{"label":"k03", "x":4.25, "y":0},
{"label":"k04", "x":5.25, "y":0},
{"label":"k05", "x":6.25, "y":0},
{"label":"k06", "x":7.25, "y":0},
{"label":"k07", "x":10.25, "y":0},
{"label":"k08", "x":11.25, "y":0},
{"label":"k09", "x":12.25, "y":0},
{"label":"k0a", "x":13.25, "y":0},
{"label":"k0b", "x":14.25, "y":0},
{"label":"k0c", "x":15.25, "y":0},
{"label":"k0e", "x":16.25, "y":0, "w":2},
{"label":"k20", "x":0, "y":1},
{"label":"k11", "x":1.25, "y":1, "w":1.5},
{"label":"k12", "x":2.75, "y":1},
{"label":"k13", "x":3.75, "y":1},
{"label":"k14", "x":4.75, "y":1},
{"label":"k15", "x":5.75, "y":1},
{"label":"k16", "x":6.75, "y":1},
{"label":"k17", "x":9.75, "y":1},
{"label":"k18", "x":10.75, "y":1},
{"label":"k19", "x":11.75, "y":1},
{"label":"k1a", "x":12.75, "y":1},
{"label":"k1b", "x":13.75, "y":1},
{"label":"k1c", "x":14.75, "y":1},
{"label":"k1d", "x":15.75, "y":1},
{"label":"k1e", "x":16.75, "y":1, "w":1.5},
{"label":"k30", "x":0, "y":2},
{"label":"k21", "x":1.25, "y":2, "w":1.75},
{"label":"k22", "x":3, "y":2},
{"label":"k23", "x":4, "y":2},
{"label":"k24", "x":5, "y":2},
{"label":"k25", "x":6, "y":2},
{"label":"k26", "x":7, "y":2},
{"label":"k27", "x":10, "y":2},
{"label":"k28", "x":11, "y":2},
{"label":"k29", "x":12, "y":2},
{"label":"k2a", "x":13, "y":2},
{"label":"k2b", "x":14, "y":2},
{"label":"k2c", "x":15, "y":2},
{"label":"k2e", "x":16, "y":2, "w":2.25},
{"label":"k31", "x":1.25, "y":3, "w":2.25},
{"label":"k32", "x":3.5, "y":3},
{"label":"k33", "x":4.5, "y":3},
{"label":"k34", "x":5.5, "y":3},
{"label":"k35", "x":6.5, "y":3},
{"label":"k36", "x":7.5, "y":3},
{"label":"k37", "x":9.5, "y":3},
{"label":"k38", "x":10.5, "y":3},
{"label":"k39", "x":11.5, "y":3},
{"label":"k3a", "x":12.5, "y":3},
{"label":"k3b", "x":13.5, "y":3},
{"label":"k3c", "x":14.5, "y":3},
{"label":"k3d", "x":15.5, "y":3, "w":1.75},
{"label":"k3e", "x":17.25, "y":3},
{"label":"k41", "x":1.25, "y":4, "w":1.5},
{"label":"k43", "x":4.25, "y":4, "w":1.5},
{"label":"k45", "x":5.75, "y":4, "w":2},
{"label":"k46", "x":7.75, "y":4, "w":1.25},
{"label":"k48", "x":9.5, "y":4, "w":2.75},
{"label":"k4a", "x":12.25, "y":4, "w":1.5},
{"label":"k4e", "x":16.75, "y":4, "w":1.5}
]
}
}
}

1
keyboards/evyd13/wonderland/rules.mk
View file

@ -29,3 +29,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUTO_SHIFT_ENABLE = no
VELOCIKEY_ENABLE = yes
LAYOUTS = alice alice_split_bs

19
keyboards/evyd13/wonderland/wonderland.h
View file

@ -3,7 +3,7 @@
// readability
#define XXX KC_NO
#define LAYOUT( \
#define LAYOUT_alice_split_bs( \
k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \
@ -18,5 +18,22 @@
{XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \
}
#define LAYOUT_alice( \
k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \
k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
k41, k43, k45, k46, k48, k4a, k4e \
) \
{ \
{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
{k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
{XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e} \
}
#define LAYOUT LAYOUT_alice_split_bs
void matrix_init_user(void);
void matrix_scan_user(void);