Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

fix default layer songs

Browse source
This commit is contained in:
Jack Humbert 2017-08-10 16:52:24 -04:00
parent 70407a1b67
commit 6895c4510e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chibios

@ -1 +1 @@
Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7 Subproject commit d34e8eb83101a95f98892bf68605fe545821f320

9
quantum/quantum.c
View file

@ -40,13 +40,12 @@ extern backlight_config_t backlight_config;
#ifndef AG_SWAP_SONG #ifndef AG_SWAP_SONG
#define AG_SWAP_SONG SONG(AG_SWAP_SOUND) #define AG_SWAP_SONG SONG(AG_SWAP_SOUND)
#endif #endif
#ifndef DEFAULT_LAYER_SONGS
#define DEFAULT_LAYER_SONGS { }
#endif
float goodbye_song[][2] = GOODBYE_SONG; float goodbye_song[][2] = GOODBYE_SONG;
float ag_norm_song[][2] = AG_NORM_SONG; float ag_norm_song[][2] = AG_NORM_SONG;
float ag_swap_song[][2] = AG_SWAP_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 #endif
static void do_code16 (uint16_t code, void (*f) (uint8_t)) { 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) { 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]); PLAY_SONG(default_layer_songs[default_layer]);
#endif #endif
eeconfig_update_default_layer(1U<<default_layer); eeconfig_update_default_layer(1U<<default_layer);