summaryrefslogtreecommitdiff
path: root/src/keymap.c
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-05-12 13:22:07 -0400
committerPete Johanson <peter@peterjohanson.com>2020-05-12 13:22:07 -0400
commitbe53560b77b1144953cfb57202c463495da6c4e7 (patch)
tree843d936463e91a796e16f32e5f278bd9ee442d55 /src/keymap.c
parent02bffb009f0c5815209e6a477777d95d72574df2 (diff)
Full NKRO support, fixes for keymap key selection.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 1bb624d..1f55b1f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2,7 +2,7 @@
#include "keymap.h"
static u32_t zmk_keymap_layer_state = 0;
-static u32_t zmk_keymap_layer_default = 0;
+static u8_t zmk_keymap_layer_default = 0;
static zmk_key zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_MATRIX_ROWS * ZMK_MATRIX_COLS] = {
#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 0)
@@ -53,7 +53,7 @@ zmk_key zmk_keymap_keycode_from_position(u32_t row, u32_t column)
{
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)
{
zmk_key key = zmk_keymap[layer][(row * ZMK_MATRIX_ROWS) + column];
if (key == ZC_TRNS)