diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-30 18:58:06 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-30 18:58:06 +1000 |
| commit | a42d6426d9bbf1ddc15cfe77b3764524269b0d7e (patch) | |
| tree | 7751396d683469990dc55e2a5f4f0d5eae8f2a69 /keyboards/jones | |
| parent | 4b8796168913e40de57352c7daa8eb726398aec8 (diff) | |
Remove use of layout macros for `music_map` (#20634)
Diffstat (limited to 'keyboards/jones')
| -rw-r--r-- | keyboards/jones/v03_1/v03_1.c | 20 | ||||
| -rw-r--r-- | keyboards/jones/v1/v1.c | 22 |
2 files changed, 26 insertions, 16 deletions
diff --git a/keyboards/jones/v03_1/v03_1.c b/keyboards/jones/v03_1/v03_1.c index f09b801a3e..538a99d565 100644 --- a/keyboards/jones/v03_1/v03_1.c +++ b/keyboards/jones/v03_1/v03_1.c @@ -17,11 +17,17 @@ #include "quantum.h" #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) -const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_all( - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 -); +const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = { + { 0, 0, 0, 0, 0, 0, 0, 64, 65, 66, 67}, + { 0, 0, 0, 0, 0, 0, 0, 49, 50, 51, 52}, + { 0, 0, 0, 0, 0, 0, 0, 35, 36, 37, 38}, + { 0, 0, 0, 0, 0, 0, 0, 21, 22, 23, 24}, + { 0, 0, 0, 0, 0, 0, 0, 8, 9, 10, 11}, + { 0, 0, 0, 0, 0, 0, 59, 60, 61, 62, 63}, + {53, 54, 55, 56, 57, 58, 0, 45, 46, 47, 48}, + {39, 0, 40, 41, 42, 43, 44, 0, 32, 33, 34}, + {25, 0, 26, 27, 28, 29, 30, 31, 0, 19, 20}, + {11, 0, 12, 13, 14, 15, 16, 17, 18, 0, 0}, + { 0, 1, 2, 3, 0, 4, 0, 5, 6, 7, 0} +}; #endif diff --git a/keyboards/jones/v1/v1.c b/keyboards/jones/v1/v1.c index bb13049a67..7ad641e41f 100644 --- a/keyboards/jones/v1/v1.c +++ b/keyboards/jones/v1/v1.c @@ -14,15 +14,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "quantum.h" #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) -const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT( - 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 -); +const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = { + { 0, 37, 33, 0, 27, 31, 30, 35, 25, 0}, + {17, 0, 21, 0, 15, 19, 18, 23, 13, 0}, + {17, 0, 0, 21, 15, 19, 18, 23, 13, 0}, + { 4, 12, 8, 0, 2, 6, 5, 10, 0, 0}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {28, 36, 32, 34, 26, 0, 29, 0, 0, 24}, + {16, 24, 20, 22, 14, 0, 0, 0, 0, 12}, + {16, 24, 20, 22, 14, 0, 0, 0, 0, 12}, + { 3, 11, 7, 9, 1, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} +}; #endif |