layers (broken)

2 files changed, 81 insertions, 55 deletions

diff --git a/keyboards/handwired/node5_1/info.json b/keyboards/handwired/node5_1/info.json
index 671a5ae4b5..3f207b2ee7 100644
--- a/keyboards/handwired/node5_1/info.json
+++ b/keyboards/handwired/node5_1/info.json
@@ -24,7 +24,7 @@
         "vid": "0xAAAA"
     },
     "layouts": {
-        "LAYOUT_ortho_split": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/handwired/node5_1/keymaps/default/keymap.c b/keyboards/handwired/node5_1/keymaps/default/keymap.c
index a3efaacb3c..17e15a92c4 100644
--- a/keyboards/handwired/node5_1/keymaps/default/keymap.c
+++ b/keyboards/handwired/node5_1/keymaps/default/keymap.c
@@ -7,24 +7,39 @@
 // https://docusaurus.qmk.fm/faq_debug
 #include "print.h"
 
-/*
- * ┌───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│F1 │F2 │F3 │F4 │F5 │        │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │        │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BCK│
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
- * │TAB│ Q │ W │ F │ P │ G │        │ J │ L │ U │ Y │ ; │ [ │ ] │ \ │
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┴───┤
- * │COM│ A │ R │ S │ T │ D │        │ H │ N │ E │ I │ O │ ' │RETURN │
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┬───┤
- * │SHI│ Z │ X │ C │ V │ B │        │ K │ M │ , │ . │ / │PGU│ ↑ │PGD│
- * ├───┼───┼───┼───┼───┴───┤    ┌───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │CTL│SUP│ALT│FN │ SPACE │    │M1 │M3 │M2 │ALT│FN │FN │ ← │ ↓ │ → │
- * └───┴───┴───┴───┴───────┘    └───┴───┴───┴───┴───┴───┴───┴───┴───┘
- */
+enum layer_names {
+  _COLEMAK = 0,
+  _QWERTY,
+  _FN,
+};
+
+enum custom_keycodes {
+  COLEMAK = SAFE_RANGE,
+  QWERTY,
+};
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ortho_split(
+/*
+┌───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐
+│ESC│F1 │F2 │F3 │F4 │F5 │        │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
+│ ` │ 1 │ 2 │ 3 │ 4 │ 5 │        │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BCK│
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
+│TAB│ Q │ W │ F │ P │ G │        │ J │ L │ U │ Y │ ; │ [ │ ] │ \ │
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┴───┤
+│COM│ A │ R │ S │ T │ D │        │ H │ N │ E │ I │ O │ ' │RETURN │
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┬───┤
+│SHI│ Z │ X │ C │ V │ B │        │ K │ M │ , │ . │ / │PGU│ ↑ │PGD│
+├───┼───┼───┼───┼───┴───┤    ┌───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│CTL│SUP│ALT│FN │ SPACE │    │M1 │M3 │M2 │MEN│HOM│END│ ← │ ↓ │ → │
+└───┴───┴───┴───┴───────┘    └───┴───┴───┴───┴───┴───┴───┴───┴───┘
+*/
+    [_COLEMAK] = LAYOUT(
             //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
                KC_ESC,  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,
             //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
@@ -36,47 +51,58 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
                KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                 KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, KC_UP,   KC_PGDN,
             //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               KC_LCTL, KC_LGUI, KC_LALT, KC_RALT,     KC_SPACE,          KC_BTN1, KC_BTN3, KC_BTN2, KC_APP, KC_HOME, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT
+               KC_LCTL, KC_LGUI, KC_LALT, KC_A,     KC_SPACE,          KC_BTN1, KC_BTN3, KC_BTN2, KC_APP, KC_HOME, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT
             //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-            )
-};
+            ),
 
 /*
- * ┌───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐
- * │ESC│F1 │F2 │F3 │F4 │F5 │        │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │        │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BCK│
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
- * │TAB│ Q │ W │ E │ R │ T │        │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┴───┤
- * │COM│ A │ S │ D │ F │ G │        │ H │ J │ K │ L │ ; │ ' │RETURN │
- * ├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┬───┤
- * │SHI│ Z │ X │ C │ V │ B │        │ N │ M │ , │ . │ / │PGU│ ↑ │PGD│
- * ├───┼───┼───┼───┼───┴───┤    ┌───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │CTL│SUP│ALT│FN │ SPACE │    │M1 │M3 │M2 │ALT│FN │FN │ ← │ ↓ │ → │
- * └───┴───┴───┴───┴───────┘    └───┴───┴───┴───┴───┴───┴───┴───┴───┘
- */
+┌───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐
+│ESC│F1 │F2 │F3 │F4 │F5 │        │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
+│ ` │ 1 │ 2 │ 3 │ 4 │ 5 │        │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │BCK│
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┼───┤
+│TAB│ Q │ W │ E │ R │ T │        │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┴───┤
+│COM│ A │ S │ D │ F │ G │        │ H │ J │ K │ L │ ; │ ' │RETURN │
+├───┼───┼───┼───┼───┼───┤        ├───┼───┼───┼───┼───┼───┼───┬───┤
+│SHI│ Z │ X │ C │ V │ B │        │ N │ M │ , │ . │ / │PGU│ ↑ │PGD│
+├───┼───┼───┼───┼───┴───┤    ┌───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│CTL│SUP│ALT│FN │ SPACE │    │M1 │M3 │M2 │MEN│HOM│END│ ← │ ↓ │ → │
+└───┴───┴───┴───┴───────┘    └───┴───┴───┴───┴───┴───┴───┴───┴───┘
+*/
 
-/*
-   const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_ortho_split(
-//|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
-KC_ESC,  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_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_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_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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, KC_UP,   KC_PGDN,
-//|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-KC_LCTL, KC_LGUI, KC_LALT, KC_RALT,     KC_SPACE,         KC_BTN1, KC_BTN3, KC_BTN2, KC_APP, KC_HOME, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT
-//|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-
-)
+    [_QWERTY] = LAYOUT(
+        //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+        KC_ESC,  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_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_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_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_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, KC_UP,   KC_PGDN,
+        //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),     KC_SPACE,         KC_BTN1, KC_BTN3, KC_BTN2, KC_APP, KC_HOME, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT
+        //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
+        ),
+
+    [_FN] = LAYOUT(
+            //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+            KC_A,  _______,   _______,   _______,   _______,   _______,                _______,   _______,   _______,   _______,   _______,   _______, _______,  _______,
+            //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+            _______,  _______,    _______,    _______,    _______,    _______,                 _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,
+            //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+            _______,  _______,    _______,    _______,    _______,    _______,                 _______,    _______,    _______,    _______,    _______,    _______, _______, _______,
+            //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+            _______, _______,    _______,    _______,    _______,    _______,                 _______,    _______,    _______,    _______,    _______, _______,     _______,
+            //|--------+--------+--------+--------+--------+--------|            |--------+--------+--------+--------+--------+--------+--------+--------|
+            _______, _______,    _______,    _______,    _______,    _______,                 _______,    _______,    _______, _______,  _______, _______, _______,   _______,
+            //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
+            _______, _______, _______, _______,     _______,         _______, _______, _______, _______, _______, _______,  _______, _______, _______
+            //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
+            )
 };
-*/
 
 // Custom composite data type for holding colors
 typedef struct {
@@ -128,7 +154,7 @@ void set_trackball_normal_color(void) {
 
 void keyboard_post_init_user(void) {
     // Call the post init code.
-    setrgb(0, 0, 31, (LED_TYPE *)&led[0]); // led 0
+    setrgb(0, 15, 0, (LED_TYPE *)&led[0]); // led 0
     rgblight_set(); // Utility functions do not call rgblight_set() automatically, so they need to be called explicitly.
 
     set_trackball_normal_color();
@@ -229,7 +255,7 @@ void suspend_wakeup_init_user(void) {
 
     // Turn on light when computer is woken from sleep
     set_trackball_normal_color();
-    setrgb(0, 0, 47, (LED_TYPE *)&led[0]); // led 0
+    setrgb(0, 15, 0, (LED_TYPE *)&led[0]); // led 0
     rgblight_set(); // Utility functions do not call rgblight_set() automatically, so they need to be called explicitly.
 }