diff options
author | skullY <skullydazed@gmail.com> | 2019-08-30 11:19:03 -0700 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
commit | b624f32f944acdc59dcb130674c09090c5c404cb (patch) | |
tree | bc13adbba137d122d9a2c2fb2fafcbb08ac10e25 /tmk_core/common/action_util.c | |
parent | 61af76a10d00aba185b8338604171de490a13e3b (diff) | |
download | firmware-b624f32f944acdc59dcb130674c09090c5c404cb.tar.gz firmware-b624f32f944acdc59dcb130674c09090c5c404cb.tar.bz2 firmware-b624f32f944acdc59dcb130674c09090c5c404cb.zip |
clang-format changes
Diffstat (limited to 'tmk_core/common/action_util.c')
-rw-r--r-- | tmk_core/common/action_util.c | 159 |
1 files changed, 64 insertions, 95 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index 365ed6a1d..335aa36e6 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -24,23 +24,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. extern keymap_config_t keymap_config; - -static uint8_t real_mods = 0; -static uint8_t weak_mods = 0; +static uint8_t real_mods = 0; +static uint8_t weak_mods = 0; static uint8_t macro_mods = 0; #ifdef USB_6KRO_ENABLE -#define RO_ADD(a, b) ((a + b) % KEYBOARD_REPORT_KEYS) -#define RO_SUB(a, b) ((a - b + KEYBOARD_REPORT_KEYS) % KEYBOARD_REPORT_KEYS) -#define RO_INC(a) RO_ADD(a, 1) -#define RO_DEC(a) RO_SUB(a, 1) -static int8_t cb_head = 0; -static int8_t cb_tail = 0; +# define RO_ADD(a, b) ((a + b) % KEYBOARD_REPORT_KEYS) +# define RO_SUB(a, b) ((a - b + KEYBOARD_REPORT_KEYS) % KEYBOARD_REPORT_KEYS) +# define RO_INC(a) RO_ADD(a, 1) +# define RO_DEC(a) RO_SUB(a, 1) +static int8_t cb_head = 0; +static int8_t cb_tail = 0; static int8_t cb_count = 0; #endif // TODO: pointer variable is not needed -//report_keyboard_t keyboard_report = {}; +// report_keyboard_t keyboard_report = {}; report_keyboard_t *keyboard_report = &(report_keyboard_t){}; extern inline void add_key(uint8_t key); @@ -48,10 +47,10 @@ extern inline void del_key(uint8_t key); extern inline void clear_keys(void); #ifndef NO_ACTION_ONESHOT -static uint8_t oneshot_mods = 0; +static uint8_t oneshot_mods = 0; static uint8_t oneshot_locked_mods = 0; -uint8_t get_oneshot_locked_mods(void) { return oneshot_locked_mods; } -void set_oneshot_locked_mods(uint8_t mods) { +uint8_t get_oneshot_locked_mods(void) { return oneshot_locked_mods; } +void set_oneshot_locked_mods(uint8_t mods) { if (mods != oneshot_locked_mods) { oneshot_locked_mods = mods; oneshot_locked_mods_changed_kb(oneshot_locked_mods); @@ -63,16 +62,12 @@ void clear_oneshot_locked_mods(void) { oneshot_locked_mods_changed_kb(oneshot_locked_mods); } } -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) static uint16_t oneshot_time = 0; -bool has_oneshot_mods_timed_out(void) { - return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; -} -#else -bool has_oneshot_mods_timed_out(void) { - return false; -} -#endif +bool has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; } +# else +bool has_oneshot_mods_timed_out(void) { return false; } +# endif #endif /* oneshot layer */ @@ -88,44 +83,39 @@ static int8_t oneshot_layer_data = 0; inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; } inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; } -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) static uint16_t oneshot_layer_time = 0; -inline bool has_oneshot_layer_timed_out() { - return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && - !(get_oneshot_layer_state() & ONESHOT_TOGGLED); -} -#endif +inline bool has_oneshot_layer_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED); } +# endif -/** \brief Set oneshot layer +/** \brief Set oneshot layer * * FIXME: needs doc */ -void set_oneshot_layer(uint8_t layer, uint8_t state) -{ +void set_oneshot_layer(uint8_t layer, uint8_t state) { oneshot_layer_data = layer << 3 | state; layer_on(layer); -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) oneshot_layer_time = timer_read(); -#endif +# endif oneshot_layer_changed_kb(get_oneshot_layer()); } -/** \brief Reset oneshot layer +/** \brief Reset oneshot layer * * FIXME: needs doc */ void reset_oneshot_layer(void) { oneshot_layer_data = 0; -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) oneshot_layer_time = 0; -#endif +# endif oneshot_layer_changed_kb(get_oneshot_layer()); } -/** \brief Clear oneshot layer +/** \brief Clear oneshot layer * * FIXME: needs doc */ -void clear_oneshot_layer_state(oneshot_fullfillment_t state) -{ +void clear_oneshot_layer_state(oneshot_fullfillment_t state) { uint8_t start_state = oneshot_layer_data; oneshot_layer_data &= ~state; if (!get_oneshot_layer_state() && start_state != oneshot_layer_data) { @@ -137,10 +127,7 @@ void clear_oneshot_layer_state(oneshot_fullfillment_t state) * * FIXME: needs doc */ -bool is_oneshot_layer_active(void) -{ - return get_oneshot_layer_state(); -} +bool is_oneshot_layer_active(void) { return get_oneshot_layer_state(); } #endif /** \brief Send keyboard report @@ -148,17 +135,17 @@ bool is_oneshot_layer_active(void) * FIXME: needs doc */ void send_keyboard_report(void) { - keyboard_report->mods = real_mods; + keyboard_report->mods = real_mods; keyboard_report->mods |= weak_mods; keyboard_report->mods |= macro_mods; #ifndef NO_ACTION_ONESHOT if (oneshot_mods) { -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) if (has_oneshot_mods_timed_out()) { dprintf("Oneshot: timeout\n"); clear_oneshot_mods(); } -#endif +# endif keyboard_report->mods |= oneshot_mods; if (has_anykey(keyboard_report)) { clear_oneshot_mods(); @@ -254,90 +241,72 @@ void clear_macro_mods(void) { macro_mods = 0; } * FIXME: needs doc */ void set_oneshot_mods(uint8_t mods) { - if (oneshot_mods != mods) { -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) - oneshot_time = timer_read(); -#endif - oneshot_mods = mods; - oneshot_mods_changed_kb(mods); - } + if (oneshot_mods != mods) { +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) + oneshot_time = timer_read(); +# endif + oneshot_mods = mods; + oneshot_mods_changed_kb(mods); + } } /** \brief clear oneshot mods * * FIXME: needs doc */ void clear_oneshot_mods(void) { - if (oneshot_mods) { - oneshot_mods = 0; -#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) - oneshot_time = 0; -#endif - oneshot_mods_changed_kb(oneshot_mods); - } + if (oneshot_mods) { + oneshot_mods = 0; +# if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) + oneshot_time = 0; +# endif + oneshot_mods_changed_kb(oneshot_mods); + } } /** \brief get oneshot mods * * FIXME: needs doc */ -uint8_t get_oneshot_mods(void) -{ - return oneshot_mods; -} +uint8_t get_oneshot_mods(void) { return oneshot_mods; } #endif /** \brief Called when the one shot modifiers have been changed. - * - * \param mods Contains the active modifiers active after the change. + * + * \param mods Contains the active modifiers active after the change. */ -__attribute__((weak)) -void oneshot_locked_mods_changed_user(uint8_t mods) { } +__attribute__((weak)) void oneshot_locked_mods_changed_user(uint8_t mods) {} /** \brief Called when the locked one shot modifiers have been changed. - * - * \param mods Contains the active modifiers active after the change. + * + * \param mods Contains the active modifiers active after the change. */ -__attribute__((weak)) -void oneshot_locked_mods_changed_kb(uint8_t mods) { - oneshot_locked_mods_changed_user(mods); -} +__attribute__((weak)) void oneshot_locked_mods_changed_kb(uint8_t mods) { oneshot_locked_mods_changed_user(mods); } /** \brief Called when the one shot modifiers have been changed. - * + * * \param mods Contains the active modifiers active after the change. */ -__attribute__((weak)) -void oneshot_mods_changed_user(uint8_t mods) { } +__attribute__((weak)) void oneshot_mods_changed_user(uint8_t mods) {} /** \brief Called when the one shot modifiers have been changed. - * + * * \param mods Contains the active modifiers active after the change. */ -__attribute__((weak)) -void oneshot_mods_changed_kb(uint8_t mods) { - oneshot_mods_changed_user(mods); -} +__attribute__((weak)) void oneshot_mods_changed_kb(uint8_t mods) { oneshot_mods_changed_user(mods); } /** \brief Called when the one shot layers have been changed. - * - * \param layer Contains the layer that is toggled on, or zero when toggled off. + * + * \param layer Contains the layer that is toggled on, or zero when toggled off. */ -__attribute__((weak)) -void oneshot_layer_changed_user(uint8_t layer) { } +__attribute__((weak)) void oneshot_layer_changed_user(uint8_t layer) {} /** \brief Called when the one shot layers have been changed. - * + * * \param layer Contains the layer that is toggled on, or zero when toggled off. */ -__attribute__((weak)) -void oneshot_layer_changed_kb(uint8_t layer) { - oneshot_layer_changed_user(layer); -} +__attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) { oneshot_layer_changed_user(layer); } /** \brief inspect keyboard state * * FIXME: needs doc */ -uint8_t has_anymod(void) -{ - return bitpop(real_mods); -} +uint8_t has_anymod(void) { return bitpop(real_mods); } |