diff options
| author | innovaker <66737976+innovaker@users.noreply.github.com> | 2020-12-19 17:37:12 +0000 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-28 10:20:12 -0500 |
| commit | 0e71dbc860e19f8eb269841a15b9fccd9ef7d37f (patch) | |
| tree | f21ead85620c5d6497b905cfa03e3bc12eb9714f | |
| parent | 87e7c04b00b2cb83540b757a8c909200cdb28255 (diff) | |
refactor(app): replace zmk_keymap_layers_state with zmk_keymap_layers_state_t
Aligns with typedef _t convention.
PR: #531
| -rw-r--r-- | app/include/zmk/keymap.h | 4 | ||||
| -rw-r--r-- | 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 7303d4a..1070af7 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 cafe2ff..3a3d4e9 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/events/layer_state_changed.h> #include <zmk/events/sensor_event.h> -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; } |