X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fquantum.h;h=7cf16d81e68bcd1e5b96af34c542e79db81b65c3;hb=92f67719cc7faf6f2708d848ae3d1c6ee2b781cb;hp=453cb43f88af863e02c12ca87072b2cbee586f8b;hpb=9609a47c3e2050f252378386c0ce2b37b4c2aed8;p=qmk_firmware.git

diff --git a/quantum/quantum.h b/quantum/quantum.h
index 453cb43f8..7cf16d81e 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -27,9 +27,27 @@
 #ifdef BACKLIGHT_ENABLE
     #include "backlight.h"
 #endif
+#if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE)
+    #include "rgb.h"
+#endif
 #ifdef RGBLIGHT_ENABLE
   #include "rgblight.h"
+#else
+  #ifdef RGB_MATRIX_ENABLE
+    /* dummy define RGBLIGHT_MODE_xxxx */
+    #define RGBLIGHT_H_DUMMY_DEFINE
+    #include "rgblight.h"
+  #endif
+#endif
+
+#ifdef SPLIT_KEYBOARD
+    #include "split_flags.h"
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+    #include "rgb_matrix.h"
 #endif
+
 #include "action_layer.h"
 #include "eeconfig.h"
 #include <stddef.h>
@@ -40,73 +58,109 @@
 #include "action_util.h"
 #include <stdlib.h>
 #include "print.h"
-
+#include "send_string_keycodes.h"
+#include "suspend.h"
 
 extern uint32_t default_layer_state;
 
 #ifndef NO_ACTION_LAYER
-	extern uint32_t layer_state;
+    extern uint32_t layer_state;
 #endif
 
 #ifdef MIDI_ENABLE
-	#include <lufa.h>
 #ifdef MIDI_ADVANCED
-	#include "process_midi.h"
+    #include "process_midi.h"
 #endif
 #endif // MIDI_ENABLE
 
 #ifdef AUDIO_ENABLE
-	#include "audio.h"
- 	#include "process_audio.h"
+    #include "audio.h"
+    #include "process_audio.h"
+  #ifdef AUDIO_CLICKY
+    #include "process_clicky.h"
+  #endif // AUDIO_CLICKY
 #endif
 
 #ifdef STENO_ENABLE
-	#include "process_steno.h"
+    #include "process_steno.h"
 #endif
 
 #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
-	#include "process_music.h"
+    #include "process_music.h"
 #endif
 
-#ifndef DISABLE_LEADER
-	#include "process_leader.h"
-#endif
-
-#define DISABLE_CHORDING
-#ifndef DISABLE_CHORDING
-	#include "process_chording.h"
+#ifdef LEADER_ENABLE
+    #include "process_leader.h"
 #endif
 
 #ifdef UNICODE_ENABLE
-	#include "process_unicode.h"
+    #include "process_unicode.h"
 #endif
 
 #ifdef UCIS_ENABLE
-	#include "process_ucis.h"
+    #include "process_ucis.h"
 #endif
 
 #ifdef UNICODEMAP_ENABLE
-	#include "process_unicodemap.h"
+    #include "process_unicodemap.h"
 #endif
 
 #include "process_tap_dance.h"
 
 #ifdef PRINTING_ENABLE
-	#include "process_printer.h"
+    #include "process_printer.h"
+#endif
+
+#ifdef AUTO_SHIFT_ENABLE
+    #include "process_auto_shift.h"
 #endif
 
 #ifdef COMBO_ENABLE
-	#include "process_combo.h"
+    #include "process_combo.h"
+#endif
+
+#ifdef KEY_LOCK_ENABLE
+    #include "process_key_lock.h"
+#endif
+
+#ifdef TERMINAL_ENABLE
+    #include "process_terminal.h"
+#else
+    #include "process_terminal_nop.h"
 #endif
 
-#define SEND_STRING(str) send_string(PSTR(str))
+#ifdef HD44780_ENABLE
+    #include "hd44780.h"
+#endif
+
+#define STRINGIZE(z) #z
+#define ADD_SLASH_X(y) STRINGIZE(\x ## y)
+#define SYMBOL_STR(x) ADD_SLASH_X(x)
+
+#define SS_TAP(keycode) "\1" SYMBOL_STR(keycode)
+#define SS_DOWN(keycode) "\2" SYMBOL_STR(keycode)
+#define SS_UP(keycode) "\3" SYMBOL_STR(keycode)
+
+#define SS_LCTRL(string) SS_DOWN(X_LCTRL) string SS_UP(X_LCTRL)
+#define SS_LGUI(string) SS_DOWN(X_LGUI) string SS_UP(X_LGUI)
+#define SS_LCMD(string) SS_LGUI(string)
+#define SS_LWIN(string) SS_LGUI(string)
+#define SS_LALT(string) SS_DOWN(X_LALT) string SS_UP(X_LALT)
+#define SS_LSFT(string) SS_DOWN(X_LSHIFT) string SS_UP(X_LSHIFT)
+#define SS_RALT(string) SS_DOWN(X_RALT) string SS_UP(X_RALT)
+
+#define SEND_STRING(str) send_string_P(PSTR(str))
 extern const bool ascii_to_shift_lut[0x80];
 extern const uint8_t ascii_to_keycode_lut[0x80];
 void send_string(const char *str);
 void send_string_with_delay(const char *str, uint8_t interval);
+void send_string_P(const char *str);
+void send_string_with_delay_P(const char *str, uint8_t interval);
+void send_char(char ascii_code);
 
 // For tri-layer
 void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
+uint32_t update_tri_layer_state(uint32_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
 
 void set_single_persistent_default_layer(uint8_t default_layer);
 
@@ -143,12 +197,11 @@ void breathing_self_disable(void);
 void breathing_toggle(void);
 bool is_breathing(void);
 
-void breathing_defaults(void);
 void breathing_intensity_default(void);
-void breathing_speed_default(void);
-void breathing_speed_set(uint8_t value);
-void breathing_speed_inc(uint8_t value);
-void breathing_speed_dec(uint8_t value);
+void breathing_period_default(void);
+void breathing_period_set(uint8_t value);
+void breathing_period_inc(void);
+void breathing_period_dec(void);
 #endif
 
 #endif