From 1249f74b31863bc0118057884abae10de698e4a5 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 3 Nov 2022 23:42:58 +0000 Subject: [PATCH] Reduce includes for caps_word header (#18948) --- quantum/caps_word.c | 6 ++++++ quantum/caps_word.h | 25 +++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/quantum/caps_word.c b/quantum/caps_word.c index 5b83659f281..66fd0e8afbd 100644 --- a/quantum/caps_word.c +++ b/quantum/caps_word.c @@ -12,7 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include "caps_word.h" +#include "timer.h" +#include "action.h" +#include "action_util.h" /** @brief True when Caps Word is active. */ static bool caps_word_active = false; @@ -36,6 +40,8 @@ void caps_word_task(void) { void caps_word_reset_idle_timer(void) { idle_timer = timer_read() + CAPS_WORD_IDLE_TIMEOUT; } +#else +void caps_word_task(void) {} #endif // CAPS_WORD_IDLE_TIMEOUT > 0 void caps_word_on(void) { diff --git a/quantum/caps_word.h b/quantum/caps_word.h index b83f73371ef..078d29ead0a 100644 --- a/quantum/caps_word.h +++ b/quantum/caps_word.h @@ -14,26 +14,31 @@ #pragma once -#include "quantum.h" +#include #ifndef CAPS_WORD_IDLE_TIMEOUT # define CAPS_WORD_IDLE_TIMEOUT 5000 // Default timeout of 5 seconds. -#endif // CAPS_WORD_IDLE_TIMEOUT +#endif -#if CAPS_WORD_IDLE_TIMEOUT > 0 /** @brief Matrix scan task for Caps Word feature */ void caps_word_task(void); +#if CAPS_WORD_IDLE_TIMEOUT > 0 /** @brief Resets timer for Caps Word idle timeout. */ void caps_word_reset_idle_timer(void); -#else -static inline void caps_word_task(void) {} -#endif // CAPS_WORD_IDLE_TIMEOUT > 0 +#endif -void caps_word_on(void); /**< Activates Caps Word. */ -void caps_word_off(void); /**< Deactivates Caps Word. */ -void caps_word_toggle(void); /**< Toggles Caps Word. */ -bool is_caps_word_on(void); /**< Gets whether currently active. */ +/** @brief Activates Caps Word. */ +void caps_word_on(void); + +/** @brief Deactivates Caps Word. */ +void caps_word_off(void); + +/** @brief Toggles Caps Word. */ +void caps_word_toggle(void); + +/** @brief Gets whether currently active. */ +bool is_caps_word_on(void); /** * @brief Caps Word set callback.