diff options
74 files changed, 933 insertions, 123 deletions
| diff --git a/keyboards/cheshire/curiosity/curiosity.h b/keyboards/cheshire/curiosity/curiosity.h index e250eda8f0..c26b03e20a 100644 --- a/keyboards/cheshire/curiosity/curiosity.h +++ b/keyboards/cheshire/curiosity/curiosity.h @@ -26,7 +26,7 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define LAYOUT_default( \ +#define LAYOUT_alice_split_bs( \    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \    K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \    K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \ @@ -40,3 +40,20 @@      { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \      { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \  } + +#define LAYOUT_alice( \ +  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \ +  K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \ +  K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \ +        K301, K302, K303, K304, K305, K306,       K308, K309, K310, K311, K312, K313, K314, K315, \ +        K401,       K403,       K405, K406,             K409,       K411,                K414 \ +) \ +{ \ +    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \ +    { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \ +    { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \ +    { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \ +    { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \ +} + +#define LAYOUT_default LAYOUT_alice_split_bs diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json index f989546584..d9a28d0160 100644 --- a/keyboards/cheshire/curiosity/info.json +++ b/keyboards/cheshire/curiosity/info.json @@ -4,7 +4,7 @@      "width": 19.75,      "height": 5.25,      "layouts": { -        "LAYOUT_default": { +        "LAYOUT_alice_split_bs": {              "layout": [                  {"label":"Esc", "x":0.5, "y":0},                  {"label":"`", "x":1.75, "y":0.25}, @@ -77,6 +77,79 @@                  {"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}, +                {"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} +            ]          }      }  } diff --git a/keyboards/cheshire/curiosity/rules.mk b/keyboards/cheshire/curiosity/rules.mk index 354465a084..d9a7d86ab3 100644 --- a/keyboards/cheshire/curiosity/rules.mk +++ b/keyboards/cheshire/curiosity/rules.mk @@ -15,3 +15,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend  NKRO_ENABLE = no            # USB Nkey Rollover  BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality  RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk index 462340c737..d35a6a6592 100644 --- a/keyboards/coarse/cordillera/rules.mk +++ b/keyboards/coarse/cordillera/rules.mk @@ -18,5 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output +LAYOUTS = alice alice_split_bs +  # Enter lower-power sleep mode when on the ChibiOS idle thread  OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/ergosaurus/ergosaurus.h index c78a2db32b..cef594993d 100644 --- a/keyboards/ergosaurus/ergosaurus.h +++ b/keyboards/ergosaurus/ergosaurus.h @@ -19,7 +19,7 @@  #define KNO KC_NO -#define LAYOUT( \ +#define LAYOUT_alice_split_bs( \    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \    K20, K30, K21, K31, K22, K32, K23,      K33, K24, K34, K25, K35, K26, K36, K27, \    K40, K50, K41, K51, K42, K52, K43,      K53, K44, K54, K45, K55, K46,      K47, \ @@ -36,3 +36,5 @@    {  KNO, K71, K72, K73, K74, K75, K76, KNO  }, \    {  K80, K81, K82, K83, K84, K85, KNO, K87  }  \  } + +#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/ergosaurus/info.json b/keyboards/ergosaurus/info.json index 97873afd2e..13fda81f87 100644 --- a/keyboards/ergosaurus/info.json +++ b/keyboards/ergosaurus/info.json @@ -4,7 +4,7 @@      "width": 19.75,      "height": 5.25,      "layouts": { -        "LAYOUT": { +        "LAYOUT_alice_split_bs": {              "layout": [                  {"label":"`", "x":0.5, "y":0},                  {"label":"Esc", "x":1.75, "y":0.25}, diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/ergosaurus/keymaps/default/keymap.c index 565906e038..42cf9082e4 100644 --- a/keyboards/ergosaurus/keymaps/default/keymap.c +++ b/keyboards/ergosaurus/keymaps/default/keymap.c @@ -21,7 +21,7 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -  [BASE] = LAYOUT( +  [BASE] = LAYOUT_alice_split_bs(        KC_GRV,  KC_ESC, 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_BSLS,  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_BSPC,        KC_PGDN, KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                 KC_LGUI,          KC_LALT, KC_ENT, MO(RAISE),                            KC_SPC,           KC_RALT,                          KC_RCTL      ), -    [LOWER] = LAYOUT( +    [LOWER] = LAYOUT_alice_split_bs(        _______,  KC_GRV, 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_UP, _______, _______,        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, KC_LEFT, KC_RIGHT,          _______, @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                  _______,          _______, _______, _______,                            _______,          _______,                              _______      ), -    [RAISE] = LAYOUT( +    [RAISE] = LAYOUT_alice_split_bs(        _______,  _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,        _______,  _______,  _______, _______,  _______, _______, _______,          _______, _______, KC_UP, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______, diff --git a/keyboards/ergosaurus/rules.mk b/keyboards/ergosaurus/rules.mk index 62676d1c5b..f504ffaeb9 100644 --- a/keyboards/ergosaurus/rules.mk +++ b/keyboards/ergosaurus/rules.mk @@ -30,3 +30,5 @@ UNICODE_ENABLE = no         # Unicode  BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  AUDIO_ENABLE = no           # Audio output on port C6  FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches + +LAYOUTS = alice_split_bs diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json index 678b081428..a98ee650cf 100644 --- a/keyboards/evyd13/wonderland/info.json +++ b/keyboards/evyd13/wonderland/info.json @@ -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} +            ]          }      }  } diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk index 3a7e92f4db..1f671c37c3 100644 --- a/keyboards/evyd13/wonderland/rules.mk +++ b/keyboards/evyd13/wonderland/rules.mk @@ -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 diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h index 075e3f64b4..13ea147638 100644 --- a/keyboards/evyd13/wonderland/wonderland.h +++ b/keyboards/evyd13/wonderland/wonderland.h @@ -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); diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h index 46480e6688..b77c81fa1a 100755 --- a/keyboards/fallacy/fallacy.h +++ b/keyboards/fallacy/fallacy.h @@ -21,7 +21,7 @@   * - Split Backspace   * - Split Right Shift   */ -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \      K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012, K013, K014, \      K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \      K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \ @@ -39,7 +39,7 @@   * - Full size Backspace   * - Full size Right Shift   */ -#define LAYOUT_default( \ +#define LAYOUT_alice( \      K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012,       K014, \      K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \      K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \ @@ -52,3 +52,6 @@      { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \      { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \  } + +#define LAYOUT_default LAYOUT_alice +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index fe30e1bfe2..a8cf6b0a59 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -4,7 +4,7 @@      "width": 18.75,       "height": 5,       "layouts": { -        "LAYOUT_all": { +        "LAYOUT_alice_split_bs": {              "layout": [                  {"label":"Esc", "x":0.5, "y":0},                  {"label":"~", "x":1.75, "y":0}, @@ -74,7 +74,7 @@                  {"label":"RCtl", "x":17, "y":4, "w":1.5}              ]          }, -        "LAYOUT_default": { +        "LAYOUT_alice": {              "layout": [                  {"label":"Esc", "x":0.5, "y":0},                  {"label":"~", "x":1.75, "y":0}, diff --git a/keyboards/fallacy/keymaps/default/keymap.c b/keyboards/fallacy/keymaps/default/keymap.c index d0e32c42c9..45afc45425 100755 --- a/keyboards/fallacy/keymaps/default/keymap.c +++ b/keyboards/fallacy/keymaps/default/keymap.c @@ -17,14 +17,14 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    [0] = LAYOUT_default( +    [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_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_RGUI, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                      KC_LCTL,                   KC_LALT, KC_SPC,  KC_LGUI,                   KC_SPC,           KC_RALT,                            KC_RCTL), -    [1] = LAYOUT_default( +    [1] = LAYOUT_alice(          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,          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, diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk index 1ab94f774e..c3c94521b1 100755 --- a/keyboards/fallacy/rules.mk +++ b/keyboards/fallacy/rules.mk @@ -27,3 +27,5 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches  SRC += indicators.c \         drivers/issi/is31fl3731-simple.c  QUANTUM_LIB_SRC += i2c_master.c + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h index c1e88abe83..dbf31f5680 100644 --- a/keyboards/handwired/colorlice/colorlice.h +++ b/keyboards/handwired/colorlice/colorlice.h @@ -26,7 +26,7 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define LAYOUT( \ +#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, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      K2e,      \ @@ -40,3 +40,4 @@      { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \  } +#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 0b2887625c..85deaed42b 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -5,7 +5,7 @@      "width": 17.75,      "height": 5,      "layouts": { -      "LAYOUT": { +      "LAYOUT_alice_split_bs": {          "layout": [            {"label":"K63", "x":0, "y":0},            {"label":"K00", "x":1.25, "y":0}, diff --git a/keyboards/handwired/colorlice/keymaps/default/keymap.c b/keyboards/handwired/colorlice/keymaps/default/keymap.c index 84257a1208..e94aeaae4e 100644 --- a/keyboards/handwired/colorlice/keymaps/default/keymap.c +++ b/keyboards/handwired/colorlice/keymaps/default/keymap.c @@ -17,14 +17,14 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	[0] = LAYOUT( +	[0] = LAYOUT_alice_split_bs(          RGB_TOG,    KC_GESC,    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_GRV, KC_BSLS,          RGB_MOD,    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_BSPC,  		KC_PGDN,    KC_LCTL,    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(1),  		KC_LGUI,    KC_LALT,    KC_SPC, KC_LGUI,        KC_SPC,         KC_RALT,        KC_RCTL), -	[1] = LAYOUT( +	[1] = LAYOUT_alice_split_bs(          _______,    _______, 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_DEL,          _______,    _______, _______,   KC_UP, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD  , _______, _______,          _______,    _______, KC_LEFT,   KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          RESET, diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index 9e043adf4b..1c0ec5c911 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk @@ -33,3 +33,5 @@ LTO_ENABLE = no             # Use link time optimization  RGB_MATRIX_ENABLE = yes  RGB_MATRIX_DRIVER = WS2812  RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow + +LAYOUTS = alice_split_bs diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index 6e5345c337..7163bd455c 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -13,11 +13,11 @@              "key_count": 72,              "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]          }, -        "LAYOUT_owlet60_60_percent_split_bsp": { +        "LAYOUT_alice_split_bs": {              "key_count": 66,              "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]          }, -        "LAYOUT_owlet60_60_percent_full_bsp": { +        "LAYOUT_alice": {              "key_count": 65,              "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]          } diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h index f17f40fdaf..b54c3df0e2 100644 --- a/keyboards/handwired/owlet60/owlet60.h +++ b/keyboards/handwired/owlet60/owlet60.h @@ -61,7 +61,7 @@      { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \  } -#define LAYOUT_owlet60_60_percent_split_bsp( \ +#define LAYOUT_alice_split_bs( \      k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \      k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \      k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           \ @@ -79,7 +79,7 @@      { k01, k03, k05, k06, k09, k0b, k0d, k0e} \  } -#define LAYOUT_owlet60_60_percent_full_bsp( \ +#define LAYOUT_alice( \      k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \      k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \      k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,       \ @@ -96,3 +96,6 @@      { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \      { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \  } + +#define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs +#define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk index c3c94c91da..126ec89628 100644 --- a/keyboards/handwired/owlet60/rules.mk +++ b/keyboards/handwired/owlet60/rules.mk @@ -33,4 +33,6 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches  CUSTOM_MATRIX = yes  OLED_DRIVER_ENABLE = no -SRC += matrix.c
\ No newline at end of file +SRC += matrix.c + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json index 2dedbfb806..b738a376f2 100644 --- a/keyboards/kb_elmo/sesame/info.json +++ b/keyboards/kb_elmo/sesame/info.json @@ -5,7 +5,7 @@    "width": 17.75,    "height": 5,    "layouts": { -    "LAYOUT": { +    "LAYOUT_alice": {        "layout": [          {"x":0, "y":0},          {"x":1.25, "y":0}, @@ -74,7 +74,7 @@          {"x":16.75, "y":4, "w":1.5}        ]      }, -    "LAYOUT_all": { +    "LAYOUT_alice_split_bs": {        "layout": [          {"x":0, "y":0},          {"x":1.25, "y":0}, diff --git a/keyboards/kb_elmo/sesame/keymaps/default/keymap.c b/keyboards/kb_elmo/sesame/keymaps/default/keymap.c index e1c74203ef..0236edb943 100644 --- a/keyboards/kb_elmo/sesame/keymaps/default/keymap.c +++ b/keyboards/kb_elmo/sesame/keymaps/default/keymap.c @@ -17,14 +17,14 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      /* Base */ -    [0] = LAYOUT( +    [0] = LAYOUT_alice(          KC_PAUS, KC_ESC,  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_PSCR, 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_F5,   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(1),                   KC_LCTL,          KC_LALT,          KC_SPC,           KC_LGUI,  KC_SPC,           KC_RALT,                   KC_RCTL      ), -    [1] = LAYOUT( +    [1] = LAYOUT_alice(          KC_TRNS, KC_GRV,  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_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, diff --git a/keyboards/kb_elmo/sesame/rules.mk b/keyboards/kb_elmo/sesame/rules.mk index e5b427e5a5..0198f30388 100644 --- a/keyboards/kb_elmo/sesame/rules.mk +++ b/keyboards/kb_elmo/sesame/rules.mk @@ -23,3 +23,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality  RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/kb_elmo/sesame/sesame.h b/keyboards/kb_elmo/sesame/sesame.h index a51023be41..d596619c3a 100644 --- a/keyboards/kb_elmo/sesame/sesame.h +++ b/keyboards/kb_elmo/sesame/sesame.h @@ -26,7 +26,7 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define LAYOUT( \ +#define LAYOUT_alice( \      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \      k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \ @@ -40,7 +40,7 @@      { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \  } -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \      k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \ @@ -81,3 +81,6 @@      { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \      { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \  } + +#define LAYOUT LAYOUT_alice +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h index d28502da26..5a5673abc7 100644 --- a/keyboards/mechlovin/adelais/adelais.h +++ b/keyboards/mechlovin/adelais/adelais.h @@ -18,7 +18,7 @@  #include "quantum.h" -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \      K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\      K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\      K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\ @@ -31,3 +31,19 @@      { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \      { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \  } + +#define LAYOUT_alice( \ +    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \ +    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\ +    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\ +         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\ +         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \ +) { \ +    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \ +    { 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,   KC_NO, K2D,   K2E   }, \ +    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \ +    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \ +} + +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 4babd9078a..d65935a4f7 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -5,7 +5,7 @@      "width": 18.5,      "height": 5,      "layouts": { -        "LAYOUT_all": { +        "LAYOUT_alice_split_bs": {              "key_count": 66,              "layout": [                  {"label":"K1E", "x":0, "y":0}, @@ -75,6 +75,75 @@                  {"label":"K4A", "x":12.5, "y":4, "w":1.25},                  {"label":"K4E", "x":17, "y":4, "w":1.5}              ] +        }, +        "LAYOUT_alice": { +            "layout": [ +                {"label":"K1E", "x":0, "y":0}, +                {"label":"K00", "x":1.5, "y":0}, +                {"label":"K01", "x":2.5, "y":0}, +                {"label":"K02", "x":3.5, "y":0}, +                {"label":"K03", "x":4.5, "y":0}, +                {"label":"K04", "x":5.5, "y":0}, +                {"label":"K05", "x":6.5, "y":0}, +                {"label":"K06", "x":7.5, "y":0}, +                {"label":"K07", "x":10.5, "y":0}, +                {"label":"K08", "x":11.5, "y":0}, +                {"label":"K09", "x":12.5, "y":0}, +                {"label":"K0A", "x":13.5, "y":0}, +                {"label":"K0B", "x":14.5, "y":0}, +                {"label":"K0C", "x":15.5, "y":0}, +                {"label":"K0D", "x":16.5, "y":0, "w":2}, +                {"label":"K2E", "x":0, "y":1}, +                {"label":"K10", "x":1.5, "y":1, "w":1.5}, +                {"label":"K11", "x":3, "y":1}, +                {"label":"K12", "x":4, "y":1}, +                {"label":"K13", "x":5, "y":1}, +                {"label":"K14", "x":6, "y":1}, +                {"label":"K15", "x":7, "y":1}, +                {"label":"K16", "x":10, "y":1}, +                {"label":"K17", "x":11, "y":1}, +                {"label":"K18", "x":12, "y":1}, +                {"label":"K19", "x":13, "y":1}, +                {"label":"K1A", "x":14, "y":1}, +                {"label":"K1B", "x":15, "y":1}, +                {"label":"K1C", "x":16, "y":1}, +                {"label":"K1D", "x":17, "y":1, "w":1.5}, +                {"label":"K3E", "x":0, "y":2}, +                {"label":"K20", "x":1.5, "y":2, "w":1.75}, +                {"label":"K21", "x":3.25, "y":2}, +                {"label":"K22", "x":4.25, "y":2}, +                {"label":"K23", "x":5.25, "y":2}, +                {"label":"K24", "x":6.25, "y":2}, +                {"label":"K25", "x":7.25, "y":2}, +                {"label":"K26", "x":10.25, "y":2}, +                {"label":"K27", "x":11.25, "y":2}, +                {"label":"K28", "x":12.25, "y":2}, +                {"label":"K29", "x":13.25, "y":2}, +                {"label":"K2A", "x":14.25, "y":2}, +                {"label":"K2B", "x":15.25, "y":2}, +                {"label":"K2D", "x":16.25, "y":2, "w":2.25}, +                {"label":"K30", "x":1.5, "y":3, "w":2.25}, +                {"label":"K32", "x":3.75, "y":3}, +                {"label":"K33", "x":4.75, "y":3}, +                {"label":"K34", "x":5.75, "y":3}, +                {"label":"K35", "x":6.75, "y":3}, +                {"label":"K36", "x":7.75, "y":3}, +                {"label":"K37", "x":9.75, "y":3}, +                {"label":"K38", "x":10.75, "y":3}, +                {"label":"K39", "x":11.75, "y":3}, +                {"label":"K3A", "x":12.75, "y":3}, +                {"label":"K3B", "x":13.75, "y":3}, +                {"label":"K4D", "x":14.75, "y":3}, +                {"label":"K3C", "x":15.75, "y":3, "w":1.75}, +                {"label":"K3D", "x":17.5, "y":3}, +                {"label":"K40", "x":1.5, "y":4, "w":1.5}, +                {"label":"K42", "x":4.5, "y":4, "w":1.25}, +                {"label":"K44", "x":5.75, "y":4, "w":2.25}, +                {"label":"K46", "x":8, "y":4, "w":1.25}, +                {"label":"K48", "x":9.75, "y":4, "w":2.75}, +                {"label":"K4A", "x":12.5, "y":4, "w":1.25}, +                {"label":"K4E", "x":17, "y":4, "w":1.5} +            ]          }      }      ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk index e1d36928fe..0b6e62c603 100644 --- a/keyboards/mechlovin/adelais/rules.mk +++ b/keyboards/mechlovin/adelais/rules.mk @@ -19,4 +19,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  AUDIO_ENABLE = no           # Audio output on port C6  FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches +LAYOUTS = alice alice_split_bs +  DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2
\ No newline at end of file diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index abf155f1c5..4d4574f9d4 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -5,7 +5,7 @@      "width": 20,      "height": 5.25,      "layouts": { -        "LAYOUT": { +        "LAYOUT_alice_split_bs": {               "layout": [  				{"x":0.5, "y":0},   				{"x":2, "y":0},  diff --git a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c index cf2e561c79..aff0c916ab 100644 --- a/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c +++ b/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c @@ -16,14 +16,14 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    [0] = LAYOUT( +    [0] = LAYOUT_alice_split_bs(          KC_ESC,     KC_GESC, 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_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(1),                                  KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),	           KC_SPC,           KC_RGUI,                            KC_RCTL                 ), -    [1] = LAYOUT( +    [1] = LAYOUT_alice_split_bs(          RESET,      _______, 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_BRIU,    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______  , _______, KC_DEL,                    KC_BRID,    _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,           diff --git a/keyboards/nightly_boards/alter/rev1/rev1.h b/keyboards/nightly_boards/alter/rev1/rev1.h index ee919c56d4..8fbbc71aaf 100644 --- a/keyboards/nightly_boards/alter/rev1/rev1.h +++ b/keyboards/nightly_boards/alter/rev1/rev1.h @@ -26,7 +26,7 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define LAYOUT( \ +#define LAYOUT_alice_split_bs( \         K00,   K10, K01, K11, K02, K12, K03, K13,         K04, K14, K05, K15, K06, K16, K17, K07,     \        K20,  K30,    K21,  K31, K22, K32, K23,          K24, K34, K25, K35,  K26, K36, K27, K37,      \       K40,  K50,     K51,   K42, K52, K43, K53,          K44, K54, K45, K55,    K46, K56, K47,        \ @@ -44,3 +44,5 @@      { KC_NO, KC_NO, K82,   K83,   K84,   KC_NO, KC_NO, K87   }, \      { K90,   KC_NO, K92,   KC_NO, KC_NO, K95,   KC_NO, KC_NO }, \  } + +#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/nightly_boards/alter/rev1/rules.mk b/keyboards/nightly_boards/alter/rev1/rules.mk index 5dbee69a10..dafed5b012 100644 --- a/keyboards/nightly_boards/alter/rev1/rules.mk +++ b/keyboards/nightly_boards/alter/rev1/rules.mk @@ -28,4 +28,6 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow  MIDI_ENABLE = no            # MIDI support  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output -FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
\ No newline at end of file +FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches + +LAYOUTS = alice_split_bs diff --git a/keyboards/projectkb/alice/alice.h b/keyboards/projectkb/alice/alice.h index 00bec92b96..19052c43fc 100644 --- a/keyboards/projectkb/alice/alice.h +++ b/keyboards/projectkb/alice/alice.h @@ -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  }  \ +} diff --git a/keyboards/projectkb/alice/info.json b/keyboards/projectkb/alice/info.json index 99311265a3..299612c1ac 100644 --- a/keyboards/projectkb/alice/info.json +++ b/keyboards/projectkb/alice/info.json @@ -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}, @@ -78,6 +78,79 @@                  {"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}, +                {"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} +            ]          }      }  } diff --git a/keyboards/projectkb/alice/keymaps/default/keymap.c b/keyboards/projectkb/alice/keymaps/default/keymap.c index 1566f128c6..a6d222b02d 100644 --- a/keyboards/projectkb/alice/keymaps/default/keymap.c +++ b/keyboards/projectkb/alice/keymaps/default/keymap.c @@ -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, _______, _______, _______,          _______, diff --git a/keyboards/projectkb/alice/keymaps/via/keymap.c b/keyboards/projectkb/alice/keymaps/via/keymap.c index 57095e991e..f2e14aaa05 100644 --- a/keyboards/projectkb/alice/keymaps/via/keymap.c +++ b/keyboards/projectkb/alice/keymaps/via/keymap.c @@ -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, diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk index ddf0b6a880..aea9f17ac3 100644 --- a/keyboards/projectkb/alice/rev2/rules.mk +++ b/keyboards/projectkb/alice/rev2/rules.mk @@ -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 diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk index d672576992..39e431df83 100644 --- a/keyboards/projectkb/alice/rules.mk +++ b/keyboards/projectkb/alice/rules.mk @@ -1 +1,2 @@ +LAYOUTS = alice alice_split_bs  DEFAULT_FOLDER = projectkb/alice/rev1 diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/ramonimbao/aelith/info.json index e001c1d4d1..47e11dcc11 100644 --- a/keyboards/ramonimbao/aelith/info.json +++ b/keyboards/ramonimbao/aelith/info.json @@ -85,6 +85,86 @@                  {"x":13, "y":4, "w":1.5},                  {"x":17.5, "y":4, "w":1.5}              ] +        }, +        "LAYOUT_alice": { +            "layout": [ +                {"x":0.5, "y":0}, + +                {"x":1.75, "y":0}, +                {"x":2.75, "y":0}, +                {"x":3.75, "y":0}, +                {"x":4.75, "y":0}, +                {"x":5.75, "y":0}, +                {"x":6.75, "y":0}, +                {"x":7.75, "y":0}, + +                {"x":11, "y":0}, +                {"x":12, "y":0}, +                {"x":13, "y":0}, +                {"x":14, "y":0}, +                {"x":15, "y":0}, +                {"x":16, "y":0}, +                {"x":17, "y":0, "w":2}, + +                {"x":0.25, "y":1}, +                {"x":1.75, "y":1, "w":1.5}, +                {"x":3.25, "y":1}, +                {"x":4.25, "y":1}, +                {"x":5.25, "y":1}, +                {"x":6.25, "y":1}, +                {"x":7.25, "y":1}, + +                {"x":10.5, "y":1}, +                {"x":11.5, "y":1}, +                {"x":12.5, "y":1}, +                {"x":13.5, "y":1}, +                {"x":14.5, "y":1}, +                {"x":15.5, "y":1}, +                {"x":16.5, "y":1}, +                {"x":17.5, "y":1, "w":1.5}, + +                {"x":0, "y":2}, + +                {"x":1.75, "y":2, "w":1.75}, +                {"x":3.5, "y":2}, +                {"x":4.5, "y":2}, +                {"x":5.5, "y":2}, +                {"x":6.5, "y":2}, +                {"x":7.5, "y":2}, + +                {"x":10.75, "y":2}, +                {"x":11.75, "y":2}, +                {"x":12.75, "y":2}, +                {"x":13.75, "y":2}, +                {"x":14.75, "y":2}, +                {"x":15.75, "y":2}, +                {"x":16.75, "y":2, "w":2.25}, + +                {"x":1.75, "y":3, "w":2.25}, +                {"x":4, "y":3}, +                {"x":5, "y":3}, +                {"x":6, "y":3}, +                {"x":7, "y":3}, +                {"x":8, "y":3}, + +                {"x":10.25, "y":3}, +                {"x":11.25, "y":3}, +                {"x":12.25, "y":3}, +                {"x":13.25, "y":3}, +                {"x":14.25, "y":3}, +                {"x":15.25, "y":3}, +                {"x":16.25, "y":3, "w":1.75}, +                {"x":18, "y":3}, + +                {"x":1.75, "y":4, "w":1.5}, +                {"x":4.5, "y":4, "w":1.5}, +                {"x":6, "y":4, "w":2.25}, +                {"x":8.25, "y":4}, + +                {"x":10.25, "y":4, "w":2.75}, +                {"x":13, "y":4, "w":1.5}, +                {"x":17.5, "y":4, "w":1.5} +            ]          }      }  } diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/ramonimbao/aelith/rules.mk index 5e4cc3d689..530426307b 100644 --- a/keyboards/ramonimbao/aelith/rules.mk +++ b/keyboards/ramonimbao/aelith/rules.mk @@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output -LAYOUTS = alice +LAYOUTS = alice alice_split_bs diff --git a/keyboards/sck/osa/info.json b/keyboards/sck/osa/info.json index 64ed057e4a..3736ebeec5 100644 --- a/keyboards/sck/osa/info.json +++ b/keyboards/sck/osa/info.json @@ -13,11 +13,11 @@              "key_count": 65,              "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          }, -        "LAYOUT_split_right_shift": { +        "LAYOUT_alice": {              "key_count": 65,              "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          }, -        "LAYOUT_all": { +        "LAYOUT_alice_split_bs": {              "key_count": 66,              "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          } diff --git a/keyboards/sck/osa/keymaps/all/keymap.c b/keyboards/sck/osa/keymaps/all/keymap.c index 378f8ed58f..01bd9da259 100644 --- a/keyboards/sck/osa/keymaps/all/keymap.c +++ b/keyboards/sck/osa/keymaps/all/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {     *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|     *       `----------------------------------------------------------------------'     */ -[0] = LAYOUT_all( /* OSA Base */ +[0] = LAYOUT_alice_split_bs( /* OSA Base */  	KC_DEL,   KC_ESC,  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_GRV,  KC_BSLS,  	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_BSPC,  	KC_PGDN,  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    					 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {     *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|     *       `----------------------------------------------------------------------'     */ -[1] = LAYOUT_all( /* OSA Layer 1 */ +[1] = LAYOUT_alice_split_bs( /* OSA Layer 1 */  	KC_SLCK,   KC_ESC,  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_GRV,  KC_BSLS,  	KC_NLCK,  KC_TAB,  KC_Q,    KC_UP,   KC_E,    KC_R,   KC_T,    					 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,  	KC_CLCK,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F,   KC_G,    					 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,          KC_ENT, diff --git a/keyboards/sck/osa/keymaps/splitrs/keymap.c b/keyboards/sck/osa/keymaps/splitrs/keymap.c index a59b66334e..3c64300667 100644 --- a/keyboards/sck/osa/keymaps/splitrs/keymap.c +++ b/keyboards/sck/osa/keymaps/splitrs/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {     *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|     *       `----------------------------------------------------------------------'     */ -[0] = LAYOUT_split_right_shift( /* OSA Base */ +[0] = LAYOUT_alice( /* OSA Base */  	KC_DEL,   KC_ESC,  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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    					 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {     *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|     *       `----------------------------------------------------------------------'     */ -[1] = LAYOUT_split_right_shift( /* OSA Layer 1 */ +[1] = LAYOUT_alice( /* OSA Layer 1 */  	KC_DEL,   KC_ESC,  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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,    					 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, diff --git a/keyboards/sck/osa/keymaps/via/keymap.c b/keyboards/sck/osa/keymaps/via/keymap.c index 2c1af07318..7936802439 100644 --- a/keyboards/sck/osa/keymaps/via/keymap.c +++ b/keyboards/sck/osa/keymaps/via/keymap.c @@ -16,14 +16,14 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_all( +[0] = LAYOUT_alice_split_bs(    KC_DEL,  KC_ESC,  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_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,  MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL    ), -[1] = LAYOUT_all( +[1] = LAYOUT_alice_split_bs(    KC_TRNS, KC_TRNS, 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_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, @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS,                            KC_TRNS    ), -[2] = LAYOUT_all( +[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, @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS,                            KC_TRNS    ), -[3] = LAYOUT_all( +[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, diff --git a/keyboards/sck/osa/osa.h b/keyboards/sck/osa/osa.h index 46cb3cd85f..d6ac51c7be 100644 --- a/keyboards/sck/osa/osa.h +++ b/keyboards/sck/osa/osa.h @@ -77,7 +77,7 @@      { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } -#define LAYOUT_split_right_shift( \ +#define LAYOUT_alice( \    K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \    K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \    K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \ @@ -96,7 +96,7 @@      { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \    K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \    K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \    K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \ @@ -115,3 +115,6 @@      { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } + +#define LAYOUT_split_right_shift LAYOUT_alice +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index c1b724e717..0faf76e7ae 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -30,3 +30,5 @@ UNICODE_ENABLE = no         # Unicode  BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  AUDIO_ENABLE = no           # Audio output on port C6  FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/sneakbox/aliceclone/aliceclone.h b/keyboards/sneakbox/aliceclone/aliceclone.h index 1976a555cc..26ab4472ca 100644 --- a/keyboards/sneakbox/aliceclone/aliceclone.h +++ b/keyboards/sneakbox/aliceclone/aliceclone.h @@ -19,9 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "quantum.h" -#define LAYOUT_all LAYOUT_alice +#define LAYOUT_all LAYOUT_alice_split_bs -#define LAYOUT_alice( \ +#define LAYOUT_alice_split_bs( \  	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \  	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \  	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \ diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json index 461542509f..d5601c9306 100644 --- a/keyboards/sneakbox/aliceclone/info.json +++ b/keyboards/sneakbox/aliceclone/info.json @@ -5,7 +5,7 @@    "width": 18.25,    "height": 5,    "layouts": { -      "LAYOUT_alice": { +      "LAYOUT_alice_split_bs": {            "layout": [                {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},                {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5}, diff --git a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c index 6a6f7fecc0..0dee1fb03a 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c @@ -24,13 +24,13 @@ enum layer_names {  };  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    [_BASE] = LAYOUT_alice( +    [_BASE] = 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_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_LGUI,                      KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL), -    [_FN] = LAYOUT_alice( +    [_FN] = LAYOUT_alice_split_bs(          KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,           KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,           RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,  diff --git a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c index 6a08a15f2b..a8f44e60dc 100644 --- a/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c +++ b/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c @@ -27,25 +27,25 @@ enum layer_names {  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    [_BASE] = LAYOUT_alice( +    [_BASE] = 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_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_LGUI,                      KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL), -    [_FN] = LAYOUT_alice( +    [_FN] = LAYOUT_alice_split_bs(          KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,           KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,           RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, 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), -    [_L3] = LAYOUT_alice( +    [_L3] = 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), -    [_L4] = LAYOUT_alice( +    [_L4] = 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,  diff --git a/keyboards/sneakbox/aliceclone/rules.mk b/keyboards/sneakbox/aliceclone/rules.mk index f477956021..c69b4e5630 100644 --- a/keyboards/sneakbox/aliceclone/rules.mk +++ b/keyboards/sneakbox/aliceclone/rules.mk @@ -21,4 +21,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output  ENCODER_ENABLE = yes -LAYOUTS = alice + +LAYOUTS = alice_split_bs diff --git a/keyboards/tgr/alice/alice.h b/keyboards/tgr/alice/alice.h index 1486612f9f..8525fd85f7 100644 --- a/keyboards/tgr/alice/alice.h +++ b/keyboards/tgr/alice/alice.h @@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "quantum.h" -/* LAYOUT +/* Layout   * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐   * │50 │ │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │   * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ @@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   *       │40   │     │41   │42     │43  │   │46        │47   │           │48   │   *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘   */ -#define LAYOUT( \ +#define LAYOUT_alice_split_bs( \    K50,   K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \    K51,   K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \    K52,   K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B,      K2C,      \ @@ -48,3 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.    { K50  , K51  , K52  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \  } +#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json index b262093326..13377293c3 100644 --- a/keyboards/tgr/alice/info.json +++ b/keyboards/tgr/alice/info.json @@ -5,7 +5,7 @@    "width": 17.75,    "height": 5,    "layouts": { -    "LAYOUT": { +    "LAYOUT_alice_split_bs": {        "key_count": 66,        "layout": [          {"label":"K63", "x":0, "y":0}, diff --git a/keyboards/tgr/alice/keymaps/default/keymap.c b/keyboards/tgr/alice/keymaps/default/keymap.c index 29fff66183..4d4a3ecc7b 100644 --- a/keyboards/tgr/alice/keymaps/default/keymap.c +++ b/keyboards/tgr/alice/keymaps/default/keymap.c @@ -18,14 +18,14 @@ 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] = { -    [0] = LAYOUT( +    [0] = LAYOUT_alice_split_bs(          KC_ESC,     KC_GESC, 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_GRV,  KC_BSLS, \          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_BSPC,          \          KC_PGDN,    KC_LCTL, 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(1),            \                      KC_LGUI,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL           \      ), -    [1] = LAYOUT( +    [1] = LAYOUT_alice_split_bs(          _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \          _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,          \          _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,          \ diff --git a/keyboards/tgr/alice/rules.mk b/keyboards/tgr/alice/rules.mk index 20f0222c11..39af20ef99 100644 --- a/keyboards/tgr/alice/rules.mk +++ b/keyboards/tgr/alice/rules.mk @@ -20,3 +20,5 @@ COMMAND_ENABLE = yes  BACKLIGHT_ENABLE = yes  RGBLIGHT_ENABLE = yes  WS2812_DRIVER = i2c + +LAYOUTS = alice_split_bs diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json index adbc6ee1a9..5a61552126 100644 --- a/keyboards/tkc/osav2/info.json +++ b/keyboards/tkc/osav2/info.json @@ -11,10 +11,10 @@          "LAYOUT_split_backspace": {              "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          }, -        "LAYOUT_split_right_shift": { +        "LAYOUT_alice": {              "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          }, -        "LAYOUT_all": { +        "LAYOUT_alice_split_bs": {              "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]          }      } diff --git a/keyboards/tkc/osav2/osav2.h b/keyboards/tkc/osav2/osav2.h index 46cb3cd85f..d6ac51c7be 100644 --- a/keyboards/tkc/osav2/osav2.h +++ b/keyboards/tkc/osav2/osav2.h @@ -77,7 +77,7 @@      { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } -#define LAYOUT_split_right_shift( \ +#define LAYOUT_alice( \    K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \    K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \    K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \ @@ -96,7 +96,7 @@      { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \    K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \    K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \    K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \ @@ -115,3 +115,6 @@      { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \      { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \  } + +#define LAYOUT_split_right_shift LAYOUT_alice +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/tkc/osav2/rules.mk b/keyboards/tkc/osav2/rules.mk index a11aa7aeef..6a6f28d495 100644 --- a/keyboards/tkc/osav2/rules.mk +++ b/keyboards/tkc/osav2/rules.mk @@ -31,3 +31,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output  FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches  LTO_ENABLE = yes            # Reduces compile size + +LAYOUTS = alice alice_split_bs diff --git a/keyboards/xelus/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json new file mode 100644 index 0000000000..35d8e275df --- /dev/null +++ b/keyboards/xelus/valor/rev1/info.json @@ -0,0 +1,83 @@ +{ +    "keyboard_name": "Xelus Valor rev1", +    "url": "", +    "maintainer": "Xelus22", +    "width": 17.75, +    "height": 5, +    "layouts": { +        "LAYOUT_alice_split_bs": { +            "layout": [ +                {"x":0, "y":0}, +                {"x":1.25, "y":0}, +                {"x":2.25, "y":0}, +                {"x":3.25, "y":0}, +                {"x":4.25, "y":0}, +                {"x":5.25, "y":0}, +                {"x":6.25, "y":0}, +                {"x":7.25, "y":0}, +                {"x":10.25, "y":0}, +                {"x":11.25, "y":0}, +                {"x":12.25, "y":0}, +                {"x":13.25, "y":0}, +                {"x":14.25, "y":0}, +                {"x":15.25, "y":0}, +                {"x":16.25, "y":0}, +                {"x":17.25, "y":0}, + +                {"x":0, "y":1}, +                {"x":1.25, "y":1, "w":1.5}, +                {"x":2.75, "y":1}, +                {"x":3.75, "y":1}, +                {"x":4.75, "y":1}, +                {"x":5.75, "y":1}, +                {"x":6.75, "y":1}, +                {"x":9.75, "y":1}, +                {"x":10.75, "y":1}, +                {"x":11.75, "y":1}, +                {"x":12.75, "y":1}, +                {"x":13.75, "y":1}, +                {"x":14.75, "y":1}, +                {"x":15.75, "y":1}, +                {"x":16.75, "y":1, "w":1.5}, + +                {"x":0, "y":2}, +                {"x":1.25, "y":2, "w":1.75}, +                {"x":3, "y":2}, +                {"x":4, "y":2}, +                {"x":5, "y":2}, +                {"x":6, "y":2}, +                {"x":7, "y":2}, +                {"x":10, "y":2}, +                {"x":11, "y":2}, +                {"x":12, "y":2}, +                {"x":13, "y":2}, +                {"x":14, "y":2}, +                {"x":15, "y":2}, +                {"x":16, "y":2, "w":2.25}, + +                {"x":1.25, "y":3, "w":2.25}, +                {"x":3.5, "y":3}, +                {"x":4.5, "y":3}, +                {"x":5.5, "y":3}, +                {"x":6.5, "y":3}, +                {"x":7.5, "y":3}, +                {"x":9.5, "y":3}, +                {"x":10.5, "y":3}, +                {"x":11.5, "y":3}, +                {"x":12.5, "y":3}, +                {"x":13.5, "y":3}, +                {"x":14.5, "y":3}, +                {"x":15.5, "y":3, "w":1.75}, +                {"x":17.25, "y":3}, + +                {"x":1.25, "y":4, "w":1.5}, +                {"x":4.25, "y":4, "w":1.5}, +                {"x":5.75, "y":4, "w":2}, +                {"x":7.75, "y":4, "w":1.25}, +                {"x":9.5, "y":4, "w":2.75}, +                {"x":12.25, "y":4, "w":1.5}, +                {"x":16.75, "y":4, "w":1.5} +            ] +        } +    } +} diff --git a/keyboards/xelus/valor/rev1/rev1.h b/keyboards/xelus/valor/rev1/rev1.h index c43274605d..3e05ae5e22 100644 --- a/keyboards/xelus/valor/rev1/rev1.h +++ b/keyboards/xelus/valor/rev1/rev1.h @@ -20,7 +20,7 @@  #define ____ KC_NO -#define LAYOUT_all( \ +#define LAYOUT_alice_split_bs( \    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       \    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             \ @@ -33,3 +33,5 @@    { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \    { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ }  \  } + +#define LAYOUT_all LAYOUT_alice_split_bs diff --git a/keyboards/xelus/valor/rev1/rules.mk b/keyboards/xelus/valor/rev1/rules.mk index d3eb6989dc..2840d97f2f 100644 --- a/keyboards/xelus/valor/rev1/rules.mk +++ b/keyboards/xelus/valor/rev1/rules.mk @@ -21,3 +21,5 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow  BLUETOOTH_ENABLE = no       # Enable Bluetooth  AUDIO_ENABLE = no           # Audio output  LTO_ENABLE = yes + +LAYOUTS = alice_split_bs diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 5353a094e9..283d36673f 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -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}, @@ -78,6 +78,79 @@                  {"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}, +                {"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} +            ]          }      }  } diff --git a/keyboards/zoo/wampus/keymaps/default/keymap.c b/keyboards/zoo/wampus/keymaps/default/keymap.c index 0c3a6d0c3f..83d49b0ef0 100644 --- a/keyboards/zoo/wampus/keymaps/default/keymap.c +++ b/keyboards/zoo/wampus/keymaps/default/keymap.c @@ -16,18 +16,18 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -  [0] = LAYOUT_alice( -      KC_TILD, KC_1,      KC_2, KC_3,    KC_4, KC_5,   KC_6,    KC_7, KC_8,   KC_9,    KC_0,    KC_MINUS,  KC_EQUAL, KC_BSPC, KC_DEL, -      KC_ESC,  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_BSLASH, -      KC_PGUP, KC_CAPS,   KC_A, KC_S,    KC_D, KC_F,   KC_G,    KC_H, KC_J,   KC_K,    KC_L,    KC_SCOLON, KC_QUOTE, KC_ENT, -      KC_PGDN, KC_LSHIFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,    KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,    KC_SLASH, KC_RSFT, KC_RGUI, -               KC_LCTL,         KC_LALT,       KC_SPC, KC_LGUI,       KC_SPC, KC_RALT,                                        KC_RCTL +  [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_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_RGUI, +                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL    ), -  [1] = LAYOUT_alice( -      KC_TRNS,  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_TRNS, -      RGB_TOG,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -      RGB_MOD,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -      RGB_RMOD, 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 +  [1] = LAYOUT_alice_split_bs( +      RGB_TOG,    KC_TRNS, 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_TRNS, +      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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    ),  }; diff --git a/keyboards/zoo/wampus/keymaps/via/keymap.c b/keyboards/zoo/wampus/keymaps/via/keymap.c index 2126be5e9f..b9620c67b1 100644 --- a/keyboards/zoo/wampus/keymaps/via/keymap.c +++ b/keyboards/zoo/wampus/keymaps/via/keymap.c @@ -16,32 +16,32 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -  [0] = LAYOUT_alice( -      KC_TILD, KC_1,      KC_2, KC_3,    KC_4, KC_5,   KC_6,    KC_7, KC_8,   KC_9,    KC_0,    KC_MINUS,  KC_EQUAL, KC_BSPC, KC_DEL, -      KC_ESC,  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_BSLASH, -      KC_PGUP, KC_CAPS,   KC_A, KC_S,    KC_D, KC_F,   KC_G,    KC_H, KC_J,   KC_K,    KC_L,    KC_SCOLON, KC_QUOTE, KC_ENT, -      KC_PGDN, KC_LSHIFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,    KC_B, KC_N,   KC_M,    KC_COMM, KC_DOT,    KC_SLASH, KC_RSFT, KC_RGUI, -               KC_LCTL,         KC_LALT,       KC_SPC, KC_LGUI,       KC_SPC, KC_RALT,                                        KC_RCTL +  [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_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_RGUI, +                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL    ), -  [1] = LAYOUT_alice( -      KC_TRNS,  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_TRNS, -      RGB_TOG,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -      RGB_MOD,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -      RGB_RMOD, 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 +  [1] = LAYOUT_alice_split_bs( +      RGB_TOG,    KC_TRNS, 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_TRNS, +      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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( -      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_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, 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( -      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_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, 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    )  }; diff --git a/keyboards/zoo/wampus/rules.mk b/keyboards/zoo/wampus/rules.mk index 9b587fe31e..889e4d858b 100644 --- a/keyboards/zoo/wampus/rules.mk +++ b/keyboards/zoo/wampus/rules.mk @@ -23,4 +23,4 @@ OLED_DRIVER_ENABLE = no     # Enables the use of OLED displays  # Enter lower-power sleep mode when on the ChibiOS idle thread  OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -LAYOUTS = alice +LAYOUTS = alice alice_split_bs diff --git a/keyboards/zoo/wampus/wampus.h b/keyboards/zoo/wampus/wampus.h index a5cdeaf019..f74b58b516 100644 --- a/keyboards/zoo/wampus/wampus.h +++ b/keyboards/zoo/wampus/wampus.h @@ -20,12 +20,12 @@  #define ____ KC_NO -#define LAYOUT_alice( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ -          K401,       K403,       K405, K406,       K408,       K410,                   K414  \ +#define LAYOUT_alice_split_bs( \ +    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ +    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ +    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213, \ +           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ +           K401,       K403,       K405, K406, K408,             K410,                   K414  \  ) { \    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ @@ -33,3 +33,17 @@    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \    { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \  } + +#define LAYOUT_alice( \ +    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ +    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ +    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ +           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ +           K401,       K403,       K405, K406, K408,             K410,                   K414  \ +) { \ +  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \ +  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \ +  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \ +  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \ +  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \ +} diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c index 2adaabcd62..a2998f0094 100644 --- a/layouts/community/alice/stanrc85-alice/keymap.c +++ b/layouts/community/alice/stanrc85-alice/keymap.c @@ -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,                _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/layouts/default/alice/default_alice/keymap.c b/layouts/default/alice/default_alice/keymap.c index 28ab21958d..d65ee309ad 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] = {       *        └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘       */      [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, 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 0000000000..9237652d9c --- /dev/null +++ b/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c @@ -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 +    ) +}; diff --git a/layouts/default/alice_split_bs/info.json b/layouts/default/alice_split_bs/info.json new file mode 100644 index 0000000000..f7b4a68b55 --- /dev/null +++ b/layouts/default/alice_split_bs/info.json @@ -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} +            ] +        } +    } +} diff --git a/layouts/default/alice_split_bs/layout.json b/layouts/default/alice_split_bs/layout.json new file mode 100644 index 0000000000..87d811c2ea --- /dev/null +++ b/layouts/default/alice_split_bs/layout.json @@ -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},""] diff --git a/layouts/default/alice_split_bs/readme.md b/layouts/default/alice_split_bs/readme.md new file mode 100644 index 0000000000..705defa818 --- /dev/null +++ b/layouts/default/alice_split_bs/readme.md @@ -0,0 +1,3 @@ +# alice_split_bs + +    LAYOUT_alice_split_bs diff --git a/layouts/default/readme.md b/layouts/default/readme.md index d053c8267f..96f9c8e0d4 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md @@ -497,6 +497,21 @@ LAYOUT_alice  ```  ``` +LAYOUT_alice_split_bs +  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ +  │   │  │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ + ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐ + │   │  │     │   │   │   │   │   │          │   │   │   │   │   │   │   │      │ +┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐ +│   │  │      │   │   │   │   │   │           │   │   │   │   │   │   │          │ +└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐ +      │        │   │   │   │   │   │        │   │   │   │   │   │   │         │   │ +      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘ +      │     │     │     │       │     │     │          │     │             │     │ +      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘ +``` + +```  LAYOUT_ergodox  ┌─────┬───┬───┬───┬───┬───┬───┐                   ┌───┬───┬───┬───┬───┬───┬─────┐  │     │   │   │   │   │   │   │                   │   │   │   │   │   │   │     │ | 
