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

8
layouts/community/alice/stanrc85-alice/keymap.c
View file

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_alice(
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_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_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,
KC_PGDN, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
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(_FN2_60),
@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_DEFAULT] = LAYOUT_alice(
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_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_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,
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,
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(_FN2_60),
@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1_60] = LAYOUT_alice(
_______, KC_TILD, 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,
_______, KC_TILD, 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,
_______, _______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP, KC_END, KC_PSCR, _______, _______, KC_INS,
_______, KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
_______, KC_RDP, _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______,
@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN2_60] = LAYOUT_alice(
BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
BL_INC, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
BL_DEC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

2
layouts/default/alice/default_alice/keymap.c
View file

@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘
*/
[0] = LAYOUT_alice(
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,
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_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,
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,
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,

39
layouts/default/alice_split_bs/default_alice_split_bs/keymap.c Normal file
View file

@ -0,0 +1,39 @@
/* Copyright 2020 MudkipMao, noroadsleft
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
* │Esc│ │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
* ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
* │PUp│ │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
* ┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
* │PDn│ │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │
* └───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
* │ Shift │ Z │ X │ C │ V │ B │ │ B │ N │ M │ , │ . │ / │ Shift │Shf│
* ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐ ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
* │ Ctl │ │ Alt │ │ GUI │ │ │ Alt │ │ Ctl │
* └─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘
*/
[0] = LAYOUT_alice_split_bs(
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,
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,
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,
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,
KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL
)
};

83
layouts/default/alice_split_bs/info.json Normal file
View file

@ -0,0 +1,83 @@
{
"keyboard_name": "Alice layout with Split Backspace",
"url": "",
"maintainer": "qmk",
"width": 18.35,
"height": 5.1,
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
{"x":0.4, "y":0},
{"x":1.55, "y":0.1},
{"x":2.55, "y":0.1},
{"x":3.55, "y":0},
{"x":4.55, "y":0.1},
{"x":5.55, "y":0.1},
{"x":6.55, "y":0.1},
{"x":7.55, "y":0.1},
{"x":9.75, "y":0.1},
{"x":10.75, "y":0.1},
{"x":11.75, "y":0.1},
{"x":12.75, "y":0.1},
{"x":13.75, "y":0},
{"x":14.75, "y":0.1},
{"x":15.75, "y":0.1},
{"x":16.75, "y":0.1},
{"x":0.2, "y":1.0},
{"x":1.35, "y":1.1, "w":1.5},
{"x":2.85, "y":1.1},
{"x":3.85, "y":1.1},
{"x":4.85, "y":1.1},
{"x":5.85, "y":1.1},
{"x":6.85, "y":1.1},
{"x":9.45, "y":1.1},
{"x":10.45, "y":1.1},
{"x":11.45, "y":1.1},
{"x":12.45, "y":1.1},
{"x":13.45, "y":1.1},
{"x":14.45, "y":1.1},
{"x":15.45, "y":1.1},
{"x":16.45, "y":1.1, "w":1.5},
{"x":0, "y":2.0},
{"x":1.15, "y":2.1, "w":1.75},
{"x":2.9, "y":2.1},
{"x":3.9, "y":2.1},
{"x":4.9, "y":2.1},
{"x":5.9, "y":2.1},
{"x":6.9, "y":2.1},
{"x":9.9, "y":2.1},
{"x":10.9, "y":2.1},
{"x":11.9, "y":2.1},
{"x":12.9, "y":2.1},
{"x":13.9, "y":2.1},
{"x":14.9, "y":2.1},
{"x":15.9, "y":2.1, "w":2.25},
{"x":0.95, "y":3.1, "w":2.25},
{"x":3.2, "y":3.1},
{"x":4.2, "y":3.1},
{"x":5.2, "y":3.1},
{"x":6.2, "y":3.1},
{"x":7.2, "y":3.1},
{"x":9.6, "y":3.1},
{"x":10.6, "y":3.1},
{"x":11.6, "y":3.1},
{"x":12.6, "y":3.1},
{"x":13.6, "y":3.1},
{"x":14.6, "y":3.1},
{"x":15.6, "y":3.1, "w":1.75},
{"x":17.35, "y":3.1},
{"x":0.95, "y":4.1, "w":1.5},
{"x":3.85, "y":4.1, "w":1.5},
{"x":5.35, "y":4.1, "w":2},
{"x":7.35, "y":4.1, "w":1.25},
{"x":9.6, "y":4.1, "w":2.75},
{"x":12.35, "y":4.1, "w":1.5},
{"x":16.65, "y":4.1, "w":1.5}
]
}
}
}

21
layouts/default/alice_split_bs/layout.json Normal file
View file

@ -0,0 +1,21 @@
[{y:0.9,x:0.55,a:7},"",{x:2.15},"",{x:8.55},""],
[{y:-0.9,x:1.7},"","",{x:10.55},"","",""],
[{y:-0.1,x:0.35},""],
[{y:-0.95,x:12.95},""],
[{y:-0.95,x:1.5,w:1.5},"","",{x:9.95},"","",{w:1.5},""],
[{y:-0.1,x:0.15},""],
[{y:-0.9,x:1.3,w:1.75},"","",{x:9.35},"","",{w:2.25},""],
[{x:1.1,w:2.25},"","",{x:8.75},"","",{w:1.75},"",""],
[{x:1.1,w:1.5},"",{x:13.55,w:1.5},""],
[{r:12,y:-6,x:5},"","","",""],
[{x:4.5},"","","",""],
[{x:4.8},"","","",""],
[{x:5.3},"","","",""],
[{x:6.45,w:2},"",{w:1.25},""],
[{y:-0.95,x:4.95,w:1.5},""],
[{r:-12,y:-1.45,x:8.55},"","","",""],
[{x:8.05},"","","",""],
[{x:8.2},"","","",""],
[{x:7.75},"","","",""],
[{x:7.75,w:2.75},""],
[{y:-0.95,x:10.5,w:1.5},""]

3
layouts/default/alice_split_bs/readme.md Normal file
View file

@ -0,0 +1,3 @@
# alice_split_bs
LAYOUT_alice_split_bs

15
layouts/default/readme.md
View file

@ -496,6 +496,21 @@ LAYOUT_alice
└─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘
```
```
LAYOUT_alice_split_bs
┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐ ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
│ │ │ │ │ │ │ │ │ │ │
└─────┘ └─────┴───────┴─────┘ └──────────┴─────┘ └─────┘
```
```
LAYOUT_ergodox
┌─────┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬─────┐