Merge branch 'master' into ps2avrGB

[qmk_firmware.git] / quantum / quantum.h

diff --git a/quantum/quantum.h b/quantum/quantum.h
index 2470d8c7da57bea7f5041530dc7a450af85ca27c..2bf18d095eaef32c42dc4e7b656dd9a7ea65fb32 100644 (file)
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -1,3 +1,18 @@
+/* Copyright 2016-2017 Erez Zukerman, Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #ifndef QUANTUM_H
 #define QUANTUM_H
 
@@ -35,11 +50,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
 
@@ -56,6 +76,14 @@ 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
@@ -118,7 +146,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);