diff options
author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
---|---|---|
committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
commit | dc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee (patch) | |
tree | 44f432118882f9176ef6d901dc3d389d28737254 /quantum/quantum.h | |
parent | d649ab34334ff568448c47a04fcf40f1aa960135 (diff) | |
parent | 25d4772754186b8ab6ef86c28049da67a460f123 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r-- | quantum/quantum.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 69a0d8126a..69277b9e32 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -1,6 +1,7 @@ #ifndef QUANTUM_H #define QUANTUM_H +#include <avr/pgmspace.h> #include "matrix.h" #include "keymap_common.h" #ifdef BACKLIGHT_ENABLE @@ -23,6 +24,9 @@ #include "eeconfig.h" #include <stddef.h> #include <avr/io.h> +#include <util/delay.h> + +#define SEND_STRING(str) send_string(PSTR(str)) extern uint32_t default_layer_state; @@ -58,9 +62,14 @@ extern uint32_t default_layer_state; #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #endif +void send_string(const char *str); + void matrix_init_kb(void); void matrix_scan_kb(void); bool process_action_kb(keyrecord_t *record); +bool process_record_kb(uint16_t keycode, keyrecord_t *record); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + bool is_music_on(void); void music_toggle(void); @@ -73,4 +82,4 @@ void audio_on_user(void); void music_on_user(void); void music_scale_user(void); -#endif
\ No newline at end of file +#endif |