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
This commit is contained in:
James Young
GitHub
parent
a5a65fb1e2
commit
138c3e7042
74 changed files with 933 additions and 123 deletions
|
|
@ -3,9 +3,9 @@
|
|||
#include "quantum.h"
|
||||
|
||||
#define KNO KC_NO
|
||||
#define LAYOUT_default LAYOUT_alice
|
||||
#define LAYOUT_default LAYOUT_alice_split_bs
|
||||
|
||||
#define LAYOUT_alice( \
|
||||
#define LAYOUT_alice_split_bs( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \
|
||||
|
|
@ -18,3 +18,17 @@
|
|||
{ KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
|
||||
{ KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \
|
||||
}
|
||||
|
||||
#define LAYOUT_alice( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
|
||||
K20, K21, K22, K23, K24, K25, K26, K28, K29, K2A, K2B, K2C, K2D, K2F, \
|
||||
K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
|
||||
K41, K43, K44, K46, K49, K4B, K4F \
|
||||
) { \
|
||||
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F }, \
|
||||
{ K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
|
||||
{ K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F }, \
|
||||
{ KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
|
||||
{ KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F } \
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"width": 19.75,
|
||||
"height": 5.25,
|
||||
"layouts": {
|
||||
"LAYOUT_alice": {
|
||||
"LAYOUT_alice_split_bs": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0.5, "y":0},
|
||||
{"label":"`", "x":1.75, "y":0.25},
|
||||
|
|
@ -70,6 +70,79 @@
|
|||
{"label":"Shift", "x":17, "y":3.25, "w":1.75},
|
||||
{"label":"Fn", "x":18.75, "y":3.25},
|
||||
|
||||
{"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
|
||||
{"label":"Alt", "x":5, "y":4.25, "w":1.5},
|
||||
{"label":"Space", "x":6.5, "y":4.25, "w":2},
|
||||
{"label":"Menu", "x":8.5, "y":4.25},
|
||||
{"label":"Space", "x":10.25, "y":4.25, "w":2.75},
|
||||
{"label":"Alt", "x":13, "y":4.25, "w":1.5},
|
||||
{"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
|
||||
]
|
||||
},
|
||||
"LAYOUT_alice": {
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0.5, "y":0},
|
||||
{"label":"`", "x":1.75, "y":0.25},
|
||||
{"label":"1", "x":2.75, "y":0.25},
|
||||
{"label":"2", "x":3.75, "y":0},
|
||||
{"label":"3", "x":4.75, "y":0.25},
|
||||
{"label":"4", "x":5.75, "y":0.25},
|
||||
{"label":"5", "x":6.75, "y":0.25},
|
||||
{"label":"6", "x":7.75, "y":0.25},
|
||||
{"label":"7", "x":11, "y":0.25},
|
||||
{"label":"8", "x":12, "y":0.25},
|
||||
{"label":"9", "x":13, "y":0.25},
|
||||
{"label":"0", "x":14, "y":0.25},
|
||||
{"label":"-", "x":15, "y":0},
|
||||
{"label":"=", "x":16, "y":0.25},
|
||||
{"label":"Backspace", "x":17, "y":0.25, "w":2},
|
||||
|
||||
{"label":"PgUp", "x":0.25, "y":1},
|
||||
{"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
|
||||
{"label":"Q", "x":3, "y":1.25},
|
||||
{"label":"W", "x":4.25, "y":1.25},
|
||||
{"label":"E", "x":5.25, "y":1.25},
|
||||
{"label":"R", "x":6.25, "y":1.25},
|
||||
{"label":"T", "x":7.25, "y":1.25},
|
||||
{"label":"Y", "x":10.5, "y":1.25},
|
||||
{"label":"U", "x":11.5, "y":1.25},
|
||||
{"label":"I", "x":12.5, "y":1.25},
|
||||
{"label":"O", "x":13.5, "y":1.25},
|
||||
{"label":"P", "x":14.75, "y":1.25},
|
||||
{"label":"{", "x":15.75, "y":1.25},
|
||||
{"label":"}", "x":16.75, "y":1.25},
|
||||
{"label":"|", "x":17.75, "y":1.25, "w":1.5},
|
||||
|
||||
{"label":"PgDn", "x":0, "y":2},
|
||||
{"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
|
||||
{"label":"A", "x":3.25, "y":2.25},
|
||||
{"label":"S", "x":4.5, "y":2.25},
|
||||
{"label":"D", "x":5.5, "y":2.25},
|
||||
{"label":"F", "x":6.5, "y":2.25},
|
||||
{"label":"G", "x":7.5, "y":2.25},
|
||||
{"label":"H", "x":10.75, "y":2.25},
|
||||
{"label":"J", "x":11.75, "y":2.25},
|
||||
{"label":"K", "x":12.75, "y":2.25},
|
||||
{"label":"L", "x":13.75, "y":2.25},
|
||||
{"label":":", "x":15.25, "y":2.25},
|
||||
{"label":"\"", "x":16.25, "y":2.25},
|
||||
{"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
|
||||
|
||||
{"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
|
||||
{"label":"Z", "x":3.75, "y":3.25},
|
||||
{"label":"X", "x":5, "y":3.25},
|
||||
{"label":"C", "x":6, "y":3.25},
|
||||
{"label":"V", "x":7, "y":3.25},
|
||||
{"label":"B", "x":8, "y":3.25},
|
||||
{"label":"Fn", "x":10.25, "y":3.25},
|
||||
{"label":"N", "x":11.25, "y":3.25},
|
||||
{"label":"M", "x":12.25, "y":3.25},
|
||||
{"label":"<", "x":13.25, "y":3.25},
|
||||
{"label":">", "x":15, "y":3.25},
|
||||
{"label":"?", "x":16, "y":3.25},
|
||||
{"label":"Shift", "x":17, "y":3.25, "w":1.75},
|
||||
{"label":"Fn", "x":18.75, "y":3.25},
|
||||
|
||||
{"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
|
||||
{"label":"Alt", "x":5, "y":4.25, "w":1.5},
|
||||
{"label":"Space", "x":6.5, "y":4.25, "w":2},
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define _FN1 1
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_BASE] = LAYOUT_alice(
|
||||
[_BASE] = LAYOUT_alice_split_bs(
|
||||
KC_ESC, KC_TILD, 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_DEL, 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,
|
||||
|
|
@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_LCTL, KC_LALT, KC_SPC, MO(_FN1), KC_SPC, KC_RALT, KC_RCTL
|
||||
),
|
||||
|
||||
[_FN1] = LAYOUT_alice(
|
||||
[_FN1] = LAYOUT_alice_split_bs(
|
||||
RGB_TOG, _______, 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,
|
||||
RGB_MOD, _______, _______, KC_UP, _______, _______, _______, RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
|
||||
RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______, _______,
|
||||
|
|
|
|||
|
|
@ -24,28 +24,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_alice(
|
||||
[0] = LAYOUT_alice_split_bs(
|
||||
KC_ESC, KC_TILD, 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_DEL, 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_RGUI,
|
||||
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
|
||||
),
|
||||
[1] = LAYOUT_alice(
|
||||
[1] = LAYOUT_alice_split_bs(
|
||||
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, 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, 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,
|
||||
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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[2] = LAYOUT_alice(
|
||||
[2] = LAYOUT_alice_split_bs(
|
||||
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, 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, 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,
|
||||
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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[3] = LAYOUT_alice(
|
||||
[3] = LAYOUT_alice_split_bs(
|
||||
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, 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, 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,
|
||||
|
|
|
|||
|
|
@ -24,4 +24,3 @@ WS2812_DRIVER = spi
|
|||
|
||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||
LAYOUTS = alice
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
LAYOUTS = alice alice_split_bs
|
||||
DEFAULT_FOLDER = projectkb/alice/rev1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue