summaryrefslogtreecommitdiff
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorGabriel Young2017-02-19 14:34:58 -0800
committerGabriel Young2017-02-19 14:34:58 -0800
commit40a8a88e72c185eec629973580b72dfaaf71b116 (patch)
tree583330bc173017de5e1d4a10ff7100ebc0f1a34b /quantum/quantum.h
parent1e97f77278b757d740a800ae228c6202de0679b4 (diff)
parent49e72632d2200fc3bf71d5ced2aa43058da3b2e0 (diff)
Merge branch 'qmk/master'
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r--quantum/quantum.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 18f072189..580d51202 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -56,6 +56,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
@@ -117,7 +125,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);