diff options
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 69277b9e3..e15003805 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <avr/pgmspace.h> | 4 | #include <avr/pgmspace.h> |
| 5 | #include "matrix.h" | 5 | #include "matrix.h" |
| 6 | #include "keymap_common.h" | 6 | #include "keymap.h" |
| 7 | #ifdef BACKLIGHT_ENABLE | 7 | #ifdef BACKLIGHT_ENABLE |
| 8 | #include "backlight.h" | 8 | #include "backlight.h" |
| 9 | #endif | 9 | #endif |
| @@ -25,8 +25,8 @@ | |||
| 25 | #include <stddef.h> | 25 | #include <stddef.h> |
| 26 | #include <avr/io.h> | 26 | #include <avr/io.h> |
| 27 | #include <util/delay.h> | 27 | #include <util/delay.h> |
| 28 | 28 | #include "bootloader.h" | |
| 29 | #define SEND_STRING(str) send_string(PSTR(str)) | 29 | #include "timer.h" |
| 30 | 30 | ||
| 31 | extern uint32_t default_layer_state; | 31 | extern uint32_t default_layer_state; |
| 32 | 32 | ||
| @@ -62,15 +62,20 @@ extern uint32_t default_layer_state; | |||
| 62 | #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) | 62 | #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) |
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | #define SEND_STRING(str) send_string(PSTR(str)) | ||
| 65 | void send_string(const char *str); | 66 | void send_string(const char *str); |
| 66 | 67 | ||
| 68 | // For tri-layer | ||
| 69 | void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); | ||
| 70 | #define IS_LAYER_ON(layer) (layer_state & (1UL << (layer))) | ||
| 71 | #define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer))) | ||
| 72 | |||
| 67 | void matrix_init_kb(void); | 73 | void matrix_init_kb(void); |
| 68 | void matrix_scan_kb(void); | 74 | void matrix_scan_kb(void); |
| 69 | bool process_action_kb(keyrecord_t *record); | 75 | bool process_action_kb(keyrecord_t *record); |
| 70 | bool process_record_kb(uint16_t keycode, keyrecord_t *record); | 76 | bool process_record_kb(uint16_t keycode, keyrecord_t *record); |
| 71 | bool process_record_user(uint16_t keycode, keyrecord_t *record); | 77 | bool process_record_user(uint16_t keycode, keyrecord_t *record); |
| 72 | 78 | ||
| 73 | |||
| 74 | bool is_music_on(void); | 79 | bool is_music_on(void); |
| 75 | void music_toggle(void); | 80 | void music_toggle(void); |
| 76 | void music_on(void); | 81 | void music_on(void); |
