summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-08-10 22:52:24 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-10 22:52:35 +0200
commit6895c4510e1e683bf2cfa4a78dbde57a2a8554e4 (patch)
tree3220e0131fb20e5f8637a3d8aefd6fcbf4c0dbec
parent70407a1b6702d1001f8b92e486f215c1800ce82d (diff)
downloadqmk_firmware-6895c4510e1e683bf2cfa4a78dbde57a2a8554e4.tar.gz
qmk_firmware-6895c4510e1e683bf2cfa4a78dbde57a2a8554e4.tar.xz
fix default layer songs
m---------lib/chibios0
-rw-r--r--quantum/quantum.c9
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/chibios b/lib/chibios
-Subproject 8fce03b3a75c743e5d5c40b9d59c1637c59d22a
+Subproject d34e8eb83101a95f98892bf68605fe545821f32
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 0243a7e01..7a632d709 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -40,13 +40,12 @@ extern backlight_config_t backlight_config;
#ifndef AG_SWAP_SONG
#define AG_SWAP_SONG SONG(AG_SWAP_SOUND)
#endif
- #ifndef DEFAULT_LAYER_SONGS
- #define DEFAULT_LAYER_SONGS { }
- #endif
float goodbye_song[][2] = GOODBYE_SONG;
float ag_norm_song[][2] = AG_NORM_SONG;
float ag_swap_song[][2] = AG_SWAP_SONG;
- float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
+ #ifdef DEFAULT_LAYER_SONGS
+ float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
+ #endif
#endif
static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
@@ -560,7 +559,7 @@ void send_string_with_delay(const char *str, uint8_t interval) {
}
void set_single_persistent_default_layer(uint8_t default_layer) {
- #ifdef AUDIO_ENABLE
+ #if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
PLAY_SONG(default_layer_songs[default_layer]);
#endif
eeconfig_update_default_layer(1U<<default_layer);