diff options
author | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
commit | 4e369d405af6bba1adce6337b2e1b1ea1788566c (patch) | |
tree | b0f020feff1809e37c9e7795d344929ff0bb290a /quantum/quantum.h | |
parent | 4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff) | |
parent | dd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff) | |
download | qmk_firmware-0.24.0.tar.gz qmk_firmware-0.24.0.zip |
Merge branch 'develop'0.24.0
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r-- | quantum/quantum.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 996e93a12f..5446ab1ad7 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -42,7 +42,6 @@ #include "action_layer.h" #include "eeconfig.h" #include "bootloader.h" -#include "bootmagic.h" #include "timer.h" #include "sync_timer.h" #include "gpio.h" @@ -59,6 +58,10 @@ #include <stdio.h> #include <string.h> +#ifdef BOOTMAGIC_ENABLE +# include "bootmagic.h" +#endif + #ifdef DEFERRED_EXEC_ENABLE # include "deferred_exec.h" #endif @@ -233,6 +236,10 @@ extern layer_state_t layer_state; # include "process_repeat_key.h" #endif +#ifdef OS_DETECTION_ENABLE +# include "os_detection.h" +#endif + void set_single_persistent_default_layer(uint8_t default_layer); #define IS_LAYER_ON(layer) layer_state_is(layer) |