Skip to content

Commit 32c90bf

Browse files
ctt-tctt-t
authored
[Refactor] Make changes to some pins (#21380)
1 parent 3aebc8a commit 32c90bf

File tree

3 files changed

+34
-40
lines changed

3 files changed

+34
-40
lines changed

‎keyboards/citrus/erdnuss65/info.json

+23-27
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
{
2-
"keyboard_name": "Erdnuss65",
32
"manufacturer": "Citrus Lab",
4-
"processor": "STM32F103",
5-
"bootloader": "stm32duino",
3+
"keyboard_name": "Erdnuss65",
64
"maintainer": "ctt",
7-
"usb": {
8-
"vid": "0x636C",
9-
"pid": "0x6374",
10-
"device_version": "0.0.1"
11-
},
12-
"matrix_pins": {
13-
"rows": ["B10", "B1", "B0", "A7", "A6"],
14-
"cols": ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
15-
},
5+
"bootloader": "stm32duino",
166
"diode_direction": "COL2ROW",
177
"features": {
188
"bootmagic": true,
19-
"mousekey": true,
209
"extrakey": true,
21-
"console": false,
22-
"command": false,
10+
"mousekey": true,
2311
"nkro": true,
24-
"backlight": false,
25-
"rgblight": true,
26-
"audio": false
12+
"rgblight": true
2713
},
28-
"ws2812": {
29-
"pin": "A15"
14+
"matrix_pins": {
15+
"cols": ["B12", "B14", "B15", "B5", "B13", "B3", "B4", "B6", "A0", "A1", "A2", "A3", "A4", "A5", "B11"],
16+
"rows": ["B10", "B1", "B0", "A7", "A6"]
3017
},
18+
"processor": "STM32F103",
3119
"rgblight": {
3220
"led_count": 1
3321
},
22+
"usb": {
23+
"device_version": "1.0.0",
24+
"pid": "0x6374",
25+
"vid": "0x636C"
26+
},
27+
"ws2812": {
28+
"pin": "A15"
29+
},
3430
"layouts": {
3531
"LAYOUT": {
3632
"layout": [
3733
{"label": "ESC K00 (B10,B12)", "matrix": [0, 0], "x": 0, "y": 0},
3834
{"label": "1 K01 (B10,B14)", "matrix": [0, 1], "x": 1, "y": 0},
3935
{"label": "2 K02 (B10,B15)", "matrix": [0, 2], "x": 2, "y": 0},
40-
{"label": "3 K03 (B10,A8)", "matrix": [0, 3], "x": 3, "y": 0},
36+
{"label": "3 K03 (B10,B5)", "matrix": [0, 3], "x": 3, "y": 0},
4137
{"label": "4 K04 (B10,B13)", "matrix": [0, 4], "x": 4, "y": 0},
4238
{"label": "5 K05 (B10,B3)", "matrix": [0, 5], "x": 5, "y": 0},
4339
{"label": "6 K06 (B10,B4)", "matrix": [0, 6], "x": 6, "y": 0},
@@ -52,7 +48,7 @@
5248
{"label": "TAB (B1,B12)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
5349
{"label": "Q (B1,B14)", "matrix": [1, 1], "x": 1.5, "y": 1},
5450
{"label": "W (B1,B15)", "matrix": [1, 2], "x": 2.5, "y": 1},
55-
{"label": "E (B1,A8)", "matrix": [1, 3], "x": 3.5, "y": 1},
51+
{"label": "E (B1,B5)", "matrix": [1, 3], "x": 3.5, "y": 1},
5652
{"label": "R (B1,B13)", "matrix": [1, 4], "x": 4.5, "y": 1},
5753
{"label": "T (B1,B3)", "matrix": [1, 5], "x": 5.5, "y": 1},
5854
{"label": "Y (B1,B4)", "matrix": [1, 6], "x": 6.5, "y": 1},
@@ -64,10 +60,10 @@
6460
{"label": "] (B1,A4)", "matrix": [1, 12], "x": 12.5, "y": 1},
6561
{"label": "\" (B1,A5)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
6662
{"label": "DEL (B1,B11)", "matrix": [1, 14], "x": 15, "y": 1},
67-
{"label": "CAPSLOCK (B0,B12)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
63+
{"label": "CAPSLOCK (B0,B12)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
6864
{"label": "A (B0,B14)", "matrix": [2, 1], "x": 1.75, "y": 2},
6965
{"label": "S (B0,B15)", "matrix": [2, 2], "x": 2.75, "y": 2},
70-
{"label": "D (B0,A8)", "matrix": [2, 3], "x": 3.75, "y": 2},
66+
{"label": "D (B0,B5)", "matrix": [2, 3], "x": 3.75, "y": 2},
7167
{"label": "F (B0,B13)", "matrix": [2, 4], "x": 4.75, "y": 2},
7268
{"label": "G (B0,B3)", "matrix": [2, 5], "x": 5.75, "y": 2},
7369
{"label": "H (B0,B4)", "matrix": [2, 6], "x": 6.75, "y": 2},
@@ -81,7 +77,7 @@
8177
{"label": "LSHIFT (A7,B12)", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
8278
{"label": "Z (A7,B14)", "matrix": [3, 1], "x": 2.25, "y": 3},
8379
{"label": "X (A7,B15)", "matrix": [3, 2], "x": 3.25, "y": 3},
84-
{"label": "C (A7,A8)", "matrix": [3, 3], "x": 4.25, "y": 3},
80+
{"label": "C (A7,B5)", "matrix": [3, 3], "x": 4.25, "y": 3},
8581
{"label": "V (A7,B13)", "matrix": [3, 4], "x": 5.25, "y": 3},
8682
{"label": "B (A7,B3)", "matrix": [3, 5], "x": 6.25, "y": 3},
8783
{"label": "N (A7,B4)", "matrix": [3, 6], "x": 7.25, "y": 3},
@@ -95,12 +91,12 @@
9591
{"label": "LCTRL (A6,B12)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
9692
{"label": "WIN (A6,B14)", "matrix": [4, 1], "x": 1.5, "y": 4},
9793
{"label": "ALT (A6,B15)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
98-
{"label": "SPACE (A6,A8)", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
94+
{"label": "SPACE (A6,B5)", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
9995
{"label": "FN (A6,A0)", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
10096
{"label": "LEFT (A6,A4)", "matrix": [4, 12], "x": 13, "y": 4},
10197
{"label": "DOWN (A6,A5)", "matrix": [4, 13], "x": 14, "y": 4},
10298
{"label": "RIGHT (A6,B11)", "matrix": [4, 14], "x": 15, "y": 4}
103-
]
99+
]
104100
}
105101
}
106102
}

‎keyboards/citrus/erdnuss65/keymaps/default/keymap.c

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66

77
[0] = LAYOUT(
8-
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,
8+
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,
99
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,
1010
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,
11-
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,
11+
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,
1212
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
1313
),
1414

1515
[1] = LAYOUT(
16-
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,
17-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET, KC_MNXT,
16+
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,
17+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT,
1818
_______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
1919
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
20-
_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
20+
_______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
2121
)
2222
};
23-

‎keyboards/citrus/erdnuss65/keymaps/via/keymap.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66

77
[0] = LAYOUT(
8-
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,
8+
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,
99
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,
1010
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,
11-
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,
11+
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,
1212
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
1313
),
1414

1515
[1] = LAYOUT(
16-
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,
17-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET, KC_MNXT,
16+
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,
17+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, QK_BOOT, KC_MNXT,
1818
_______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
1919
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
20-
_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
20+
_______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_MPLY
2121
),
2222

2323
[2] = LAYOUT(
@@ -34,6 +34,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
3434
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
3535
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
3636
_______, _______, _______, _______, _______, _______, _______, _______
37-
),
38-
37+
)
3938
};

0 commit comments

Comments
 (0)