Diff
1diff --git a/keyboards/ein_60/ein_60.c b/keyboards/ein_60/ein_60.c
2index 60955eb8a3e2e44da7f9abbcd90273058c3b111e..af11e48235f851f4d4fec03a0325b33929c66e38 100644
3--- a/keyboards/ein_60/ein_60.c
4+++ b/keyboards/ein_60/ein_60.c
5@@ -47,12 +47,12 @@ led_config_t g_led_config = { {
6 #endif
7
8 #ifdef AUDIO_ENABLE
9-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT(
10- 30, 31, 32, 33, 34, 35, 35, 36, 37, 38, 39, 40, 41,
11- 18, 9, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
12- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
13- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
14-);
15+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
16+ {30, 31, 32, 33, 34, 35, 35, 36, 37, 38, 39, 40, 41},
17+ {18, 19, 20, 21, 22, 23, 0, 25, 25, 26, 27, 28, 29},
18+ { 6, 7, 8, 9, 10, 11, 0, 12, 13, 14, 15, 16, 17},
19+ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}
20+};
21 #endif
22
23 #ifdef OLED_ENABLE
24diff --git a/keyboards/jones/v03_1/v03_1.c b/keyboards/jones/v03_1/v03_1.c
25index f09b801a3e2c79ade81684039e010c4ecc572268..538a99d56507b9aaf8d1cfdf2d83cda4a17c85bb 100644
26--- a/keyboards/jones/v03_1/v03_1.c
27+++ b/keyboards/jones/v03_1/v03_1.c
28@@ -17,11 +17,17 @@
29 #include "quantum.h"
30
31 #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
32-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_all(
33- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
34- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
35- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
36- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
37- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
38-);
39+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
40+ { 0, 0, 0, 0, 0, 0, 0, 64, 65, 66, 67},
41+ { 0, 0, 0, 0, 0, 0, 0, 49, 50, 51, 52},
42+ { 0, 0, 0, 0, 0, 0, 0, 35, 36, 37, 38},
43+ { 0, 0, 0, 0, 0, 0, 0, 21, 22, 23, 24},
44+ { 0, 0, 0, 0, 0, 0, 0, 8, 9, 10, 11},
45+ { 0, 0, 0, 0, 0, 0, 59, 60, 61, 62, 63},
46+ {53, 54, 55, 56, 57, 58, 0, 45, 46, 47, 48},
47+ {39, 0, 40, 41, 42, 43, 44, 0, 32, 33, 34},
48+ {25, 0, 26, 27, 28, 29, 30, 31, 0, 19, 20},
49+ {11, 0, 12, 13, 14, 15, 16, 17, 18, 0, 0},
50+ { 0, 1, 2, 3, 0, 4, 0, 5, 6, 7, 0}
51+};
52 #endif
53diff --git a/keyboards/jones/v1/v1.c b/keyboards/jones/v1/v1.c
54index bb13049a6718918ba520d1e56d03a6b4dc73a4f5..7ad641e41fe2da32b93d21c25780c79266845303 100644
55--- a/keyboards/jones/v1/v1.c
56+++ b/keyboards/jones/v1/v1.c
57@@ -14,15 +14,19 @@
58 * along with this program. If not, see <http://www.gnu.org/licenses/>.
59 */
60
61-#include QMK_KEYBOARD_H
62+#include "quantum.h"
63
64 #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
65-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT(
66- 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
67- 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
68- 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
69- 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
70- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
71- 0, 0, 0, 0
72-);
73+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
74+ { 0, 37, 33, 0, 27, 31, 30, 35, 25, 0},
75+ {17, 0, 21, 0, 15, 19, 18, 23, 13, 0},
76+ {17, 0, 0, 21, 15, 19, 18, 23, 13, 0},
77+ { 4, 12, 8, 0, 2, 6, 5, 10, 0, 0},
78+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
79+ {28, 36, 32, 34, 26, 0, 29, 0, 0, 24},
80+ {16, 24, 20, 22, 14, 0, 0, 0, 0, 12},
81+ {16, 24, 20, 22, 14, 0, 0, 0, 0, 12},
82+ { 3, 11, 7, 9, 1, 0, 0, 0, 0, 0},
83+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
84+};
85 #endif
86diff --git a/keyboards/keyprez/rhino/rhino.c b/keyboards/keyprez/rhino/rhino.c
87index d2e1bf2e2343914d32b84f4b0f3257c13a1dfe5f..e7eb74e655277dd45acba9c61a58b388a14f94cf 100644
88--- a/keyboards/keyprez/rhino/rhino.c
89+++ b/keyboards/keyprez/rhino/rhino.c
90@@ -15,13 +15,15 @@
91 */
92
93 #include "quantum.h"
94-#include QMK_KEYBOARD_H
95
96 __attribute__ ((weak))
97-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_2x2u(
98- 0,
99- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
100- 0, 1, 3, 0, 6, 8, 10, 0, 13, 15, 0, 18, 20, 0,
101- 0, 0, 2, 4, 5, 7, 9, 11, 12, 14, 16, 17, 19, 0,
102- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
103-);
104+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
105+ { 0, 0, 0, 0, 0, 0, 0},
106+ { 0, 1, 3, 0, 6, 8, 10},
107+ { 0, 0, 2, 4, 5, 7, 9},
108+ { 0, 0, 0, 0, 0, 0, 0},
109+ { 0, 0, 0, 0, 0, 0, 0},
110+ { 0, 13, 15, 0, 18, 20, 0},
111+ {11, 12, 14, 16, 17, 19, 0},
112+ { 0, 0, 0, 0, 0, 0, 0}
113+};
114diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
115index e81c884adfe2ca5ef693c78bf16c77d814178fa3..4146fc7afb7b59268d7ea5e9e15e27ba5c5c06de 100644
116--- a/keyboards/moonlander/moonlander.c
117+++ b/keyboards/moonlander/moonlander.c
118@@ -16,8 +16,6 @@
119 * along with this program. If not, see <http://www.gnu.org/licenses/>.
120 */
121
122-
123-#include QMK_KEYBOARD_H
124 #include "moonlander.h"
125
126 keyboard_config_t keyboard_config;
127@@ -370,14 +368,20 @@ void keyboard_post_init_kb(void) {
128 #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
129 // clang-format off
130 __attribute__ ((weak))
131-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
132- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
133- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
134- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
135- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
136- 8, 9, 10, 11, 12, 3, 4, 13, 14, 15, 16, 17,
137- 0, 1, 2, 5, 6, 7
138-);
139+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
140+ {58, 59, 60, 61, 62, 63, 64},
141+ {44, 45, 46, 47, 48, 49, 50},
142+ {30, 31, 32, 33, 34, 35, 36},
143+ {18, 19, 20, 21, 22, 23, 0},
144+ { 8, 9, 10, 11, 12, 0, 0},
145+ { 0, 1, 2, 3, 0, 0, 0},
146+ {65, 66, 67, 68, 69, 70, 71},
147+ {51, 52, 53, 54, 55, 56, 57},
148+ {37, 38, 39, 40, 41, 42, 43},
149+ { 0, 24, 25, 26, 27, 28, 29},
150+ { 0, 0, 13, 14, 15, 16, 17},
151+ { 0, 0, 0, 4, 5, 6, 7}
152+};
153 // clang-format on
154 #endif
155
156diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
157index 8572818de2ce29c7766bfeaa7d3bee6fc133243a..e6bd217520e5487a43789bde23c52fd15c831a25 100644
158--- a/keyboards/planck/ez/ez.c
159+++ b/keyboards/planck/ez/ez.c
160@@ -356,3 +356,14 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
161 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
162 # endif
163 #endif
164+
165+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
166+ {36, 37, 38, 39, 40, 41},
167+ {24, 25, 26, 27, 28, 29},
168+ {12, 13, 14, 15, 16, 17},
169+ { 0, 1, 2, 10, 11, 6},
170+ {42, 43, 44, 45, 46, 47},
171+ {30, 31, 32, 33, 34, 35},
172+ {18, 19, 20, 21, 22, 23},
173+ { 7, 8, 9, 3, 4, 5}
174+};
175diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
176index e9d2f7c3d8380f3c30b94cd32ca394f0a46db824..1fc6a65c0c3b365d9e4bcbb8df3502e829f8202b 100644
177--- a/keyboards/planck/light/light.c
178+++ b/keyboards/planck/light/light.c
179@@ -140,3 +140,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
180 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
181 # endif
182 #endif
183+
184+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
185+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
186+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
187+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
188+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
189+};
190diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
191index 4be96986a77477765658dbd706ca6f887bc3509b..660be55babeca4860325deb3c44529ab0882b064 100644
192--- a/keyboards/planck/planck.c
193+++ b/keyboards/planck/planck.c
194@@ -1,5 +1,4 @@
195 #include "quantum.h"
196-#include QMK_KEYBOARD_H
197
198 __attribute__ ((weak))
199 void matrix_init_kb(void) {
200@@ -12,13 +11,6 @@ void matrix_init_kb(void) {
201 matrix_init_user();
202 }
203
204-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_planck_grid(
205- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
206- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
207- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
208- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
209-);
210-
211 #ifdef ENCODER_ENABLE
212 bool encoder_update_kb(uint8_t index, bool clockwise) {
213 if (!encoder_update_user(index, clockwise)) { return false; }
214diff --git a/keyboards/planck/rev1/rev1.c b/keyboards/planck/rev1/rev1.c
215index ee8a6bf533a9f4a209daf14468f7459ec77e02a1..f8f8d2132a5f6b7cfeb69fd55d65acd870cfa312 100644
216--- a/keyboards/planck/rev1/rev1.c
217+++ b/keyboards/planck/rev1/rev1.c
218@@ -13,3 +13,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
219 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
220 # endif
221 #endif
222+
223+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
224+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
225+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
226+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
227+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
228+};
229diff --git a/keyboards/planck/rev2/rev2.c b/keyboards/planck/rev2/rev2.c
230index ee8a6bf533a9f4a209daf14468f7459ec77e02a1..f8f8d2132a5f6b7cfeb69fd55d65acd870cfa312 100644
231--- a/keyboards/planck/rev2/rev2.c
232+++ b/keyboards/planck/rev2/rev2.c
233@@ -13,3 +13,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
234 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
235 # endif
236 #endif
237+
238+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
239+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
240+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
241+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
242+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
243+};
244diff --git a/keyboards/planck/rev3/rev3.c b/keyboards/planck/rev3/rev3.c
245index ee8a6bf533a9f4a209daf14468f7459ec77e02a1..f8f8d2132a5f6b7cfeb69fd55d65acd870cfa312 100644
246--- a/keyboards/planck/rev3/rev3.c
247+++ b/keyboards/planck/rev3/rev3.c
248@@ -13,3 +13,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
249 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
250 # endif
251 #endif
252+
253+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
254+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
255+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
256+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
257+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
258+};
259diff --git a/keyboards/planck/rev4/rev4.c b/keyboards/planck/rev4/rev4.c
260index ee8a6bf533a9f4a209daf14468f7459ec77e02a1..f8f8d2132a5f6b7cfeb69fd55d65acd870cfa312 100644
261--- a/keyboards/planck/rev4/rev4.c
262+++ b/keyboards/planck/rev4/rev4.c
263@@ -13,3 +13,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
264 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
265 # endif
266 #endif
267+
268+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
269+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
270+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
271+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
272+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
273+};
274diff --git a/keyboards/planck/rev5/rev5.c b/keyboards/planck/rev5/rev5.c
275index ee8a6bf533a9f4a209daf14468f7459ec77e02a1..f8f8d2132a5f6b7cfeb69fd55d65acd870cfa312 100644
276--- a/keyboards/planck/rev5/rev5.c
277+++ b/keyboards/planck/rev5/rev5.c
278@@ -13,3 +13,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
279 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
280 # endif
281 #endif
282+
283+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
284+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
285+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
286+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
287+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
288+};
289diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c
290index 30cb2cb9c7d1ab30ebcd5f96821ab9fa13b858da..49f7d83123999916dc1019dde751a104a0b97647 100644
291--- a/keyboards/planck/rev6/rev6.c
292+++ b/keyboards/planck/rev6/rev6.c
293@@ -60,3 +60,14 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
294 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
295 # endif
296 #endif
297+
298+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
299+ {36, 37, 38, 39, 40, 41},
300+ {24, 25, 26, 27, 28, 29},
301+ {12, 13, 14, 15, 16, 17},
302+ { 0, 1, 2, 9, 10, 11},
303+ {42, 43, 44, 45, 46, 47},
304+ {30, 31, 32, 33, 34, 35},
305+ {18, 19, 20, 21, 22, 23},
306+ { 6, 7, 8, 3, 4, 5}
307+};
308diff --git a/keyboards/planck/rev6_drop/rev6_drop.c b/keyboards/planck/rev6_drop/rev6_drop.c
309index 049db9cec0a8e5f025f34e5843abd3e168f79d60..8f613851dc5c1da2bbaf57f12ba5d8c5600fd206 100644
310--- a/keyboards/planck/rev6_drop/rev6_drop.c
311+++ b/keyboards/planck/rev6_drop/rev6_drop.c
312@@ -61,3 +61,14 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
313 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
314 # endif
315 #endif
316+
317+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
318+ {36, 37, 38, 39, 40, 41},
319+ {24, 25, 26, 27, 28, 29},
320+ {12, 13, 14, 15, 16, 17},
321+ { 0, 1, 2, 9, 10, 11},
322+ {42, 43, 44, 45, 46, 47},
323+ {30, 31, 32, 33, 34, 35},
324+ {18, 19, 20, 21, 22, 23},
325+ { 6, 7, 8, 3, 4, 5}
326+};
327diff --git a/keyboards/planck/thk/thk.c b/keyboards/planck/thk/thk.c
328index 42836f0f11d13102f1029f50bbf3d6ac4e5278e0..bd7080e01b24208bc4a33c2b55acc5fbed29c95d 100644
329--- a/keyboards/planck/thk/thk.c
330+++ b/keyboards/planck/thk/thk.c
331@@ -30,3 +30,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
332 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
333 # endif
334 #endif
335+
336+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
337+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
338+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
339+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
340+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
341+};
342diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c
343index fd2fbd8c77b1a2e30fa05ecfbecdf1e6025e5cb2..915806eb28be215818b85cce9bec1a885d9637e5 100644
344--- a/keyboards/preonic/preonic.c
345+++ b/keyboards/preonic/preonic.c
346@@ -1,13 +1,4 @@
347 #include "quantum.h"
348-#include QMK_KEYBOARD_H
349-
350-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid(
351- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
352- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
353- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
354- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
355- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
356-);
357
358 #ifdef ENCODER_ENABLE
359 bool encoder_update_kb(uint8_t index, bool clockwise) {
360diff --git a/keyboards/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c
361index 2d56f037f455e520b7b44958b55e5d5ad22ffb54..eed51f2d84519e4ec65a369f51e7aac357e0b2cd 100644
362--- a/keyboards/preonic/rev1/rev1.c
363+++ b/keyboards/preonic/rev1/rev1.c
364@@ -34,3 +34,11 @@ void matrix_init_kb(void) {
365 {{11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
366 };
367 #endif
368+
369+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
370+ {48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59},
371+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
372+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
373+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
374+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
375+};
376diff --git a/keyboards/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c
377index 2d56f037f455e520b7b44958b55e5d5ad22ffb54..eed51f2d84519e4ec65a369f51e7aac357e0b2cd 100644
378--- a/keyboards/preonic/rev2/rev2.c
379+++ b/keyboards/preonic/rev2/rev2.c
380@@ -34,3 +34,11 @@ void matrix_init_kb(void) {
381 {{11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
382 };
383 #endif
384+
385+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
386+ {48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59},
387+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
388+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
389+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
390+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
391+};
392diff --git a/keyboards/preonic/rev3/rev3.c b/keyboards/preonic/rev3/rev3.c
393index 5cca62521c19a626396910b39d0511b0f242556d..5a751cbba5e8c72e12549fdc24a325fa528b49c5 100644
394--- a/keyboards/preonic/rev3/rev3.c
395+++ b/keyboards/preonic/rev3/rev3.c
396@@ -62,3 +62,16 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
397 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
398 # endif
399 #endif
400+
401+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
402+ {48, 49, 50, 51, 52, 53},
403+ {36, 37, 38, 39, 40, 41},
404+ {24, 25, 26, 27, 28, 29},
405+ {12, 13, 14, 15, 16, 17},
406+ {54, 55, 56, 57, 58, 59},
407+ {42, 43, 44, 45, 46, 47},
408+ {30, 31, 32, 33, 34, 35},
409+ {18, 19, 20, 21, 22, 23},
410+ { 0, 1, 2, 9, 10, 11},
411+ { 6, 7, 8, 3, 4, 5}
412+};
413diff --git a/keyboards/preonic/rev3_drop/rev3_drop.c b/keyboards/preonic/rev3_drop/rev3_drop.c
414index 5cca62521c19a626396910b39d0511b0f242556d..5a751cbba5e8c72e12549fdc24a325fa528b49c5 100644
415--- a/keyboards/preonic/rev3_drop/rev3_drop.c
416+++ b/keyboards/preonic/rev3_drop/rev3_drop.c
417@@ -62,3 +62,16 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
418 const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
419 # endif
420 #endif
421+
422+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
423+ {48, 49, 50, 51, 52, 53},
424+ {36, 37, 38, 39, 40, 41},
425+ {24, 25, 26, 27, 28, 29},
426+ {12, 13, 14, 15, 16, 17},
427+ {54, 55, 56, 57, 58, 59},
428+ {42, 43, 44, 45, 46, 47},
429+ {30, 31, 32, 33, 34, 35},
430+ {18, 19, 20, 21, 22, 23},
431+ { 0, 1, 2, 9, 10, 11},
432+ { 6, 7, 8, 3, 4, 5}
433+};
434diff --git a/keyboards/unison/v04/v04.c b/keyboards/unison/v04/v04.c
435index d9e8ed9e8b6974700b8fcf48b2370c6ecaced364..e0c4e8cee0996b3d94fdedeae69eb4387e70140a 100644
436--- a/keyboards/unison/v04/v04.c
437+++ b/keyboards/unison/v04/v04.c
438@@ -17,11 +17,16 @@
439 #include "quantum.h"
440
441 #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
442-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_all(
443- 0,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,
444- 0, 32,33,34,35,36,37,38,39,40,41,42,43,44,45, 46,
445- 0, 17,18,19,20,21,22,23,24,25,26,27,28,29,30, 31,
446- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,
447- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
448-);
449+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
450+ { 0, 47, 49, 51, 53, 55, 57, 59, 61, 0},
451+ {32, 0, 34, 36, 38, 40, 42, 44, 0, 0},
452+ {17, 19, 0, 21, 23, 25, 27, 29, 0, 0},
453+ { 1, 3, 5, 0, 7, 9, 11, 13, 15, 0},
454+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
455+ { 0, 48, 50, 52, 54, 0, 56, 58, 60, 62},
456+ { 0, 33, 35, 37, 39, 41, 0, 43, 45, 46},
457+ { 0, 18, 20, 22, 24, 26, 28, 0, 30, 31},
458+ { 0, 2, 4, 6, 8, 10, 12, 14, 0, 16},
459+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
460+};
461 #endif