mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-10-01 22:40:11 +02:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
+6
-2
@@ -477,14 +477,18 @@ bool process_record_quantum(keyrecord_t *record) {
|
||||
return process_action_kb(record);
|
||||
}
|
||||
|
||||
void set_single_persistent_default_layer(uint8_t default_layer) {
|
||||
void set_single_default_layer(uint8_t default_layer) {
|
||||
#if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
|
||||
PLAY_SONG(default_layer_songs[default_layer]);
|
||||
#endif
|
||||
eeconfig_update_default_layer((layer_state_t)1 << default_layer);
|
||||
default_layer_set((layer_state_t)1 << default_layer);
|
||||
}
|
||||
|
||||
void set_single_persistent_default_layer(uint8_t default_layer) {
|
||||
eeconfig_update_default_layer((layer_state_t)1 << default_layer);
|
||||
set_single_default_layer(default_layer);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Override these functions in your keymap file to play different tunes on
|
||||
// different events such as startup and bootloader jump
|
||||
|
||||
@@ -244,6 +244,7 @@ extern layer_state_t layer_state;
|
||||
# include "os_detection.h"
|
||||
#endif
|
||||
|
||||
void set_single_default_layer(uint8_t default_layer);
|
||||
void set_single_persistent_default_layer(uint8_t default_layer);
|
||||
|
||||
#define IS_LAYER_ON(layer) layer_state_is(layer)
|
||||
|
||||
Reference in New Issue
Block a user