summaryrefslogtreecommitdiff
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authormilestogo2017-03-08 15:51:30 -0800
committermilestogo2017-03-08 15:51:30 -0800
commitfeb858c5a9afff06ff54ec401359f8bfd5abdd73 (patch)
treecf61bfad47984bb4987540404f0ec349defbff1a /quantum/quantum.h
parentb5bfb5104b63766ab9a54509302a3f4b0b1d7b16 (diff)
parentffb04bad660ba7c487e4b923e4391b6c7dd5eddd (diff)
Merge branch 'master' into sculpt2
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);