Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

[qmk_firmware.git] / quantum / quantum.h

diff --git a/quantum/quantum.h b/quantum/quantum.h
index 3ce940895d348a93a87556def4c21f31b989e379..e15003805b646976a882f6fe6121b0f2b03dca72 100644 (file)
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -1,8 +1,9 @@
 #ifndef QUANTUM_H
 #define QUANTUM_H
 
+#include <avr/pgmspace.h>
 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
     #include "backlight.h"
 #endif
@@ -24,6 +25,8 @@
 #include <stddef.h>
 #include <avr/io.h>
 #include <util/delay.h>
+#include "bootloader.h"
+#include "timer.h"
 
 extern uint32_t default_layer_state;
 
@@ -59,13 +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);
@@ -77,4 +87,4 @@ void audio_on_user(void);
 void music_on_user(void);
 void music_scale_user(void);
 
-#endif
\ No newline at end of file
+#endif