From d089af87030821e7bdd12c7187c5a583a8bf813d Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Sun, 16 Oct 2022 04:31:51 +0200 Subject: [PATCH] Mark the moonlander keyboard default music map as weak (#18715) This allows user keymaps to set a different music map. --- keyboards/moonlander/moonlander.c | 1 + keyboards/moonlander/moonlander.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 13575393824..80e1d047722 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -358,6 +358,7 @@ void keyboard_post_init_kb(void) { #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) // clang-format off +__attribute__ ((weak)) const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander( 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h index 90ce84b3e34..19618a9e2a4 100644 --- a/keyboards/moonlander/moonlander.h +++ b/keyboards/moonlander/moonlander.h @@ -55,9 +55,9 @@ extern bool mcp23018_leds[]; { k60, k61, k62, k63, k64, k65, k66 }, \ { k70, k71, k72, k73, k74, k75, k76 }, \ { k80, k81, k82, k83, k84, k85, k86 }, \ - { KC_NO,k91, k92, k93, k94, k95, k96 }, \ + { KC_NO, k91, k92, k93, k94, k95, k96 }, \ { KC_NO, KC_NO, ka2, ka3, ka4, ka5, ka6 }, \ - { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \ + { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \ } // clang-format on @@ -83,4 +83,4 @@ typedef union { extern keyboard_config_t keyboard_config; -bool is_transport_connected(void); \ No newline at end of file +bool is_transport_connected(void);