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