Some more tweaks to make everything look nice

[qmk_firmware.git] / quantum / quantum.h

diff --git a/quantum/quantum.h b/quantum/quantum.h
index 534819c818bf9df16b289d197572eded859d4c3f..195f578de9dda14c067c6605f86ece23aa96f103 100644 (file)
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -49,7 +49,6 @@ extern uint32_t default_layer_state;
 #endif
 
 #ifdef MIDI_ENABLE
-       #include <lufa.h>
 #ifdef MIDI_ADVANCED
        #include "process_midi.h"
 #endif
@@ -58,6 +57,9 @@ extern uint32_t default_layer_state;
 #ifdef AUDIO_ENABLE
        #include "audio.h"
        #include "process_audio.h"
+  #ifdef AUDIO_CLICKY
+    #include "process_clicky.h"
+  #endif // AUDIO_CLICKY
 #endif
 
 #ifdef STENO_ENABLE
@@ -123,7 +125,11 @@ extern uint32_t default_layer_state;
 
 #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];
@@ -136,6 +142,7 @@ 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);
 
@@ -172,12 +179,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