Merge remote-tracking branch 'refs/remotes/qmk/master'

[qmk_firmware.git] / quantum / quantum.h

diff --git a/quantum/quantum.h b/quantum/quantum.h
index e6adf974aba58aa006a876c58d00f2d19d6099c7..1f1bb0afd29d9d2278796f763f3e6a270614c8e6 100644 (file)
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -15,7 +15,6 @@
 #ifdef RGBLIGHT_ENABLE
   #include "rgblight.h"
 #endif
-
 #include "action_layer.h"
 #include "eeconfig.h"
 #include <stddef.h>
@@ -36,11 +35,16 @@ extern uint32_t default_layer_state;
 
 #ifdef MIDI_ENABLE
        #include <lufa.h>
+#ifdef MIDI_ADVANCED
        #include "process_midi.h"
 #endif
+#endif // MIDI_ENABLE
 
 #ifdef AUDIO_ENABLE
-       #include "audio.h"
+       #include "process_audio.h"
+#endif
+
+#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
        #include "process_music.h"
 #endif
 
@@ -57,12 +61,24 @@ extern uint32_t default_layer_state;
        #include "process_unicode.h"
 #endif
 
+#ifdef UCIS_ENABLE
+       #include "process_ucis.h"
+#endif
+
+#ifdef UNICODEMAP_ENABLE
+       #include "process_unicodemap.h"
+#endif
+
 #include "process_tap_dance.h"
 
 #ifdef PRINTING_ENABLE
        #include "process_printer.h"
 #endif
 
+#ifdef COMBO_ENABLE
+       #include "process_combo.h"
+#endif
+
 #define SEND_STRING(str) send_string(PSTR(str))
 void send_string(const char *str);
 
@@ -92,6 +108,7 @@ void unregister_code16 (uint16_t code);
 
 #ifdef BACKLIGHT_ENABLE
 void backlight_init_ports(void);
+void backlight_task(void);
 
 #ifdef BACKLIGHT_BREATHING
 void breathing_enable(void);
@@ -114,7 +131,7 @@ void send_dword(uint32_t number);
 void send_word(uint16_t number);
 void send_byte(uint8_t number);
 void send_nibble(uint8_t number);
-
+uint16_t hex_to_keycode(uint8_t hex);
 
 void led_set_user(uint8_t usb_led);
 void led_set_kb(uint8_t usb_led);