diff options
author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
---|---|---|
committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /quantum/quantum.h | |
parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) |
Merge remote-tracking branch 'qmk/master'
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r-- | quantum/quantum.h | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 7ebfb24e30..580d51202a 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,6 @@ #ifdef RGBLIGHT_ENABLE #include "rgblight.h" #endif - #include "action_layer.h" #include "eeconfig.h" #include <stddef.h> @@ -25,6 +24,7 @@ #include "led.h" #include "action_util.h" #include <stdlib.h> +#include "print.h" extern uint32_t default_layer_state; @@ -56,8 +56,24 @@ 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 + #include "process_printer.h" +#endif + +#ifdef COMBO_ENABLE + #include "process_combo.h" +#endif + #define SEND_STRING(str) send_string(PSTR(str)) void send_string(const char *str); @@ -82,6 +98,9 @@ void reset_keyboard(void); void startup_user(void); void shutdown_user(void); +void register_code16 (uint16_t code); +void unregister_code16 (uint16_t code); + #ifdef BACKLIGHT_ENABLE void backlight_init_ports(void); @@ -102,8 +121,15 @@ void breathing_speed_dec(uint8_t value); #endif #endif +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); +void api_send_unicode(uint32_t unicode); + #endif |