summaryrefslogtreecommitdiffstats
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>2017-02-16 23:53:47 +0700
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>2017-02-16 23:53:47 +0700
commit21f4944426903dfd1c3fda7c1da452ca969dd820 (patch)
tree375379cca5a68d53cc187060c6e6770bfcfd8c78 /quantum/quantum.h
parent96a8e2d5f52c4f9d4c774f820139be726894e70d (diff)
parente34c3936b7db8f9d39f1eb0d0f4734fc37d7ebe3 (diff)
Merge branch 'master' into promethium
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 18f072189d..580d51202a 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);