summaryrefslogtreecommitdiff
path: root/keyboards/preonic
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-30 18:58:06 +1000
committerGitHub <noreply@github.com>2023-04-30 18:58:06 +1000
commita42d6426d9bbf1ddc15cfe77b3764524269b0d7e (patch)
tree7751396d683469990dc55e2a5f4f0d5eae8f2a69 /keyboards/preonic
parent4b8796168913e40de57352c7daa8eb726398aec8 (diff)
Remove use of layout macros for `music_map` (#20634)
Diffstat (limited to 'keyboards/preonic')
-rw-r--r--keyboards/preonic/preonic.c9
-rw-r--r--keyboards/preonic/rev1/rev1.c8
-rw-r--r--keyboards/preonic/rev2/rev2.c8
-rw-r--r--keyboards/preonic/rev3/rev3.c13
-rw-r--r--keyboards/preonic/rev3_drop/rev3_drop.c13
5 files changed, 42 insertions, 9 deletions
diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c
index fd2fbd8c77..915806eb28 100644
--- a/keyboards/preonic/preonic.c
+++ b/keyboards/preonic/preonic.c
@@ -1,13 +1,4 @@
#include "quantum.h"
-#include QMK_KEYBOARD_H
-
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid(
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
-);
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/preonic/rev1/rev1.c b/keyboards/preonic/rev1/rev1.c
index 2d56f037f4..eed51f2d84 100644
--- a/keyboards/preonic/rev1/rev1.c
+++ b/keyboards/preonic/rev1/rev1.c
@@ -34,3 +34,11 @@ void matrix_init_kb(void) {
{{11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
};
#endif
+
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ {48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59},
+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
+};
diff --git a/keyboards/preonic/rev2/rev2.c b/keyboards/preonic/rev2/rev2.c
index 2d56f037f4..eed51f2d84 100644
--- a/keyboards/preonic/rev2/rev2.c
+++ b/keyboards/preonic/rev2/rev2.c
@@ -34,3 +34,11 @@ void matrix_init_kb(void) {
{{11, 4}, {10, 4}, {9, 4}, {8, 4}, {7, 4}, {6, 4}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
};
#endif
+
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ {48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59},
+ {36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47},
+ {24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
+ {12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
+};
diff --git a/keyboards/preonic/rev3/rev3.c b/keyboards/preonic/rev3/rev3.c
index 5cca62521c..5a751cbba5 100644
--- a/keyboards/preonic/rev3/rev3.c
+++ b/keyboards/preonic/rev3/rev3.c
@@ -62,3 +62,16 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
# endif
#endif
+
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ {48, 49, 50, 51, 52, 53},
+ {36, 37, 38, 39, 40, 41},
+ {24, 25, 26, 27, 28, 29},
+ {12, 13, 14, 15, 16, 17},
+ {54, 55, 56, 57, 58, 59},
+ {42, 43, 44, 45, 46, 47},
+ {30, 31, 32, 33, 34, 35},
+ {18, 19, 20, 21, 22, 23},
+ { 0, 1, 2, 9, 10, 11},
+ { 6, 7, 8, 3, 4, 5}
+};
diff --git a/keyboards/preonic/rev3_drop/rev3_drop.c b/keyboards/preonic/rev3_drop/rev3_drop.c
index 5cca62521c..5a751cbba5 100644
--- a/keyboards/preonic/rev3_drop/rev3_drop.c
+++ b/keyboards/preonic/rev3_drop/rev3_drop.c
@@ -62,3 +62,16 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
# endif
#endif
+
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ {48, 49, 50, 51, 52, 53},
+ {36, 37, 38, 39, 40, 41},
+ {24, 25, 26, 27, 28, 29},
+ {12, 13, 14, 15, 16, 17},
+ {54, 55, 56, 57, 58, 59},
+ {42, 43, 44, 45, 46, 47},
+ {30, 31, 32, 33, 34, 35},
+ {18, 19, 20, 21, 22, 23},
+ { 0, 1, 2, 9, 10, 11},
+ { 6, 7, 8, 3, 4, 5}
+};