Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor] Make changes to some pins #21380

Merged
merged 11 commits into from
Sep 6, 2023
Merged

[Refactor] Make changes to some pins #21380

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
91c1bda
Update keymap.c
ctt-t Jun 8, 2023
d7a2a07
Update keymap.c
ctt-t Jun 8, 2023
ed75989
Update info.json
ctt-t Jun 8, 2023
440ff4a
Update keymap.c
ctt-t Jun 8, 2023
cfb0c74
Update keymap.c
ctt-t Jun 8, 2023
4228feb
Update info.json
ctt-t Jun 8, 2023
0162a72
Merge branch 'qmk:master' into citrus
ctt-t Jun 18, 2023
f4671cb
Merge branch 'qmk:master' into citrus
ctt-t Jun 25, 2023
0d6163b
[Refactor] Make changes to some pins
ctt-t Jun 25, 2023
3ea830e
Update info.json
ctt-t Jul 9, 2023
6ad4379
Update info.json
ctt-t Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 77 additions & 72 deletions keyboards/citrus/erdnuss65/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -25,81 +30,81 @@
"rgblight": true,
"audio": false
},
"ws2812": {
"pin": "A15"
},
"rgblight": {
"led_count": 1
},
"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": "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}
]
}
}
Expand Down
11 changes: 5 additions & 6 deletions keyboards/citrus/erdnuss65/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
};

13 changes: 6 additions & 7 deletions keyboards/citrus/erdnuss65/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -34,6 +34,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),

)
};