Skip to content

Commit dcd934b

Browse files
noroadsleftnoroadsleft
authored
KBDfans Bounce75 Hotswap Touch-Up (#20692)
* add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_ansi_rwkl * touch-up keymap keycode alignment
1 parent 461b0d6 commit dcd934b

File tree

4 files changed

+118
-96
lines changed

4 files changed

+118
-96
lines changed

‎keyboards/kbdfans/bounce/75/hotswap/info.json

+85-82
Original file line numberDiff line numberDiff line change
@@ -21,105 +21,108 @@
2121
},
2222
"processor": "atmega32u4",
2323
"bootloader": "atmel-dfu",
24+
"layout_aliases": {
25+
"LAYOUT_all": "LAYOUT_ansi_rwkl"
26+
},
2427
"layouts": {
25-
"LAYOUT_all": {
28+
"LAYOUT_ansi_rwkl": {
2629
"layout": [
27-
{"matrix": [0, 0], "x": 0, "y": 0},
30+
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
2831

29-
{"matrix": [0, 1], "x": 1.25, "y": 0},
30-
{"matrix": [0, 2], "x": 2.25, "y": 0},
31-
{"matrix": [0, 3], "x": 3.25, "y": 0},
32-
{"matrix": [0, 4], "x": 4.25, "y": 0},
32+
{"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
33+
{"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
34+
{"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
35+
{"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
3336

34-
{"matrix": [0, 5], "x": 5.5, "y": 0},
35-
{"matrix": [0, 6], "x": 6.5, "y": 0},
36-
{"matrix": [0, 7], "x": 7.5, "y": 0},
37-
{"matrix": [0, 8], "x": 8.5, "y": 0},
37+
{"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
38+
{"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
39+
{"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
40+
{"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
3841

39-
{"matrix": [0, 9], "x": 9.75, "y": 0},
40-
{"matrix": [0, 10], "x": 10.75, "y": 0},
41-
{"matrix": [0, 11], "x": 11.75, "y": 0},
42-
{"matrix": [0, 12], "x": 12.75, "y": 0},
42+
{"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
43+
{"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
44+
{"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
45+
{"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
4346

44-
{"matrix": [0, 13], "x": 14, "y": 0},
47+
{"label": "PrtSc", "matrix": [0, 13], "x": 14, "y": 0},
4548

46-
{"matrix": [0, 14], "x": 15.25, "y": 0},
49+
{"label": "Pause", "matrix": [0, 14], "x": 15.25, "y": 0},
4750

48-
{"matrix": [1, 0], "x": 0, "y": 1.25},
49-
{"matrix": [1, 1], "x": 1, "y": 1.25},
50-
{"matrix": [1, 2], "x": 2, "y": 1.25},
51-
{"matrix": [1, 3], "x": 3, "y": 1.25},
52-
{"matrix": [1, 4], "x": 4, "y": 1.25},
53-
{"matrix": [1, 5], "x": 5, "y": 1.25},
54-
{"matrix": [1, 6], "x": 6, "y": 1.25},
55-
{"matrix": [1, 7], "x": 7, "y": 1.25},
56-
{"matrix": [1, 8], "x": 8, "y": 1.25},
57-
{"matrix": [1, 9], "x": 9, "y": 1.25},
58-
{"matrix": [1, 10], "x": 10, "y": 1.25},
59-
{"matrix": [1, 11], "x": 11, "y": 1.25},
60-
{"matrix": [1, 12], "x": 12, "y": 1.25},
61-
{"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
51+
{"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
52+
{"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
53+
{"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
54+
{"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
55+
{"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
56+
{"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
57+
{"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
58+
{"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
59+
{"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
60+
{"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
61+
{"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
62+
{"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
63+
{"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
64+
{"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
6265

63-
{"matrix": [1, 14], "x": 15.25, "y": 1.25},
66+
{"label": "Home", "matrix": [1, 14], "x": 15.25, "y": 1.25},
6467

65-
{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
66-
{"matrix": [2, 1], "x": 1.5, "y": 2.25},
67-
{"matrix": [2, 2], "x": 2.5, "y": 2.25},
68-
{"matrix": [2, 3], "x": 3.5, "y": 2.25},
69-
{"matrix": [2, 4], "x": 4.5, "y": 2.25},
70-
{"matrix": [2, 5], "x": 5.5, "y": 2.25},
71-
{"matrix": [2, 6], "x": 6.5, "y": 2.25},
72-
{"matrix": [2, 7], "x": 7.5, "y": 2.25},
73-
{"matrix": [2, 8], "x": 8.5, "y": 2.25},
74-
{"matrix": [2, 9], "x": 9.5, "y": 2.25},
75-
{"matrix": [2, 10], "x": 10.5, "y": 2.25},
76-
{"matrix": [2, 11], "x": 11.5, "y": 2.25},
77-
{"matrix": [2, 12], "x": 12.5, "y": 2.25},
78-
{"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
68+
{"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
69+
{"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
70+
{"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
71+
{"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
72+
{"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
73+
{"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
74+
{"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
75+
{"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
76+
{"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
77+
{"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
78+
{"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
79+
{"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
80+
{"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
81+
{"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
7982

80-
{"matrix": [2, 14], "x": 15.25, "y": 2.25},
83+
{"label": "Page Up", "matrix": [2, 14], "x": 15.25, "y": 2.25},
8184

82-
{"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
83-
{"matrix": [3, 1], "x": 1.75, "y": 3.25},
84-
{"matrix": [3, 2], "x": 2.75, "y": 3.25},
85-
{"matrix": [3, 3], "x": 3.75, "y": 3.25},
86-
{"matrix": [3, 4], "x": 4.75, "y": 3.25},
87-
{"matrix": [3, 5], "x": 5.75, "y": 3.25},
88-
{"matrix": [3, 6], "x": 6.75, "y": 3.25},
89-
{"matrix": [3, 7], "x": 7.75, "y": 3.25},
90-
{"matrix": [3, 8], "x": 8.75, "y": 3.25},
91-
{"matrix": [3, 9], "x": 9.75, "y": 3.25},
92-
{"matrix": [3, 10], "x": 10.75, "y": 3.25},
93-
{"matrix": [3, 11], "x": 11.75, "y": 3.25},
94-
{"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
85+
{"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
86+
{"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
87+
{"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
88+
{"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
89+
{"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
90+
{"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
91+
{"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
92+
{"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
93+
{"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
94+
{"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
95+
{"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
96+
{"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
97+
{"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
9598

96-
{"matrix": [3, 14], "x": 15.25, "y": 3.25},
99+
{"label": "Page Down", "matrix": [3, 14], "x": 15.25, "y": 3.25},
97100

98-
{"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
99-
{"matrix": [4, 1], "x": 2.25, "y": 4.25},
100-
{"matrix": [4, 2], "x": 3.25, "y": 4.25},
101-
{"matrix": [4, 3], "x": 4.25, "y": 4.25},
102-
{"matrix": [4, 4], "x": 5.25, "y": 4.25},
103-
{"matrix": [4, 5], "x": 6.25, "y": 4.25},
104-
{"matrix": [4, 6], "x": 7.25, "y": 4.25},
105-
{"matrix": [4, 7], "x": 8.25, "y": 4.25},
106-
{"matrix": [4, 8], "x": 9.25, "y": 4.25},
107-
{"matrix": [4, 9], "x": 10.25, "y": 4.25},
108-
{"matrix": [4, 10], "x": 11.25, "y": 4.25},
109-
{"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
101+
{"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
102+
{"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25},
103+
{"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25},
104+
{"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25},
105+
{"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25},
106+
{"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25},
107+
{"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25},
108+
{"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
109+
{"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
110+
{"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25},
111+
{"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25},
112+
{"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
110113

111-
{"matrix": [4, 13], "x": 14.25, "y": 4.5},
114+
{"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
112115

113-
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
114-
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
115-
{"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
116-
{"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
117-
{"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
118-
{"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
116+
{"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
117+
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
118+
{"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
119+
{"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
120+
{"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5},
121+
{"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
119122

120-
{"matrix": [5, 11], "x": 13.25, "y": 5.5},
121-
{"matrix": [5, 13], "x": 14.25, "y": 5.5},
122-
{"matrix": [5, 14], "x": 15.25, "y": 5.5}
123+
{"label": "\u2190", "matrix": [5, 11], "x": 13.25, "y": 5.5},
124+
{"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
125+
{"label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.5}
123126
]
124127
}
125128
}

‎keyboards/kbdfans/bounce/75/hotswap/keymaps/default/keymap.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1919

20-
[0] = LAYOUT_all(
20+
[0] = LAYOUT_ansi_rwkl(
2121
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_PSCR, KC_HOME,
2222
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_END,
2323
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_PGUP,
@@ -26,27 +26,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2626
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
2727
),
2828

29-
[1] = LAYOUT_all(
29+
[1] = LAYOUT_ansi_rwkl(
3030
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
31+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
3232
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
3333
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
3434
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,
3535
_______, _______, _______, _______, _______, _______, _______, _______, _______
3636
),
3737

38-
[2] = LAYOUT_all(
38+
[2] = LAYOUT_ansi_rwkl(
3939
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
40+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
4141
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
4242
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4343
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,
4444
_______, _______, _______, _______, _______, _______, _______, _______, _______
4545
),
4646

47-
[3] = LAYOUT_all(
47+
[3] = LAYOUT_ansi_rwkl(
4848
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
49+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
5050
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
5151
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
5252
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,

‎keyboards/kbdfans/bounce/75/hotswap/keymaps/via/keymap.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1919

20-
[0] = LAYOUT_all(
20+
[0] = LAYOUT_ansi_rwkl(
2121
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_PSCR, KC_HOME,
2222
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_END,
2323
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_PGUP,
@@ -26,27 +26,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
2626
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
2727
),
2828

29-
[1] = LAYOUT_all(
29+
[1] = LAYOUT_ansi_rwkl(
3030
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
31+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
3232
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
3333
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
3434
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,
3535
_______, _______, _______, _______, _______, _______, _______, _______, _______
3636
),
3737

38-
[2] = LAYOUT_all(
38+
[2] = LAYOUT_ansi_rwkl(
3939
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
40+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
4141
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
4242
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
4343
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,
4444
_______, _______, _______, _______, _______, _______, _______, _______, _______
4545
),
4646

47-
[3] = LAYOUT_all(
47+
[3] = LAYOUT_ansi_rwkl(
4848
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
49-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
49+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
5050
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
5151
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
5252
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______,

0 commit comments

Comments
 (0)