From 0e71dbc860e19f8eb269841a15b9fccd9ef7d37f Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Sat, 19 Dec 2020 17:37:12 +0000 Subject: [PATCH] refactor(app): replace zmk_keymap_layers_state with zmk_keymap_layers_state_t Aligns with typedef _t convention. PR: #531 --- app/include/zmk/keymap.h | 4 ++-- app/src/keymap.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/include/zmk/keymap.h b/app/include/zmk/keymap.h index 7303d4aa..1070af71 100644 --- a/app/include/zmk/keymap.h +++ b/app/include/zmk/keymap.h @@ -6,10 +6,10 @@ #pragma once -typedef uint32_t zmk_keymap_layers_state; +typedef uint32_t zmk_keymap_layers_state_t; uint8_t zmk_keymap_layer_default(); -zmk_keymap_layers_state zmk_keymap_layer_state(); +zmk_keymap_layers_state_t zmk_keymap_layer_state(); bool zmk_keymap_layer_active(uint8_t layer); uint8_t zmk_keymap_highest_layer_active(); int zmk_keymap_layer_activate(uint8_t layer); diff --git a/app/src/keymap.c b/app/src/keymap.c index cafe2ffe..3a3d4e99 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include -static zmk_keymap_layers_state _zmk_keymap_layer_state = 0; +static zmk_keymap_layers_state_t _zmk_keymap_layer_state = 0; static uint8_t _zmk_keymap_layer_default = 0; #define DT_DRV_COMPAT zmk_keymap @@ -88,7 +88,7 @@ static inline int set_layer_state(uint8_t layer, bool state) { uint8_t zmk_keymap_layer_default() { return _zmk_keymap_layer_default; } -zmk_keymap_layers_state zmk_keymap_layer_state() { return _zmk_keymap_layer_state; } +zmk_keymap_layers_state_t zmk_keymap_layer_state() { return _zmk_keymap_layer_state; } bool zmk_keymap_layer_active(uint8_t layer) { return (_zmk_keymap_layer_state & (BIT(layer))) == (BIT(layer)); @@ -115,7 +115,7 @@ int zmk_keymap_layer_toggle(uint8_t layer) { return zmk_keymap_layer_activate(layer); }; -bool is_active_layer(uint8_t layer, zmk_keymap_layers_state layer_state) { +bool is_active_layer(uint8_t layer, zmk_keymap_layers_state_t layer_state) { return (layer_state & BIT(layer)) == BIT(layer) || layer == _zmk_keymap_layer_default; }