diff options
| author |  Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
| commit | f6d1ce7863893e6dd0233c57f04b262f6808d78a (patch) | |
| tree | 723db2fdaff2ccf810a328511d7f54cbc568d326 /quantum/quantum.h | |
| parent | f566125c6e29e3db62552c089428591d460ce583 (diff) | |
| parent | 44e098ef2d6c571cee9e5fa1b007b40f6289852f (diff) | |
| download | qmk_firmware-f6d1ce7863893e6dd0233c57f04b262f6808d78a.tar.gz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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 @@ #include <avr/pgmspace.h> #include "matrix.h" -#include "keymap_common.h" +#include "keymap.h" #ifdef BACKLIGHT_ENABLE #include "backlight.h" #endif @@ -25,8 +25,8 @@ #include <stddef.h> #include <avr/io.h> #include <util/delay.h> - -#define SEND_STRING(str) send_string(PSTR(str)) +#include "bootloader.h" +#include "timer.h" extern uint32_t default_layer_state; @@ -62,15 +62,20 @@ extern uint32_t default_layer_state; #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #endif +#define SEND_STRING(str) send_string(PSTR(str)) void send_string(const char *str); +// For tri-layer +void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); +#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer))) +#define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer))) + 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); void music_on(void); |