Alice: refactor and Configurator bugfix (#4979)

- layout macro and keymap layers refactored to more closely resemble physical keyboard layout
- added layout mockup to alice.h
- correct info.json data (was missing a key)

diff --git a/keyboards/alice/alice.h b/keyboards/alice/alice.h
index a92618593a3ee9fa51e0b4542c279395bd986b0c..16460ed701cf3749acb0c15f0be7b12e98a5e32c 100644 (file)
--- a/keyboards/alice/alice.h
+++ b/keyboards/alice/alice.h
@@ -19,13 +19,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+/* LAYOUT
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │63 │ │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │10 │11 │12 │13 │14 │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │64 │ │15   │16 │17 │18 │19 │20 │         │21 │22 │23 │24 │25 │26 │27 │28   │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │65 │ │29    │30 │31 │32 │33 │34 │         │35 │36 │37 │38 │39 │40 │41      │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │42      │43 │44 │45 │46 │47 │     │48 │49 │50 │51 │52 │53 │54    │55 │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │56   │     │57   │58     │59  │   │60        │61   │           │62   │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
 #define LAYOUT( \
-  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, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55,      \
-  K56, K57, K58, K59, K60, K61, K62,                                         \
-  K63, K64, K65                                                              \
+  K63,   K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K10, K11, K12, K13, K14, \
+  K64,   K15, K16, K17, K18, K19, K20,      K21, K22, K23, K24, K25, K26, K27, K28,      \
+  K65,   K29, K30, K31, K32, K33, K34,      K35, K36, K37, K38, K39, K40,      K41,      \
+         K42, K43, K44, K45, K46, K47,      K48, K49, K50, K51, K52, K53, K54, K55,      \
+         K56,      K57,      K58, K59,           K60,      K61,                K62       \
 ) \
 { \
   { K00  , K01  , K02  , K03  , K04  , K05  , K06  , K07  , K08  , K09  , K10  , K11  , K12  , K13  , K14   }, \

diff --git a/keyboards/alice/info.json b/keyboards/alice/info.json
index 5ea1f6756e15d5c4f79c5956c37e595aff3a41c0..b26209332676639f4386913ad71bd0f504464b3f 100644 (file)
--- a/keyboards/alice/info.json
+++ b/keyboards/alice/info.json
@@ -6,7 +6,75 @@
   "height": 5,
   "layouts": {
     "LAYOUT": {
-      "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":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"_", "x":13.75, "y":0}, {"label":"+", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"~", "x":16.75, "y":0}, {"label":"Insert", "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.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"{", "x":14.25, "y":1}, {"label":"}", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":1.5}, {"label":"Delete", "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.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":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"Shift", "x":15, "y":3, "w":1.75}, {"label":"Fn", "x":16.75, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Win", "x":7.25, "y":4, "w":1.25}, {"x":9, "y":4, "w":2.75}, {"label":"Alt", "x":11.75, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
+      "key_count": 66,
+      "layout": [
+        {"label":"K63", "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":"K10", "x":13.25, "y":0},
+        {"label":"K11", "x":14.25, "y":0},
+        {"label":"K12", "x":15.25, "y":0},
+        {"label":"K13", "x":16.25, "y":0},
+        {"label":"K14", "x":17.25, "y":0},
+        {"label":"K64", "x":0, "y":1},
+        {"label":"K15", "x":1.25, "y":1, "w":1.5},
+        {"label":"K16", "x":2.75, "y":1},
+        {"label":"K17", "x":3.75, "y":1},
+        {"label":"K18", "x":4.75, "y":1},
+        {"label":"K19", "x":5.75, "y":1},
+        {"label":"K20", "x":6.75, "y":1},
+        {"label":"K21", "x":9.75, "y":1},
+        {"label":"K22", "x":10.75, "y":1},
+        {"label":"K23", "x":11.75, "y":1},
+        {"label":"K24", "x":12.75, "y":1},
+        {"label":"K25", "x":13.75, "y":1},
+        {"label":"K26", "x":14.75, "y":1},
+        {"label":"K27", "x":15.75, "y":1},
+        {"label":"K28", "x":16.75, "y":1, "w":1.5},
+        {"label":"K65", "x":0, "y":2},
+        {"label":"K29", "x":1.25, "y":2, "w":1.75},
+        {"label":"K30", "x":3, "y":2},
+        {"label":"K31", "x":4, "y":2},
+        {"label":"K32", "x":5, "y":2},
+        {"label":"K33", "x":6, "y":2},
+        {"label":"K34", "x":7, "y":2},
+        {"label":"K35", "x":10, "y":2},
+        {"label":"K36", "x":11, "y":2},
+        {"label":"K37", "x":12, "y":2},
+        {"label":"K38", "x":13, "y":2},
+        {"label":"K39", "x":14, "y":2},
+        {"label":"K40", "x":15, "y":2},
+        {"label":"K41", "x":16, "y":2, "w":2.25},
+        {"label":"K42", "x":1.25, "y":3, "w":2.25},
+        {"label":"K43", "x":3.5, "y":3},
+        {"label":"K44", "x":4.5, "y":3},
+        {"label":"K45", "x":5.5, "y":3},
+        {"label":"K46", "x":6.5, "y":3},
+        {"label":"K47", "x":7.5, "y":3},
+        {"label":"K48", "x":9.5, "y":3},
+        {"label":"K49", "x":10.5, "y":3},
+        {"label":"K50", "x":11.5, "y":3},
+        {"label":"K51", "x":12.5, "y":3},
+        {"label":"K52", "x":13.5, "y":3},
+        {"label":"K53", "x":14.5, "y":3},
+        {"label":"K54", "x":15.5, "y":3, "w":1.75},
+        {"label":"K55", "x":17.25, "y":3},
+        {"label":"K56", "x":1.25, "y":4, "w":1.5},
+        {"label":"K57", "x":4.25, "y":4, "w":1.5},
+        {"label":"K58", "x":5.75, "y":4, "w":2},
+        {"label":"K59", "x":7.75, "y":4, "w":1.25},
+        {"label":"K60", "x":9.5, "y":4, "w":2.75},
+        {"label":"K61", "x":12.25, "y":4, "w":1.5},
+        {"label":"K62", "x":16.75, "y":4, "w":1.5}
+      ]
     }
   }
 }

diff --git a/keyboards/alice/keymaps/default/keymap.c b/keyboards/alice/keymaps/default/keymap.c
index a0b6d467d4e97c4ed49d21e7066347ac234aa0e9..29fff66183d7912662f7ad73e36024fb8f2ff4ec 100644 (file)
--- a/keyboards/alice/keymaps/default/keymap.c
+++ b/keyboards/alice/keymaps/default/keymap.c
@@ -19,19 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        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_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_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,                                                                      \
-        KC_ESC,  KC_PGUP, KC_PGDN                                                                                                     \
+        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(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,         \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,                   \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,           \
-        _______, _______, _______, _______, _______, _______, _______,                                                                      \
-        _______, _______, _______                                                                                                      \
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,          \
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,          \
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,          \
+                    _______,          _______,          _______, _______,          _______,          _______,                            _______           \
     ),
 };

diff --git a/keyboards/alice/keymaps/mrkeebs/keymap.c b/keyboards/alice/keymaps/mrkeebs/keymap.c
index 6b0133870093e4998f39afc3028a354b69d11e0f..3d8099c413952292fc8e160bd9e75691ba9ed888 100644 (file)
--- a/keyboards/alice/keymaps/mrkeebs/keymap.c
+++ b/keyboards/alice/keymaps/mrkeebs/keymap.c
@@ -19,19 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        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_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_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,                                                                      \
-        KC_ESC,  KC_PGUP, KC_PGDN                                                                                                     \
+        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(
-        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_INS, \
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_UP  , _______, _______,         \
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,                   \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,           \
-        _______, _______, _______, _______, _______, _______, _______,                                                                      \
-        RESET,   _______, _______                                                                                                      \
+        RESET,      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_INS,  \
+        _______,    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_UP  , _______, _______,          \
+        _______,    _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,                   \
+                    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,          \
+                    _______,          _______,          _______, _______,          _______,          _______,                            _______           \
     ),
 };