kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup code per PR discussion

Browse source 
- adds create_layer_state_changed helper to easily fire layer events
- adds type for the layer bitmask
- converts a macro to dedicated method for readability
This commit is contained in:
KemoNine 2020-12-07 12:39:52 +00:00
parent 8b72dcffa3
commit be5ee7780e
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/include/zmk/events/layer-state-changed.h
View file

@ -11,9 +11,18 @@
struct layer_state_changed { struct layer_state_changed {
struct zmk_event_header header; struct zmk_event_header header;
u32_t layer; u8_t layer;
bool state; bool state;
s64_t timestamp; s64_t timestamp;
}; };
ZMK_EVENT_DECLARE(layer_state_changed); ZMK_EVENT_DECLARE(layer_state_changed);
static inline struct layer_state_changed *create_layer_state_changed(u8_t layer, bool state) {
struct layer_state_changed *ev = new_layer_state_changed();
ev->layer = layer;
ev->state = state;
ev->timestamp = k_uptime_get();
return ev;
}

28
app/src/keymap.c
View file

@ -19,7 +19,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/events/layer-state-changed.h> #include <zmk/events/layer-state-changed.h>
#include <zmk/events/sensor-event.h> #include <zmk/events/sensor-event.h>
static u32_t zmk_keymap_layer_state = 0; typedef u32_t zmk_layers_state;
static zmk_layers_state zmk_keymap_layer_state = 0;
static u8_t zmk_keymap_layer_default = 0; static u8_t zmk_keymap_layer_default = 0;
#define DT_DRV_COMPAT zmk_keymap #define DT_DRV_COMPAT zmk_keymap
@ -77,20 +78,19 @@ static struct zmk_behavior_binding zmk_sensor_keymap[ZMK_KEYMAP_LAYERS_LEN]
#endif /* ZMK_KEYMAP_HAS_SENSORS */ #endif /* ZMK_KEYMAP_HAS_SENSORS */
#define SET_LAYER_STATE(new_layer, new_state) \ static inline int set_layer_state(u8_t layer, bool state) {
if (new_layer >= 32) { \ if (layer >= 32) {
return -EINVAL; \ return -EINVAL;
} \ }
WRITE_BIT(zmk_keymap_layer_state, new_layer, new_state); \ WRITE_BIT(zmk_keymap_layer_state, layer, state);
struct layer_state_changed *ev = new_layer_state_changed(); \ ZMK_EVENT_RAISE(create_layer_state_changed(layer, state));
ev->layer = new_layer; \
ev->state = new_state; \
ZMK_EVENT_RAISE(ev); \
return 0; return 0;
}
u8_t zmk_layer_default() { return zmk_keymap_layer_default; } u8_t zmk_layer_default() { return zmk_keymap_layer_default; }
u32_t zmk_layer_state() { return zmk_keymap_layer_state; } zmk_layers_state zmk_layer_state() { return zmk_keymap_layer_state; }
bool zmk_keymap_layer_active(u8_t layer) { bool zmk_keymap_layer_active(u8_t layer) {
return (zmk_keymap_layer_state & (BIT(layer))) == (BIT(layer)); return (zmk_keymap_layer_state & (BIT(layer))) == (BIT(layer));
@ -105,9 +105,9 @@ u8_t zmk_highest_layer_active() {
return zmk_layer_default(); return zmk_layer_default();
} }
int zmk_keymap_layer_activate(u8_t layer) { SET_LAYER_STATE(layer, true); }; int zmk_keymap_layer_activate(u8_t layer) { return set_layer_state(layer, true); };
int zmk_keymap_layer_deactivate(u8_t layer) { SET_LAYER_STATE(layer, false); }; int zmk_keymap_layer_deactivate(u8_t layer) { return set_layer_state(layer, false); };
int zmk_keymap_layer_toggle(u8_t layer) { int zmk_keymap_layer_toggle(u8_t layer) {
if (zmk_keymap_layer_active(layer)) { if (zmk_keymap_layer_active(layer)) {
@ -117,7 +117,7 @@ int zmk_keymap_layer_toggle(u8_t layer) {
return zmk_keymap_layer_activate(layer); return zmk_keymap_layer_activate(layer);
}; };
bool is_active_layer(u8_t layer, u32_t layer_state) { bool is_active_layer(u8_t layer, zmk_layers_state layer_state) {
return (layer_state & BIT(layer)) == BIT(layer) || layer == zmk_keymap_layer_default; return (layer_state & BIT(layer)) == BIT(layer) || layer == zmk_keymap_layer_default;
} }