diff options
author | Jack Humbert <[email protected]> | 2017-02-19 00:04:14 -0500 |
---|---|---|
committer | Jack Humbert <[email protected]> | 2017-02-19 00:04:14 -0500 |
commit | c2239e6b96fdea11d449d220db3d8bca40b38bde (patch) | |
tree | 0c2fe7df345868b56dfb3478ceb1b54a1e8eec29 /quantum/quantum.h | |
parent | 8d0fdf10086a0e8a1615f0521fccf1f5a2806497 (diff) | |
parent | 49e72632d2200fc3bf71d5ced2aa43058da3b2e0 (diff) | |
download | qmk_firmware-c2239e6b96fdea11d449d220db3d8bca40b38bde.tar.gz qmk_firmware-c2239e6b96fdea11d449d220db3d8bca40b38bde.zip |
merging
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 2470d8c7da..259bac3697 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 @@ -118,7 +126,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); |