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 /layouts/default | |
| 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 'layouts/default')
| -rw-r--r-- | layouts/default/alice/default_alice/keymap.c | 2 | ||||
| -rw-r--r-- | layouts/default/alice_split_bs/default_alice_split_bs/keymap.c | 39 | ||||
| -rw-r--r-- | layouts/default/alice_split_bs/info.json | 83 | ||||
| -rw-r--r-- | layouts/default/alice_split_bs/layout.json | 21 | ||||
| -rw-r--r-- | layouts/default/alice_split_bs/readme.md | 3 | ||||
| -rw-r--r-- | layouts/default/readme.md | 15 |
6 files changed, 162 insertions, 1 deletions
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 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
