~ruther/qmk_firmware

7a6e7d87cc8f720cc5c2d898bd36ddb45dc01a98 — QMK Bot 4 years ago 4444f3c + c1dc676
Merge remote-tracking branch 'origin/master' into develop
82 files changed, 1438 insertions(+), 123 deletions(-)

M keyboards/cheshire/curiosity/curiosity.h
M keyboards/cheshire/curiosity/info.json
M keyboards/cheshire/curiosity/rules.mk
M keyboards/coarse/cordillera/rules.mk
M keyboards/ergosaurus/ergosaurus.h
M keyboards/ergosaurus/info.json
M keyboards/ergosaurus/keymaps/default/keymap.c
M keyboards/ergosaurus/rules.mk
M keyboards/evyd13/wonderland/info.json
M keyboards/evyd13/wonderland/rules.mk
M keyboards/evyd13/wonderland/wonderland.h
M keyboards/fallacy/fallacy.h
M keyboards/fallacy/info.json
M keyboards/fallacy/keymaps/default/keymap.c
M keyboards/fallacy/rules.mk
M keyboards/handwired/colorlice/colorlice.h
M keyboards/handwired/colorlice/info.json
M keyboards/handwired/colorlice/keymaps/default/keymap.c
M keyboards/handwired/colorlice/rules.mk
M keyboards/handwired/owlet60/info.json
M keyboards/handwired/owlet60/owlet60.h
M keyboards/handwired/owlet60/rules.mk
M keyboards/kb_elmo/sesame/info.json
M keyboards/kb_elmo/sesame/keymaps/default/keymap.c
M keyboards/kb_elmo/sesame/rules.mk
M keyboards/kb_elmo/sesame/sesame.h
M keyboards/mechlovin/adelais/adelais.h
M keyboards/mechlovin/adelais/info.json
M keyboards/mechlovin/adelais/rules.mk
M keyboards/nightly_boards/alter/rev1/info.json
M keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
M keyboards/nightly_boards/alter/rev1/rev1.h
M keyboards/nightly_boards/alter/rev1/rules.mk
M keyboards/projectkb/alice/alice.h
M keyboards/projectkb/alice/info.json
M keyboards/projectkb/alice/keymaps/default/keymap.c
M keyboards/projectkb/alice/keymaps/via/keymap.c
M keyboards/projectkb/alice/rev2/rules.mk
M keyboards/projectkb/alice/rules.mk
M keyboards/ramonimbao/aelith/info.json
M keyboards/ramonimbao/aelith/rules.mk
A keyboards/scatter42/config.h
A keyboards/scatter42/info.json
A keyboards/scatter42/keymaps/default/keymap.c
A keyboards/scatter42/keymaps/default/readme.md
A keyboards/scatter42/readme.md
A keyboards/scatter42/rules.mk
A keyboards/scatter42/scatter42.c
A keyboards/scatter42/scatter42.h
M keyboards/sck/osa/info.json
M keyboards/sck/osa/keymaps/all/keymap.c
M keyboards/sck/osa/keymaps/splitrs/keymap.c
M keyboards/sck/osa/keymaps/via/keymap.c
M keyboards/sck/osa/osa.h
M keyboards/sck/osa/rules.mk
M keyboards/sneakbox/aliceclone/aliceclone.h
M keyboards/sneakbox/aliceclone/info.json
M keyboards/sneakbox/aliceclone/keymaps/default/keymap.c
M keyboards/sneakbox/aliceclone/keymaps/via/keymap.c
M keyboards/sneakbox/aliceclone/rules.mk
M keyboards/tgr/alice/alice.h
M keyboards/tgr/alice/info.json
M keyboards/tgr/alice/keymaps/default/keymap.c
M keyboards/tgr/alice/rules.mk
M keyboards/tkc/osav2/info.json
M keyboards/tkc/osav2/osav2.h
M keyboards/tkc/osav2/rules.mk
A keyboards/xelus/valor/rev1/info.json
M keyboards/xelus/valor/rev1/rev1.h
M keyboards/xelus/valor/rev1/rules.mk
M keyboards/zoo/wampus/info.json
M keyboards/zoo/wampus/keymaps/default/keymap.c
M keyboards/zoo/wampus/keymaps/via/keymap.c
M keyboards/zoo/wampus/rules.mk
M keyboards/zoo/wampus/wampus.h
M layouts/community/alice/stanrc85-alice/keymap.c
M layouts/default/alice/default_alice/keymap.c
A layouts/default/alice_split_bs/default_alice_split_bs/keymap.c
A layouts/default/alice_split_bs/info.json
A layouts/default/alice_split_bs/layout.json
A layouts/default/alice_split_bs/readme.md
M layouts/default/readme.md
M keyboards/cheshire/curiosity/curiosity.h => keyboards/cheshire/curiosity/curiosity.h +18 -1
@@ 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

M keyboards/cheshire/curiosity/info.json => keyboards/cheshire/curiosity/info.json +74 -1
@@ 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}
            ]
        }
    }
}

M keyboards/cheshire/curiosity/rules.mk => keyboards/cheshire/curiosity/rules.mk +2 -0
@@ 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

M keyboards/coarse/cordillera/rules.mk => keyboards/coarse/cordillera/rules.mk +2 -0
@@ 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

M keyboards/ergosaurus/ergosaurus.h => keyboards/ergosaurus/ergosaurus.h +3 -1
@@ 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

M keyboards/ergosaurus/info.json => keyboards/ergosaurus/info.json +1 -1
@@ 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},

M keyboards/ergosaurus/keymaps/default/keymap.c => keyboards/ergosaurus/keymaps/default/keymap.c +3 -3
@@ 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, _______, _______,          _______,

M keyboards/ergosaurus/rules.mk => keyboards/ergosaurus/rules.mk +2 -0
@@ 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

M keyboards/evyd13/wonderland/info.json => keyboards/evyd13/wonderland/info.json +70 -1
@@ 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}
            ]
        }
    }
}

M keyboards/evyd13/wonderland/rules.mk => keyboards/evyd13/wonderland/rules.mk +1 -0
@@ 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

M keyboards/evyd13/wonderland/wonderland.h => keyboards/evyd13/wonderland/wonderland.h +18 -1
@@ 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);

M keyboards/fallacy/fallacy.h => keyboards/fallacy/fallacy.h +5 -2
@@ 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

M keyboards/fallacy/info.json => keyboards/fallacy/info.json +2 -2
@@ 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},

M keyboards/fallacy/keymaps/default/keymap.c => keyboards/fallacy/keymaps/default/keymap.c +2 -2
@@ 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,

M keyboards/fallacy/rules.mk => keyboards/fallacy/rules.mk +2 -0
@@ 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

M keyboards/handwired/colorlice/colorlice.h => keyboards/handwired/colorlice/colorlice.h +2 -1
@@ 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

M keyboards/handwired/colorlice/info.json => keyboards/handwired/colorlice/info.json +1 -1
@@ 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},

M keyboards/handwired/colorlice/keymaps/default/keymap.c => keyboards/handwired/colorlice/keymaps/default/keymap.c +2 -2
@@ 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,

M keyboards/handwired/colorlice/rules.mk => keyboards/handwired/colorlice/rules.mk +2 -0
@@ 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

M keyboards/handwired/owlet60/info.json => keyboards/handwired/owlet60/info.json +2 -2
@@ 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}]
        }

M keyboards/handwired/owlet60/owlet60.h => keyboards/handwired/owlet60/owlet60.h +5 -2
@@ 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

M keyboards/handwired/owlet60/rules.mk => keyboards/handwired/owlet60/rules.mk +3 -1
@@ 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

M keyboards/kb_elmo/sesame/info.json => keyboards/kb_elmo/sesame/info.json +2 -2
@@ 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},

M keyboards/kb_elmo/sesame/keymaps/default/keymap.c => keyboards/kb_elmo/sesame/keymaps/default/keymap.c +2 -2
@@ 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,

M keyboards/kb_elmo/sesame/rules.mk => keyboards/kb_elmo/sesame/rules.mk +2 -0
@@ 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

M keyboards/kb_elmo/sesame/sesame.h => keyboards/kb_elmo/sesame/sesame.h +5 -2
@@ 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

M keyboards/mechlovin/adelais/adelais.h => keyboards/mechlovin/adelais/adelais.h +17 -1
@@ 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

M keyboards/mechlovin/adelais/info.json => keyboards/mechlovin/adelais/info.json +70 -1
@@ 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/"

M keyboards/mechlovin/adelais/rules.mk => keyboards/mechlovin/adelais/rules.mk +2 -0
@@ 20,4 20,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

M keyboards/nightly_boards/alter/rev1/info.json => keyboards/nightly_boards/alter/rev1/info.json +1 -1
@@ 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}, 

M keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c => keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c +2 -2
@@ 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, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          

M keyboards/nightly_boards/alter/rev1/rev1.h => keyboards/nightly_boards/alter/rev1/rev1.h +3 -1
@@ 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

M keyboards/nightly_boards/alter/rev1/rules.mk => keyboards/nightly_boards/alter/rev1/rules.mk +3 -1
@@ 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

M keyboards/projectkb/alice/alice.h => keyboards/projectkb/alice/alice.h +16 -2
@@ 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  }  \
}

M keyboards/projectkb/alice/info.json => keyboards/projectkb/alice/info.json +74 -1
@@ 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}
            ]
        }
    }
}

M keyboards/projectkb/alice/keymaps/default/keymap.c => keyboards/projectkb/alice/keymaps/default/keymap.c +2 -2
@@ 25,7 25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define _FN1 1

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_BASE] = LAYOUT_alice(
  [_BASE] = LAYOUT_alice_split_bs(
    KC_ESC,  KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,


@@ 33,7 33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_LCTL,          KC_LALT, KC_SPC,  MO(_FN1),                          KC_SPC,           KC_RALT,          KC_RCTL
  ),

  [_FN1] = LAYOUT_alice(
  [_FN1] = LAYOUT_alice_split_bs(
    RGB_TOG,  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
    RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
    RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,

M keyboards/projectkb/alice/keymaps/via/keymap.c => keyboards/projectkb/alice/keymaps/via/keymap.c +4 -4
@@ 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,

M keyboards/projectkb/alice/rev2/rules.mk => keyboards/projectkb/alice/rev2/rules.mk +0 -1
@@ 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

M keyboards/projectkb/alice/rules.mk => keyboards/projectkb/alice/rules.mk +1 -0
@@ 1,1 1,2 @@
LAYOUTS = alice alice_split_bs
DEFAULT_FOLDER = projectkb/alice/rev1

M keyboards/ramonimbao/aelith/info.json => keyboards/ramonimbao/aelith/info.json +80 -0
@@ 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}
            ]
        }
    }
}

M keyboards/ramonimbao/aelith/rules.mk => keyboards/ramonimbao/aelith/rules.mk +1 -1
@@ 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

A keyboards/scatter42/config.h => keyboards/scatter42/config.h +147 -0
@@ 0,0 1,147 @@
/*
Copyright 2020 bbrfkr

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/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID    0xFEED
#define PRODUCT_ID   0x3B47
#define DEVICE_VER   0x0001
#define MANUFACTURER bbrfkr
#define PRODUCT      scatter42

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 6

/*
 * Keyboard Matrix Assignments
 *
 * Change this to how you wired your keyboard
 * COLS: AVR pins used for columns, left to right
 * ROWS: AVR pins used for rows, top to bottom
 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
 *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
 *
 */
#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/*
 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
 */
#define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
#define USE_SERIAL

//#define BACKLIGHT_PIN B7
//#define BACKLIGHT_LEVELS 3
//#define BACKLIGHT_BREATHING

//#define RGB_DI_PIN E2
//#ifdef RGB_DI_PIN
//#    define RGBLED_NUM 16
//#    define RGBLIGHT_HUE_STEP 8
//#    define RGBLIGHT_SAT_STEP 8
//#    define RGBLIGHT_VAL_STEP 8
//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
//#    define RGBLIGHT_ANIMATIONS
/*== or choose animations ==*/
//#    define RGBLIGHT_EFFECT_BREATHING
//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
//#    define RGBLIGHT_EFFECT_SNAKE
//#    define RGBLIGHT_EFFECT_KNIGHT
//#    define RGBLIGHT_EFFECT_CHRISTMAS
//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
//#    define RGBLIGHT_EFFECT_RGB_TEST
//#    define RGBLIGHT_EFFECT_ALTERNATING
/*== customize breathing effect ==*/
/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
/*==== use exp() and sin() ====*/
//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
//#endif

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
 * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
 */
//#define GRAVE_ESC_CTRL_OVERRIDE

/*
 * Force NKRO
 *
 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
 * makefile for this to work.)
 *
 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
 * until the next keyboard reset.
 *
 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
 * fully operational during normal computer usage.
 *
 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
 * power-up.
 *
 */
//#define FORCE_NKRO

/*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
 */

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

/* Bootmagic Lite key configuration */
//#define BOOTMAGIC_LITE_ROW 0
//#define BOOTMAGIC_LITE_COLUMN 0

A keyboards/scatter42/info.json => keyboards/scatter42/info.json +223 -0
@@ 0,0 1,223 @@
{
    "keyboard_name": "scatter42",
    "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
    "maintainer": "bbrfkr",
    "width": 14,
    "height": 5.125,
    "layouts": {
        "LAYOUT": {
            "layout": [
                {
                    "label": "Q",
                    "x": 0,
                    "y": 0.5
                },
                {
                    "label": "W",
                    "x": 1,
                    "y": 0.25
                },
                {
                    "label": "E",
                    "x": 2,
                    "y": 0
                },
                {
                    "label": "R",
                    "x": 3,
                    "y": 0.25
                },
                {
                    "label": "T",
                    "x": 4,
                    "y": 0.5
                },
                {
                    "label": "Y",
                    "x": 9,
                    "y": 0.5
                },
                {
                    "label": "U",
                    "x": 10,
                    "y": 0.25
                },
                {
                    "label": "I",
                    "x": 11,
                    "y": 0
                },
                {
                    "label": "O",
                    "x": 12,
                    "y": 0.25
                },
                {
                    "label": "P",
                    "x": 13,
                    "y": 0.5
                },
                {
                    "label": "A",
                    "x": 0,
                    "y": 1.5
                },
                {
                    "label": "S",
                    "x": 1,
                    "y": 1.25
                },
                {
                    "label": "D",
                    "x": 2,
                    "y": 1
                },
                {
                    "label": "F",
                    "x": 3,
                    "y": 1.25
                },
                {
                    "label": "G",
                    "x": 4,
                    "y": 1.5
                },
                {
                    "label": "H",
                    "x": 9,
                    "y": 1.5
                },
                {
                    "label": "J",
                    "x": 10,
                    "y": 1.25
                },
                {
                    "label": "K",
                    "x": 11,
                    "y": 1
                },
                {
                    "label": "L",
                    "x": 12,
                    "y": 1.25
                },
                {
                    "label": ";",
                    "x": 13,
                    "y": 1.5
                },
                {
                    "label": "Z",
                    "x": 0,
                    "y": 2.5
                },
                {
                    "label": "X",
                    "x": 1,
                    "y": 2.25
                },
                {
                    "label": "C",
                    "x": 2,
                    "y": 2
                },
                {
                    "label": "V",
                    "x": 3,
                    "y": 2.25
                },
                {
                    "label": "B",
                    "x": 4,
                    "y": 2.5
                },
                {
                    "label": "N",
                    "x": 9,
                    "y": 2.5
                },
                {
                    "label": "M",
                    "x": 10,
                    "y": 2.25
                },
                {
                    "label": ",",
                    "x": 11,
                    "y": 2
                },
                {
                    "label": ".",
                    "x": 12,
                    "y": 2.25
                },
                {
                    "label": "/",
                    "x": 13,
                    "y": 2.5
                },
                {
                    "label": "Ctrl",
                    "x": 0,
                    "y": 3.5
                },
                {
                    "label": "Shift",
                    "x": 1,
                    "y": 3.25
                },
                {
                    "label": "Tab",
                    "x": 2,
                    "y": 3
                },
                {
                    "label": "Super",
                    "x": 3.5,
                    "y": 3.625
                },
                {
                    "label": "Lower",
                    "x": 4.5,
                    "y": 3.875
                },
                {
                    "label": "Space",
                    "x": 5.5,
                    "y": 4.125
                },
                {
                    "label": "Enter",
                    "x": 7.45,
                    "y": 4.125
                },
                {
                    "label": "Raise",
                    "x": 8.45,
                    "y": 3.875
                },
                {
                    "label": "Alt",
                    "x": 9.45,
                    "y": 3.625
                },
                {
                    "label": "Back",
                    "x": 11,
                    "y": 3
                },
                {
                    "label": "Shift",
                    "x": 12,
                    "y": 3.25
                },
                {
                    "label": "Ctrl",
                    "x": 13,
                    "y": 3.5
                }
            ]
        }
    }
}

A keyboards/scatter42/keymaps/default/keymap.c => keyboards/scatter42/keymaps/default/keymap.c +31 -0
@@ 0,0 1,31 @@
/* Copyright 2020 bbrfkr
 *
 * 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

// Defines names for use in layer keycodes and the keymap
enum layer_names {
    _BASE,
    _LOWER,
    _RAISE,
    _FN
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LSFT, KC_TAB, KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT, KC_BSPC, KC_RSFT, KC_RCTL),
        [1] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F11, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, KC_TRNS, KC_SPC, KC_ENT, MO(3), KC_RALT, KC_DEL, KC_RSFT, KC_PSCR),
        [2] = LAYOUT(KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_BSLS, KC_GRV, KC_MINS, KC_EQL, KC_QUOT, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_PIPE, KC_TILD, KC_UNDS, KC_PLUS, KC_DQUO, KC_LBRC, KC_RBRC, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, MO(3), KC_SPC, KC_ENT, KC_TRNS, KC_RALT, KC_DEL, KC_RSFT, KC_RCTL),
        [3] = LAYOUT(KC_VOLU, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU, KC_VOLD, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRID, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
};

A keyboards/scatter42/keymaps/default/readme.md => keyboards/scatter42/keymaps/default/readme.md +1 -0
@@ 0,0 1,1 @@
# The default keymap for scatter42

A keyboards/scatter42/readme.md => keyboards/scatter42/readme.md +19 -0
@@ 0,0 1,19 @@
# scatter42

[![scatter42](https://i.imgur.com/2MGMcip.jpg)](https://imgur.com/2MGMcip)

A split keyboard with 39 (4rows and 5columns) keys and 3 keys for thumbs.

* Keyboard Maintainer: [bbrfkr](https://github.com/bbrfkr) [@bbrfkr](https://twitter.com/bbrfkr)
* Hardware Supported: scatter42 PCB, Pro Micro
* Hardware Availability: https://bbrfkr.booth.pm/

Make example for this keyboard (after setting up your build environment):

    make scatter42:default

Flashing example for this keyboard:

    make scatter42:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

A keyboards/scatter42/rules.mk => keyboards/scatter42/rules.mk +23 -0
@@ 0,0 1,23 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes       # Mouse keys
EXTRAKEY_ENABLE = yes       # Audio control and System control
CONSOLE_ENABLE = no         # Console for debug
COMMAND_ENABLE = no         # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no       # Enable Bluetooth
AUDIO_ENABLE = no           # Audio output
SPLIT_KEYBOARD = yes
\ No newline at end of file

A keyboards/scatter42/scatter42.c => keyboards/scatter42/scatter42.c +17 -0
@@ 0,0 1,17 @@
/* Copyright 2020 bbrfkr
 *
 * 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 "scatter42.h"

A keyboards/scatter42/scatter42.h => keyboards/scatter42/scatter42.h +44 -0
@@ 0,0 1,44 @@
/* Copyright 2020 bbrfkr
 *
 * 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/>.
 */

#pragma once

#include "quantum.h"

/* This is a shortcut to help you visually see your layout.
 *
 * The first section contains all of the arguments representing the physical
 * layout of the board and position of the keys.
 *
 * The second converts the arguments into a two-dimensional array which
 * represents the switch matrix.
 */
#define LAYOUT( \
  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
  L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
  ) \
  { \
    { L00, L01, L02, L03, L04, KC_NO }, \
    { L10, L11, L12, L13, L14, KC_NO }, \
    { L20, L21, L22, L23, L24, KC_NO }, \
    { L30, L31, L32, L33, L34, L35 }, \
    { R04, R03, R02, R01, R00, KC_NO }, \
    { R14, R13, R12, R11, R10, KC_NO }, \
    { R24, R23, R22, R21, R20, KC_NO }, \
    { R35, R34, R33, R32, R31, R30 } \
  }

M keyboards/sck/osa/info.json => keyboards/sck/osa/info.json +2 -2
@@ 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}]
        }

M keyboards/sck/osa/keymaps/all/keymap.c => keyboards/sck/osa/keymaps/all/keymap.c +2 -2
@@ 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,

M keyboards/sck/osa/keymaps/splitrs/keymap.c => keyboards/sck/osa/keymaps/splitrs/keymap.c +2 -2
@@ 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,

M keyboards/sck/osa/keymaps/via/keymap.c => keyboards/sck/osa/keymaps/via/keymap.c +4 -4
@@ 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,

M keyboards/sck/osa/osa.h => keyboards/sck/osa/osa.h +5 -2
@@ 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

M keyboards/sck/osa/rules.mk => keyboards/sck/osa/rules.mk +2 -0
@@ 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

M keyboards/sneakbox/aliceclone/aliceclone.h => keyboards/sneakbox/aliceclone/aliceclone.h +2 -2
@@ 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, \

M keyboards/sneakbox/aliceclone/info.json => keyboards/sneakbox/aliceclone/info.json +1 -1
@@ 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},

M keyboards/sneakbox/aliceclone/keymaps/default/keymap.c => keyboards/sneakbox/aliceclone/keymaps/default/keymap.c +2 -2
@@ 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, 

M keyboards/sneakbox/aliceclone/keymaps/via/keymap.c => keyboards/sneakbox/aliceclone/keymaps/via/keymap.c +4 -4
@@ 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, 

M keyboards/sneakbox/aliceclone/rules.mk => keyboards/sneakbox/aliceclone/rules.mk +2 -1
@@ 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

M keyboards/tgr/alice/alice.h => keyboards/tgr/alice/alice.h +3 -2
@@ 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

M keyboards/tgr/alice/info.json => keyboards/tgr/alice/info.json +1 -1
@@ 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},

M keyboards/tgr/alice/keymaps/default/keymap.c => keyboards/tgr/alice/keymaps/default/keymap.c +2 -2
@@ 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,          _______,          \

M keyboards/tgr/alice/rules.mk => keyboards/tgr/alice/rules.mk +2 -0
@@ 20,3 20,5 @@ COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
WS2812_DRIVER = i2c

LAYOUTS = alice_split_bs

M keyboards/tkc/osav2/info.json => keyboards/tkc/osav2/info.json +2 -2
@@ 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}]
        }
    }

M keyboards/tkc/osav2/osav2.h => keyboards/tkc/osav2/osav2.h +5 -2
@@ 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

M keyboards/tkc/osav2/rules.mk => keyboards/tkc/osav2/rules.mk +2 -0
@@ 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

A keyboards/xelus/valor/rev1/info.json => keyboards/xelus/valor/rev1/info.json +83 -0
@@ 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}
            ]
        }
    }
}

M keyboards/xelus/valor/rev1/rev1.h => keyboards/xelus/valor/rev1/rev1.h +3 -1
@@ 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

M keyboards/xelus/valor/rev1/rules.mk => keyboards/xelus/valor/rev1/rules.mk +2 -0
@@ 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

M keyboards/zoo/wampus/info.json => keyboards/zoo/wampus/info.json +74 -1
@@ 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}
            ]
        }
    }
}

M keyboards/zoo/wampus/keymaps/default/keymap.c => keyboards/zoo/wampus/keymaps/default/keymap.c +12 -12
@@ 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
  ),
};

M keyboards/zoo/wampus/keymaps/via/keymap.c => keyboards/zoo/wampus/keymaps/via/keymap.c +18 -18
@@ 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
  )
};

M keyboards/zoo/wampus/rules.mk => keyboards/zoo/wampus/rules.mk +1 -1
@@ 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

M keyboards/zoo/wampus/wampus.h => keyboards/zoo/wampus/wampus.h +20 -6
@@ 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, }, \
}

M layouts/community/alice/stanrc85-alice/keymap.c => layouts/community/alice/stanrc85-alice/keymap.c +4 -4
@@ 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,
              _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,

M layouts/default/alice/default_alice/keymap.c => layouts/default/alice/default_alice/keymap.c +1 -1
@@ 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,

A layouts/default/alice_split_bs/default_alice_split_bs/keymap.c => layouts/default/alice_split_bs/default_alice_split_bs/keymap.c +39 -0
@@ 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
    )
};

A layouts/default/alice_split_bs/info.json => layouts/default/alice_split_bs/info.json +83 -0
@@ 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}
            ]
        }
    }
}

A layouts/default/alice_split_bs/layout.json => layouts/default/alice_split_bs/layout.json +21 -0
@@ 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},""]

A layouts/default/alice_split_bs/readme.md => layouts/default/alice_split_bs/readme.md +3 -0
@@ 0,0 1,3 @@
# alice_split_bs

    LAYOUT_alice_split_bs

M layouts/default/readme.md => layouts/default/readme.md +15 -0
@@ 497,6 497,21 @@ LAYOUT_alice
```

```
LAYOUT_alice_split_bs
  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
  │   │  │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
 ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
 │   │  │     │   │   │   │   │   │          │   │   │   │   │   │   │   │      │
┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
│   │  │      │   │   │   │   │   │           │   │   │   │   │   │   │          │
└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
      │        │   │   │   │   │   │        │   │   │   │   │   │   │         │   │
      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
      │     │     │     │       │     │     │          │     │             │     │
      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
```

```
LAYOUT_ergodox
┌─────┬───┬───┬───┬───┬───┬───┐                   ┌───┬───┬───┬───┬───┬───┬─────┐
│     │   │   │   │   │   │   │                   │   │   │   │   │   │   │     │