diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-05-18 13:42:41 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-05-18 13:42:41 -0400 |
| commit | f478438f01e081514f255ce67f7b75935ee7b51a (patch) | |
| tree | 22595d1f285d5937af3f93cc752ff2feee5e26fd /include | |
| parent | c1905745b3578037d1791bd634a3d1607cafd525 (diff) | |
Implement raise/lower for default keymap.
* Properly allow includes for keymaps to allow defining
custom keycodes, and then adding them to the
keymap.overlay file.
* Fix keymap.c loading after build refactor.
* Fix for deactivating a layer working properly.
* Fix default keymap to put transparent in proper spots to
make raise/lower keycodes work as expected.
* Add custom raise/lower keycode handling to default
keymap.
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/zmk/keys.h | 6 | ||||
| -rw-r--r-- | include/zmk/keymap.h | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/dt-bindings/zmk/keys.h b/include/dt-bindings/zmk/keys.h index bf3fcc0..4c975db 100644 --- a/include/dt-bindings/zmk/keys.h +++ b/include/dt-bindings/zmk/keys.h @@ -66,9 +66,7 @@ #define KC_ALT 0x02 #define KC_CTRL 0x03 -#define ZC_RAIS 0xF0 -#define ZC_LOWR 0xF1 -#define ZC_TRNS 0xF2 -#define ZC_NOOP 0xF3 +#define ZC_TRNS 0xF0 +#define ZC_NOOP 0xF1 #define ZC_CSTM(n) (0xFF + n)
\ No newline at end of file diff --git a/include/zmk/keymap.h b/include/zmk/keymap.h index 9b58cc0..e575774 100644 --- a/include/zmk/keymap.h +++ b/include/zmk/keymap.h @@ -11,6 +11,16 @@ #define ZMK_KEYMAP_NODE DT_CHOSEN(zmk_keymap) #define ZMK_KEYMAP_LAYERS_LEN DT_PROP_LEN(ZMK_KEYMAP_NODE, layers) +#define _ZMK_LAYER_ENUM_ITEM(label) DT_CAT(label, _layer) + +#define _ZMK_KEYMAP_GENERATE_LAYER_CONST(node_id) \ + _ZMK_LAYER_ENUM_ITEM(DT_NODELABEL(node_id)), + +enum zmk_keymap_layer +{ + DT_FOREACH_CHILD(DT_INST(0, zmk_layers), _ZMK_KEYMAP_GENERATE_LAYER_CONST) +}; + bool zmk_keymap_layer_activate(u8_t layer); bool zmk_keymap_layer_deactivate(u8_t layer); |