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

Adjust typedef location, tweak internal vars to have better variable naming/scope

Browse source
This commit is contained in:
KemoNine 2020-12-08 17:50:21 +00:00
parent d815c8aaa1
commit 665be54996
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/include/zmk/keymap.h
View file

@ -6,8 +6,10 @@
#pragma once #pragma once
u8_t zmk_layer_default(); typedef u32_t zmk_keymap_layers_state;
u32_t zmk_layer_state();
u8_t zmk_keymap_layer_default();
zmk_keymap_layers_state zmk_keymap_layer_state();
bool zmk_keymap_layer_active(u8_t layer); bool zmk_keymap_layer_active(u8_t layer);
u8_t zmk_highest_layer_active(); u8_t zmk_highest_layer_active();
int zmk_keymap_layer_activate(u8_t layer); int zmk_keymap_layer_activate(u8_t layer);

29
app/src/keymap.c
View file

@ -19,9 +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>
typedef u32_t zmk_layers_state; static zmk_keymap_layers_state _zmk_keymap_layer_state = 0;
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
@ -82,17 +81,17 @@ static inline int set_layer_state(u8_t layer, bool state) {
if (layer >= 32) { if (layer >= 32) {
return -EINVAL; return -EINVAL;
} }
WRITE_BIT(zmk_keymap_layer_state, layer, state); WRITE_BIT(_zmk_keymap_layer_state, layer, state);
ZMK_EVENT_RAISE(create_layer_state_changed(layer, state)); ZMK_EVENT_RAISE(create_layer_state_changed(layer, state));
return 0; return 0;
} }
u8_t zmk_layer_default() { return zmk_keymap_layer_default; } u8_t zmk_keymap_layer_default() { return _zmk_keymap_layer_default; }
zmk_layers_state zmk_layer_state() { return zmk_keymap_layer_state; } zmk_keymap_layers_state zmk_keymap_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));
}; };
u8_t zmk_highest_layer_active() { u8_t zmk_highest_layer_active() {
@ -101,7 +100,7 @@ u8_t zmk_highest_layer_active() {
return layer; return layer;
} }
} }
return zmk_layer_default(); return zmk_keymap_layer_default();
} }
int zmk_keymap_layer_activate(u8_t layer) { return set_layer_state(layer, true); }; int zmk_keymap_layer_activate(u8_t layer) { return set_layer_state(layer, true); };
@ -116,8 +115,8 @@ 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, zmk_layers_state layer_state) { bool is_active_layer(u8_t layer, zmk_keymap_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;
} }
int zmk_keymap_apply_position_state(int layer, u32_t position, bool pressed, s64_t timestamp) { int zmk_keymap_apply_position_state(int layer, u32_t position, bool pressed, s64_t timestamp) {
@ -148,9 +147,9 @@ int zmk_keymap_apply_position_state(int layer, u32_t position, bool pressed, s64
int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timestamp) { int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timestamp) {
if (pressed) { if (pressed) {
zmk_keymap_active_behavior_layer[position] = zmk_keymap_layer_state; zmk_keymap_active_behavior_layer[position] = _zmk_keymap_layer_state;
} }
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) {
if (is_active_layer(layer, zmk_keymap_active_behavior_layer[position])) { if (is_active_layer(layer, zmk_keymap_active_behavior_layer[position])) {
int ret = zmk_keymap_apply_position_state(layer, position, pressed, timestamp); int ret = zmk_keymap_apply_position_state(layer, position, pressed, timestamp);
if (ret > 0) { if (ret > 0) {
@ -170,9 +169,9 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed, s64_t timest
#if ZMK_KEYMAP_HAS_SENSORS #if ZMK_KEYMAP_HAS_SENSORS
int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor, s64_t timestamp) { int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor, s64_t timestamp) {
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) {
if (((zmk_keymap_layer_state & BIT(layer)) == BIT(layer) || if (((_zmk_keymap_layer_state & BIT(layer)) == BIT(layer) ||
layer == zmk_keymap_layer_default) && layer == _zmk_keymap_layer_default) &&
zmk_sensor_keymap[layer] != NULL) { zmk_sensor_keymap[layer] != NULL) {
struct zmk_behavior_binding *binding = &zmk_sensor_keymap[layer][sensor_number]; struct zmk_behavior_binding *binding = &zmk_sensor_keymap[layer][sensor_number];
struct device *behavior; struct device *behavior;