[Refactor] Make changes to some pins (#21380)

3 files changed, 34 insertions, 40 deletions

diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
index 44d597ffb4..4faaa05431 100644
--- a/keyboards/citrus/erdnuss65/info.json
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -1,43 +1,39 @@
 {
-    "keyboard_name": "Erdnuss65",
     "manufacturer": "Citrus Lab",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "keyboard_name": "Erdnuss65",
     "maintainer": "ctt",
-    "usb": {
-        "vid": "0x636C",
-        "pid": "0x6374",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "rows": ["B10", "B1", "B0", "A7", "A6"],
-        "cols": ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
-    },
+    "bootloader": "stm32duino",
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "mousekey": true,
         "extrakey": true,
-        "console": false,
-        "command": false,
+        "mousekey": true,
         "nkro": true,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false
+        "rgblight": true
     },
-    "ws2812": {
-        "pin": "A15"
+    "matrix_pins": {
+        "cols": ["B12", "B14", "B15", "B5", "B13", "B3", "B4", "B6", "A0", "A1", "A2", "A3", "A4", "A5", "B11"],
+        "rows": ["B10", "B1", "B0", "A7", "A6"]
     },
+    "processor": "STM32F103",
     "rgblight": {
         "led_count": 1
     },
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x6374",
+        "vid": "0x636C"
+    },
+    "ws2812": {
+        "pin": "A15"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
                 {"label": "ESC K00 (B10,B12)", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1 K01 (B10,B14)", "matrix": [0, 1], "x": 1, "y": 0},
                 {"label": "2 K02 (B10,B15)", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "3 K03 (B10,A8)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "3 K03 (B10,B5)", "matrix": [0, 3], "x": 3, "y": 0},
                 {"label": "4 K04 (B10,B13)", "matrix": [0, 4], "x": 4, "y": 0},
                 {"label": "5 K05 (B10,B3)", "matrix": [0, 5], "x": 5, "y": 0},
                 {"label": "6 K06 (B10,B4)", "matrix": [0, 6], "x": 6, "y": 0},
@@ -52,7 +48,7 @@
                 {"label": "TAB (B1,B12)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"label": "Q (B1,B14)", "matrix": [1, 1], "x": 1.5, "y": 1},
                 {"label": "W (B1,B15)", "matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label": "E (B1,A8)", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "E (B1,B5)", "matrix": [1, 3], "x": 3.5, "y": 1},
                 {"label": "R (B1,B13)", "matrix": [1, 4], "x": 4.5, "y": 1},
                 {"label": "T (B1,B3)", "matrix": [1, 5], "x": 5.5, "y": 1},
                 {"label": "Y (B1,B4)", "matrix": [1, 6], "x": 6.5, "y": 1},
@@ -64,10 +60,10 @@
                 {"label": "] (B1,A4)", "matrix": [1, 12], "x": 12.5, "y": 1},
                 {"label": "\" (B1,A5)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
                 {"label": "DEL (B1,B11)", "matrix": [1, 14], "x": 15, "y": 1},
-                {"label": "CAPSLOCK (B0,B12)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"label": "CAPSLOCK (B0,B12)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"label": "A (B0,B14)", "matrix": [2, 1], "x": 1.75, "y": 2},
                 {"label": "S (B0,B15)", "matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label": "D (B0,A8)", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "D (B0,B5)", "matrix": [2, 3], "x": 3.75, "y": 2},
                 {"label": "F (B0,B13)", "matrix": [2, 4], "x": 4.75, "y": 2},
                 {"label": "G (B0,B3)", "matrix": [2, 5], "x": 5.75, "y": 2},
                 {"label": "H (B0,B4)", "matrix": [2, 6], "x": 6.75, "y": 2},
@@ -81,7 +77,7 @@
                 {"label": "LSHIFT (A7,B12)", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"label": "Z (A7,B14)", "matrix": [3, 1], "x": 2.25, "y": 3},
                 {"label": "X (A7,B15)", "matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label": "C (A7,A8)", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "C (A7,B5)", "matrix": [3, 3], "x": 4.25, "y": 3},
                 {"label": "V (A7,B13)", "matrix": [3, 4], "x": 5.25, "y": 3},
                 {"label": "B (A7,B3)", "matrix": [3, 5], "x": 6.25, "y": 3},
                 {"label": "N (A7,B4)", "matrix": [3, 6], "x": 7.25, "y": 3},
@@ -95,12 +91,12 @@
                 {"label": "LCTRL (A6,B12)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"label": "WIN (A6,B14)", "matrix": [4, 1], "x": 1.5, "y": 4},
                 {"label": "ALT (A6,B15)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"label": "SPACE (A6,A8)", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "SPACE (A6,B5)", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
                 {"label": "FN (A6,A0)", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
                 {"label": "LEFT (A6,A4)", "matrix": [4, 12], "x": 13, "y": 4},
                 {"label": "DOWN (A6,A5)", "matrix": [4, 13], "x": 14, "y": 4},
                 {"label": "RIGHT (A6,B11)", "matrix": [4, 14], "x": 15, "y": 4}
-           ]
+            ]
         }
     }
 }
diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c
index 0daef5af64..fdc36ae65e 100644
--- a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c
+++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c
@@ -5,19 +5,18 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        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_INS,  
+        QK_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_INS,  
         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_DEL,  
         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_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [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_MPRV,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET,   KC_MNXT,
+        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_MPRV,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT,   KC_MNXT,
         _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
-        _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
+        _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
     )
 };
-
diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c
index 0f1bf9525e..3014b72cfe 100644
--- a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c
+++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c
@@ -5,19 +5,19 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT(
-        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_INS,  
+        QK_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_INS,  
         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_DEL,  
         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_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [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_MPRV,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET,   KC_MNXT,
+        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_MPRV,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT,   KC_MNXT,
         _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
-        _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
+        _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
     ),
 
     [2] = LAYOUT(
@@ -34,6 +34,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  
         _______, _______, _______, _______, _______, _______, _______, _______  
-    ),
-
+    )
 };