diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-20 23:54:09 -0800 |
| commit | bf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch) | |
| tree | 59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /quantum/quantum.h | |
| parent | ca1ec7b121c973fae614e69093f40ee9ba25e629 (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 10 |
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); |