diff options
| author | Ilya Zhuravlev <whatever@xyz.is> | 2023-03-18 17:51:58 -0600 |
|---|---|---|
| committer | Ilya Zhuravlev <whatever@xyz.is> | 2023-03-18 17:51:58 -0600 |
| commit | 06a2fdcc9c286a04cd09ea6f358655d65e876ca1 (patch) | |
| tree | 4071d7fa12d3d1006b3c112be0eccf6e83f0d369 /quantum/quantum.h | |
| parent | 1a0527b66e191eece367bf73eacd393d83b859fc (diff) | |
| parent | a5e7390419a23c6db9cb62810f8ff1645d20b6a3 (diff) | |
Merge remote-tracking branch 'qmk/master' into merge-2023-03-12
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 1fdf9aedd7..50920a2d27 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 @@ -109,6 +110,7 @@ extern layer_state_t layer_state; #endif #ifdef UNICODE_COMMON_ENABLE +# include "unicode.h" # include "process_unicode_common.h" #endif @@ -120,10 +122,6 @@ extern layer_state_t layer_state; # include "process_tap_dance.h" #endif -#ifdef PRINTING_ENABLE -# include "process_printer.h" -#endif - #ifdef AUTO_SHIFT_ENABLE # include "process_auto_shift.h" #endif @@ -210,6 +208,10 @@ extern layer_state_t layer_state; # include "joystick.h" #endif +#ifdef DIGITIZER_ENABLE +# include "digitizer.h" +#endif + #ifdef VIA_ENABLE # include "via.h" #endif @@ -235,9 +237,14 @@ extern layer_state_t layer_state; # include "process_caps_word.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 AUTOCORRECT_ENABLE +# include "process_autocorrect.h" +#endif + +#ifdef TRI_LAYER_ENABLE +# include "tri_layer.h" +# include "process_tri_layer.h" +#endif void set_single_persistent_default_layer(uint8_t default_layer); |