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

Full NKRO support, fixes for keymap key selection.

Browse source
This commit is contained in:
Pete Johanson 2020-05-12 13:22:07 -04:00
parent 02bffb009f
commit be53560b77
5 changed files with 165 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/keymap.c
View file

@ -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)