From 91c1bdac3c75185ea712148ad363e09a4528523d Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:11:25 +0800 Subject: [PATCH 1/9] Update keymap.c --- keyboards/citrus/erdnuss65/keymaps/default/keymap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c index 0daef5af6461..19b2d8703ba3 100644 --- a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c @@ -5,7 +5,7 @@ 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, @@ -13,11 +13,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [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_VODN, KC_MPLY ) }; - From d7a2a071ad68a1f94c92ae4788accd8f6540280d Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:11:50 +0800 Subject: [PATCH 2/9] Update keymap.c --- keyboards/citrus/erdnuss65/keymaps/via/keymap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c index 0f1bf9525e66..1d5a4be86f43 100644 --- a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c @@ -5,7 +5,7 @@ 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, @@ -13,11 +13,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [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_VODN, KC_MPLY ), [2] = LAYOUT( @@ -34,6 +34,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - + ) }; From ed75989095c1171f4751120086df64141be471f4 Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:12:18 +0800 Subject: [PATCH 3/9] Update info.json --- keyboards/citrus/erdnuss65/info.json | 147 ++++++++++++++------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index 44d597ffb425..bbf95194eb2a 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -7,13 +7,18 @@ "usb": { "vid": "0x636C", "pid": "0x6374", - "device_version": "0.0.1" + "device_version": "1.0.0" }, + "matrix_pins": { - "rows": ["B10", "B1", "B0", "A7", "A6"], - "cols": ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"] + "rows": + ["B10","B1", "B0","A7","A6"], + "cols": + ["B12","B14","B15","B5","B13","B3","B4","B6","A0","A1","A2","A3","A4","A5","B11"] }, + "diode_direction": "COL2ROW", + "features": { "bootmagic": true, "mousekey": true, @@ -25,81 +30,79 @@ "rgblight": true, "audio": false }, - "ws2812": { - "pin": "A15" - }, "rgblight": { + "pin": "A15", "led_count": 1 }, "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": "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}, - {"label": "7 K07 (B10,B5)", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "8 K08 (B10,A1)", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "9 K09 (B10,A2)", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "0 K0A (B10,A0)", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "- K0B (B10,A3)", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "= K0C (B10,A4)", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "BACKSPACE K0D (B10,A5)", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "INS (B10,B11)", "matrix": [0, 14], "x": 15, "y": 0}, - {"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": "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}, - {"label": "U (B1,B5)", "matrix": [1, 7], "x": 7.5, "y": 1}, - {"label": "I (B1,A1)", "matrix": [1, 8], "x": 8.5, "y": 1}, - {"label": "O (B1,A2)", "matrix": [1, 9], "x": 9.5, "y": 1}, - {"label": "P (B1,A0)", "matrix": [1, 10], "x": 10.5, "y": 1}, - {"label": "[ (B1,A3)", "matrix": [1, 11], "x": 11.5, "y": 1}, - {"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": "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": "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}, - {"label": "J (B0,B5)", "matrix": [2, 7], "x": 7.75, "y": 2}, - {"label": "K (B0,A1)", "matrix": [2, 8], "x": 8.75, "y": 2}, - {"label": "L (B0,A2)", "matrix": [2, 9], "x": 9.75, "y": 2}, - {"label": "; (B0,A0)", "matrix": [2, 10], "x": 10.75, "y": 2}, - {"label": "' (B0,A3)", "matrix": [2, 11], "x": 11.75, "y": 2}, - {"label": "ENTER (B0,A5)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "PGUP (B0,B11)", "matrix": [2, 14], "x": 15, "y": 2}, - {"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": "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}, - {"label": "M (A7,B5)", "matrix": [3, 7], "x": 8.25, "y": 3}, - {"label": ", (A7,A1)", "matrix": [3, 8], "x": 9.25, "y": 3}, - {"label": ". (A7,A2)", "matrix": [3, 9], "x": 10.25, "y": 3}, - {"label": "/ (A7,A0)", "matrix": [3, 10], "x": 11.25, "y": 3}, - {"label": "RSHIFT (A7,A4)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "UP (A7,A5)", "matrix": [3, 13], "x": 14, "y": 3}, - {"label": "PGDN (A7,B11)", "matrix": [3, 14], "x": 15, "y": 3}, - {"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": "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} + {"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,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}, + {"label": "7 K07 (B10,B5)", "matrix":[0, 7], "x": 7, "y": 0}, + {"label": "8 K08 (B10,A1)", "matrix":[0, 8], "x": 8, "y": 0}, + {"label": "9 K09 (B10,A2)", "matrix":[0, 9], "x": 9, "y": 0}, + {"label": "0 K0A (B10,A0)", "matrix":[0, 10], "x": 10, "y": 0}, + {"label": "- K0B (B10,A3)", "matrix":[0, 11], "x": 11, "y": 0}, + {"label": "= K0C (B10,A4)", "matrix":[0, 12], "x": 12, "y": 0}, + {"label": "BACKSPACE K0D (B10,A5)", "matrix":[0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "INS (B10,B11)", "matrix":[0, 14], "x": 15, "y": 0}, + {"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,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}, + {"label": "U (B1,B5)", "matrix":[1, 7], "x": 7.5, "y": 1}, + {"label": "I (B1,A1)", "matrix":[1, 8], "x": 8.5, "y": 1}, + {"label": "O (B1,A2)", "matrix":[1, 9], "x": 9.5, "y": 1}, + {"label": "P (B1,A0)", "matrix":[1, 10], "x": 10.5, "y": 1}, + {"label": "[ (B1,A3)", "matrix":[1, 11], "x": 11.5, "y": 1}, + {"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.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,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}, + {"label": "J (B0,B5)", "matrix":[2, 7], "x": 7.75, "y": 2}, + {"label": "K (B0,A1)", "matrix":[2, 8], "x": 8.75, "y": 2}, + {"label": "L (B0,A2)", "matrix":[2, 9], "x": 9.75, "y": 2}, + {"label": "; (B0,A0)", "matrix":[2, 10], "x": 10.75, "y": 2}, + {"label": "' (B0,A3)", "matrix":[2, 11], "x": 11.75, "y": 2}, + {"label": "ENTER (B0,A5)", "matrix":[2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PGUP (B0,B11)", "matrix":[2, 14], "x": 15, "y": 2}, + {"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,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}, + {"label": "M (A7,B5)", "matrix":[3, 7], "x": 8.25, "y": 3}, + {"label": ", (A7,A1)", "matrix":[3, 8], "x": 9.25, "y": 3}, + {"label": ". (A7,A2)", "matrix":[3, 9], "x": 10.25, "y": 3}, + {"label": "/ (A7,A0)", "matrix":[3, 10], "x": 11.25, "y": 3}, + {"label": "RSHIFT (A7,A4)", "matrix":[3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "UP (A7,A5)", "matrix":[3, 13], "x": 14, "y": 3}, + {"label": "PGDN (A7,B11)", "matrix":[3, 14], "x": 15, "y": 3}, + {"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,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} ] } } From 440ff4a4d39e91b126d6c463415ca87ef47faf40 Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 13:27:33 +0800 Subject: [PATCH 4/9] Update keymap.c --- keyboards/citrus/erdnuss65/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c index 19b2d8703ba3..b05fca684bd6 100644 --- a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c @@ -17,6 +17,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END, - _______, _______, _______, _______, _______, KC_MUTE, KC_VODN, KC_MPLY + _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY ) }; From cfb0c74cb89177c1967864c8176c309cf9690f3c Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 13:28:05 +0800 Subject: [PATCH 5/9] Update keymap.c --- keyboards/citrus/erdnuss65/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c index 1d5a4be86f43..b7aeed0e411c 100644 --- a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END, - _______, _______, _______, _______, _______, KC_MUTE, KC_VODN, KC_MPLY + _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY ), [2] = LAYOUT( From 4228febdb1d1f501d8d37fdaa99265f6ad898e5f Mon Sep 17 00:00:00 2001 From: cttt <57359810+ctt-t@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:56:17 +0800 Subject: [PATCH 6/9] Update info.json --- keyboards/citrus/erdnuss65/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index bbf95194eb2a..cfe489958200 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -31,9 +31,11 @@ "audio": false }, "rgblight": { - "pin": "A15", "led_count": 1 }, + "ws2812": { + "pin": "xxx" + }, "layouts": { "LAYOUT": { "layout": [ From 0d6163bd36cc3413725c0f27b61b54b47791173b Mon Sep 17 00:00:00 2001 From: cttt <1219008126@qq.com> Date: Sun, 25 Jun 2023 20:31:19 +0800 Subject: [PATCH 7/9] [Refactor] Make changes to some pins --- keyboards/citrus/erdnuss65/info.json | 2 +- keyboards/citrus/erdnuss65/keymaps/default/keymap.c | 2 +- keyboards/citrus/erdnuss65/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index cfe489958200..30d1e3401883 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -34,7 +34,7 @@ "led_count": 1 }, "ws2812": { - "pin": "xxx" + "pin": "A15" }, "layouts": { "LAYOUT": { diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c index b05fca684bd6..fdc36ae65e57 100644 --- a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c @@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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 ), diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c index b7aeed0e411c..3014b72cfe81 100644 --- a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c +++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c @@ -8,7 +8,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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 ), From 3ea830ee9fe312d68fb7d869013a3c6015f81651 Mon Sep 17 00:00:00 2001 From: cttt <1219008126@qq.com> Date: Sun, 9 Jul 2023 20:07:33 +0800 Subject: [PATCH 8/9] Update info.json --- keyboards/citrus/erdnuss65/info.json | 177 +++++++++++++-------------- 1 file changed, 86 insertions(+), 91 deletions(-) diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index 30d1e3401883..1d8bd5b28366 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -1,111 +1,106 @@ { - "keyboard_name": "Erdnuss65", "manufacturer": "Citrus Lab", - "processor": "STM32F103", - "bootloader": "stm32duino", + "keyboard_name": "Erdnuss65", "maintainer": "ctt", - "usb": { - "vid": "0x636C", - "pid": "0x6374", - "device_version": "1.0.0" - }, - - "matrix_pins": { - "rows": - ["B10","B1", "B0","A7","A6"], - "cols": - ["B12","B14","B15","B5","B13","B3","B4","B6","A0","A1","A2","A3","A4","A5","B11"] - }, - + "bootloader": "stm32duino", "diode_direction": "COL2ROW", - "features": { + "audio": false, + "backlight": false, "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, "command": false, + "console": false, + "extrakey": true, + "mousekey": true, "nkro": true, - "backlight": false, - "rgblight": true, - "audio": false + "rgblight": true }, + "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" + "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,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}, - {"label": "7 K07 (B10,B5)", "matrix":[0, 7], "x": 7, "y": 0}, - {"label": "8 K08 (B10,A1)", "matrix":[0, 8], "x": 8, "y": 0}, - {"label": "9 K09 (B10,A2)", "matrix":[0, 9], "x": 9, "y": 0}, - {"label": "0 K0A (B10,A0)", "matrix":[0, 10], "x": 10, "y": 0}, - {"label": "- K0B (B10,A3)", "matrix":[0, 11], "x": 11, "y": 0}, - {"label": "= K0C (B10,A4)", "matrix":[0, 12], "x": 12, "y": 0}, - {"label": "BACKSPACE K0D (B10,A5)", "matrix":[0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "INS (B10,B11)", "matrix":[0, 14], "x": 15, "y": 0}, - {"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,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}, - {"label": "U (B1,B5)", "matrix":[1, 7], "x": 7.5, "y": 1}, - {"label": "I (B1,A1)", "matrix":[1, 8], "x": 8.5, "y": 1}, - {"label": "O (B1,A2)", "matrix":[1, 9], "x": 9.5, "y": 1}, - {"label": "P (B1,A0)", "matrix":[1, 10], "x": 10.5, "y": 1}, - {"label": "[ (B1,A3)", "matrix":[1, 11], "x": 11.5, "y": 1}, - {"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.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,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}, - {"label": "J (B0,B5)", "matrix":[2, 7], "x": 7.75, "y": 2}, - {"label": "K (B0,A1)", "matrix":[2, 8], "x": 8.75, "y": 2}, - {"label": "L (B0,A2)", "matrix":[2, 9], "x": 9.75, "y": 2}, - {"label": "; (B0,A0)", "matrix":[2, 10], "x": 10.75, "y": 2}, - {"label": "' (B0,A3)", "matrix":[2, 11], "x": 11.75, "y": 2}, - {"label": "ENTER (B0,A5)", "matrix":[2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "PGUP (B0,B11)", "matrix":[2, 14], "x": 15, "y": 2}, - {"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,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}, - {"label": "M (A7,B5)", "matrix":[3, 7], "x": 8.25, "y": 3}, - {"label": ", (A7,A1)", "matrix":[3, 8], "x": 9.25, "y": 3}, - {"label": ". (A7,A2)", "matrix":[3, 9], "x": 10.25, "y": 3}, - {"label": "/ (A7,A0)", "matrix":[3, 10], "x": 11.25, "y": 3}, - {"label": "RSHIFT (A7,A4)", "matrix":[3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "UP (A7,A5)", "matrix":[3, 13], "x": 14, "y": 3}, - {"label": "PGDN (A7,B11)", "matrix":[3, 14], "x": 15, "y": 3}, - {"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,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} - ] + {"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,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}, + {"label": "7 K07 (B10,B5)", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8 K08 (B10,A1)", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9 K09 (B10,A2)", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0 K0A (B10,A0)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "- K0B (B10,A3)", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "= K0C (B10,A4)", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "BACKSPACE K0D (B10,A5)", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "INS (B10,B11)", "matrix": [0, 14], "x": 15, "y": 0}, + {"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,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}, + {"label": "U (B1,B5)", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I (B1,A1)", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O (B1,A2)", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P (B1,A0)", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[ (B1,A3)", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"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.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,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}, + {"label": "J (B0,B5)", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K (B0,A1)", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L (B0,A2)", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "; (B0,A0)", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "' (B0,A3)", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "ENTER (B0,A5)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PGUP (B0,B11)", "matrix": [2, 14], "x": 15, "y": 2}, + {"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,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}, + {"label": "M (A7,B5)", "matrix": [3, 7], "x": 8.25, "y": 3}, + {"label": ", (A7,A1)", "matrix": [3, 8], "x": 9.25, "y": 3}, + {"label": ". (A7,A2)", "matrix": [3, 9], "x": 10.25, "y": 3}, + {"label": "/ (A7,A0)", "matrix": [3, 10], "x": 11.25, "y": 3}, + {"label": "RSHIFT (A7,A4)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "UP (A7,A5)", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "PGDN (A7,B11)", "matrix": [3, 14], "x": 15, "y": 3}, + {"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,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} + ] } } } From 6ad437920d669229541bbe154437804ebd7afd9d Mon Sep 17 00:00:00 2001 From: cttt <1219008126@qq.com> Date: Wed, 12 Jul 2023 20:09:56 +0800 Subject: [PATCH 9/9] Update info.json --- keyboards/citrus/erdnuss65/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json index 1d8bd5b28366..4faaa0543108 100644 --- a/keyboards/citrus/erdnuss65/info.json +++ b/keyboards/citrus/erdnuss65/info.json @@ -5,11 +5,7 @@ "bootloader": "stm32duino", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true,