diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /quantum/quantum.h | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index c8dfdeca75..315fa25568 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -42,7 +42,6 @@ #include "bootmagic.h" #include "timer.h" #include "sync_timer.h" -#include "config_common.h" #include "gpio.h" #include "atomic_util.h" #include "led.h" @@ -75,6 +74,7 @@ extern layer_state_t layer_state; #ifdef AUDIO_ENABLE # include "audio.h" # include "process_audio.h" +# include "song_list.h" # ifdef AUDIO_CLICKY # include "process_clicky.h" # endif @@ -93,6 +93,7 @@ extern layer_state_t layer_state; #endif #ifdef LEADER_ENABLE +# include "leader.h" # include "process_leader.h" #endif @@ -240,9 +241,10 @@ extern layer_state_t layer_state; # include "process_autocorrect.h" #endif -// For tri-layer -void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); -layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3); +#ifdef TRI_LAYER_ENABLE +# include "tri_layer.h" +# include "process_tri_layer.h" +#endif void set_single_persistent_default_layer(uint8_t default_layer); |