summaryrefslogtreecommitdiff
path: root/keyboards/ergosaurus
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-12-03 14:07:41 -0800
committerGitHub <noreply@github.com>2020-12-03 14:07:41 -0800
commit138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b (patch)
tree88649cb18f904e520115ddaef52901b4da8f7e50 /keyboards/ergosaurus
parenta5a65fb1e27dcbcdb3e489f1cbde9e7306522693 (diff)
Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)
* Add LAYOUT_alice support: fallacy * Add LAYOUT_alice support: kb_elmo/sesame * Add LAYOUT_alice support: cheshire/curiosity * Add LAYOUT_alice support: evyd13/wonderland * Add LAYOUT_alice support: mechlovin/adelais * Update LAYOUT_alice support: projectkb/alice The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice. This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added. Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions. * Update ramonimbao/aelith info.json Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json. * Fork `alice` Community Layout... ... into Standard and Split Backspace versions Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version. * Update LAYOUT_alice support: sneakbox/aliceclone Rework the sneakbox/aliceclone to use the Split Backspace Alice layout. * Update LAYOUT_alice support: zoo/wampus The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added. Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support. * Update keyboards for `LAYOUT_alice_split_bs` support * LAYOUT_alice_split_bs support: ergosaurus * LAYOUT_alice_split_bs support: handwired/colorlice * LAYOUT_alice(_split_bs) support: handwired/owlet60 * LAYOUT_alice_split_bs support: nightly_boards/alter/rev1 * LAYOUT_alice(_split_bs) support: sck/osa * LAYOUT_alice_split_bs support: tgr/alice * LAYOUT_alice(_split_bs) support: tkc/osav2 * LAYOUT_alice_split_bs support: xelus/valor/rev1
Diffstat (limited to 'keyboards/ergosaurus')
-rw-r--r--keyboards/ergosaurus/ergosaurus.h4
-rw-r--r--keyboards/ergosaurus/info.json2
-rw-r--r--keyboards/ergosaurus/keymaps/default/keymap.c6
-rw-r--r--keyboards/ergosaurus/rules.mk2
4 files changed, 9 insertions, 5 deletions
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/ergosaurus/ergosaurus.h
index c78a2db32b..cef594993d 100644
--- a/keyboards/ergosaurus/ergosaurus.h
+++ b/keyboards/ergosaurus/ergosaurus.h
@@ -19,7 +19,7 @@
#define KNO KC_NO
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
@@ -36,3 +36,5 @@
{ KNO, K71, K72, K73, K74, K75, K76, KNO }, \
{ K80, K81, K82, K83, K84, K85, KNO, K87 } \
}
+
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/ergosaurus/info.json b/keyboards/ergosaurus/info.json
index 97873afd2e..13fda81f87 100644
--- a/keyboards/ergosaurus/info.json
+++ b/keyboards/ergosaurus/info.json
@@ -4,7 +4,7 @@
"width": 19.75,
"height": 5.25,
"layouts": {
- "LAYOUT": {
+ "LAYOUT_alice_split_bs": {
"layout": [
{"label":"`", "x":0.5, "y":0},
{"label":"Esc", "x":1.75, "y":0.25},
diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/ergosaurus/keymaps/default/keymap.c
index 565906e038..42cf9082e4 100644
--- a/keyboards/ergosaurus/keymaps/default/keymap.c
+++ b/keyboards/ergosaurus/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [BASE] = LAYOUT(
+ [BASE] = LAYOUT_alice_split_bs(
KC_GRV, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
KC_PGDN, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LGUI, KC_LALT, KC_ENT, MO(RAISE), KC_SPC, KC_RALT, KC_RCTL
),
- [LOWER] = LAYOUT(
+ [LOWER] = LAYOUT_alice_split_bs(
_______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______
),
- [RAISE] = LAYOUT(
+ [RAISE] = LAYOUT_alice_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
diff --git a/keyboards/ergosaurus/rules.mk b/keyboards/ergosaurus/rules.mk
index 62676d1c5b..f504ffaeb9 100644
--- a/keyboards/ergosaurus/rules.mk
+++ b/keyboards/ergosaurus/rules.mk
@@ -30,3 +30,5 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
+
+LAYOUTS = alice_split_bs