pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(keymap): move the toggle layer logic to keymap.c

Browse source
This commit is contained in:
Cody McGinnis 2020-08-18 14:02:25 -04:00
parent ae104374c0
commit 7facb6eee8
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/dts/behaviors/toggle_layer.dtsi
View file

@ -1,3 +1,9 @@
/*
* Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
*
* SPDX-License-Identifier: MIT
*/
/ { / {
behaviors { behaviors {
tog: behavior_toggle_layer { tog: behavior_toggle_layer {

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

@ -3,5 +3,6 @@
bool zmk_keymap_layer_active(u8_t layer); bool zmk_keymap_layer_active(u8_t layer);
int zmk_keymap_layer_activate(u8_t layer); int zmk_keymap_layer_activate(u8_t layer);
int zmk_keymap_layer_deactivate(u8_t layer); int zmk_keymap_layer_deactivate(u8_t layer);
int zmk_keymap_layer_toggle(u8_t layer);
int zmk_keymap_position_state_changed(u32_t position, bool pressed); int zmk_keymap_position_state_changed(u32_t position, bool pressed);

7
app/src/behaviors/behavior_toggle_layer.c
View file

@ -25,12 +25,7 @@ static int behavior_tog_init(struct device *dev)
static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _) static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
{ {
LOG_DBG("position %d layer %d current %d", position, layer, zmk_keymap_layer_active(layer)); return zmk_keymap_layer_toggle(layer);
if (zmk_keymap_layer_active(layer))
return zmk_keymap_layer_deactivate(layer);
return zmk_keymap_layer_activate(layer);
} }
static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _) static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)

8
app/src/keymap.c
View file

@ -91,6 +91,14 @@ int zmk_keymap_layer_deactivate(u8_t layer)
SET_LAYER_STATE(layer, false); SET_LAYER_STATE(layer, false);
}; };
int zmk_keymap_layer_toggle(u8_t layer)
{
if (zmk_keymap_layer_active(layer))
return zmk_keymap_layer_deactivate(layer);
return zmk_keymap_layer_activate(layer);
};
bool is_active_position(u32_t position, u8_t layer) bool is_active_position(u32_t position, u8_t layer)
{ {
return (zmk_keymap_layer_state & BIT(layer)) == BIT(layer) return (zmk_keymap_layer_state & BIT(layer)) == BIT(layer)