From 53aadc4f931a27d7b1350ea99cdc79106e138ad3 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Fri, 22 May 2020 22:47:03 -0400 Subject: Initial exploration of mod tap action. --- include/dt-bindings/zmk/keys.h | 27 +++++++++++++++++++-------- include/zmk/endpoints.h | 1 + include/zmk/hid.h | 4 +++- include/zmk/keys.h | 6 +++++- include/zmk/kscan-mock.h | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/dt-bindings/zmk/keys.h b/include/dt-bindings/zmk/keys.h index 5a2d97a..93b5ba3 100644 --- a/include/dt-bindings/zmk/keys.h +++ b/include/dt-bindings/zmk/keys.h @@ -74,11 +74,22 @@ #define ZC_CSTM(n) (0xFF + n) -#define MOD_LCTL 0x00 -#define MOD_LSFT 0x01 -#define MOD_LALT 0x02 -#define MOD_LGUI 0x03 -#define MOD_RCTL 0x04 -#define MOD_RSFT 0x05 -#define MOD_RALT 0x06 -#define MOD_RGUI 0x07 \ No newline at end of file +#define MOD_LCTL (1 << 0x00) +#define MOD_LSFT (1 << 0x01) +#define MOD_LALT (1 << 0x02) +#define MOD_LGUI (1 << 0x03) +#define MOD_RCTL (1 << 0x04) +#define MOD_RSFT (1 << 0x05) +#define MOD_RALT (1 << 0x06) +#define MOD_RGUI (1 << 0x07) + +#define ZK_ACTION(k) (k >> 24) +#define _ACTION(a) (a << 24) +#define _ACTION_MODS(m) (m << 16) +#define ZK_MODS(a) ((a >> 16) & 0xFF) + +#define ZMK_ACTION_KEY 0x01 +#define ZMK_ACTION_MOD_TAP 0x01 +#define ZMK_ACTION_ONE_SHOT 0x02 + +#define MT(mods, kc) (_ACTION(ZMK_ACTION_MOD_TAP) + _ACTION_MODS(mods) + kc) diff --git a/include/zmk/endpoints.h b/include/zmk/endpoints.h index 42734aa..666f00d 100644 --- a/include/zmk/endpoints.h +++ b/include/zmk/endpoints.h @@ -3,4 +3,5 @@ #include int zmk_endpoints_init(); +int zmk_endpoints_send_report(); int zmk_endpoints_send_key_event(struct zmk_key_event key_event); diff --git a/include/zmk/hid.h b/include/zmk/hid.h index 8fbcf4f..3767b78 100644 --- a/include/zmk/hid.h +++ b/include/zmk/hid.h @@ -97,12 +97,14 @@ static const u8_t zmk_hid_report_desc[] = { struct zmk_hid_report { - u8_t modifiers; + zmk_mod_flags modifiers; u8_t keys[13]; } __packed; int zmk_hid_register_mod(zmk_mod modifier); int zmk_hid_unregister_mod(zmk_mod modifier); +int zmk_hid_register_mods(zmk_mod_flags modifiers); +int zmk_hid_unregister_mods(zmk_mod_flags modifiers); int zmk_hid_press_key(zmk_key key); int zmk_hid_release_key(zmk_key key); diff --git a/include/zmk/keys.h b/include/zmk/keys.h index be05784..6966bba 100644 --- a/include/zmk/keys.h +++ b/include/zmk/keys.h @@ -3,11 +3,15 @@ #include #include -typedef u64_t zmk_key; +typedef u32_t zmk_key; +typedef u8_t zmk_action; typedef u8_t zmk_mod; +typedef u8_t zmk_mod_flags; struct zmk_key_event { + u32_t column; + u32_t row; zmk_key key; bool pressed; }; \ No newline at end of file diff --git a/include/zmk/kscan-mock.h b/include/zmk/kscan-mock.h index b19cafb..d481899 100644 --- a/include/zmk/kscan-mock.h +++ b/include/zmk/kscan-mock.h @@ -1,6 +1,6 @@ #pragma once -#define ZMK_MOCK_IS_PRESS(v) (v & (0x01 << 31)) +#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0) #define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31)) #define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16)) #define ZMK_MOCK_ROW(v) (v & 0xFF) -- cgit v1.3.1 From 76a433fc392be31e56df256b630a21e61775d0af Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Sun, 24 May 2020 23:13:33 -0400 Subject: Clean up and implement MT release w/o mod press. --- boards/native_posix.overlay | 5 +++-- include/dt-bindings/zmk/keys.h | 1 + src/endpoints.c | 3 --- src/handlers.c | 12 ++++++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/boards/native_posix.overlay b/boards/native_posix.overlay index cd71191..1d692d4 100644 --- a/boards/native_posix.overlay +++ b/boards/native_posix.overlay @@ -13,7 +13,8 @@ rows = <2>; columns = <2>; - events = ; + events = ; + // events = ; }; keymap0: keymap { @@ -29,7 +30,7 @@ label = "DEFAULT"; keys = < - KC_A KC_B + KC_A MT(MOD_LSFT, KC_B) KC_C KC_D >; }; diff --git a/include/dt-bindings/zmk/keys.h b/include/dt-bindings/zmk/keys.h index 93b5ba3..c266de0 100644 --- a/include/dt-bindings/zmk/keys.h +++ b/include/dt-bindings/zmk/keys.h @@ -86,6 +86,7 @@ #define ZK_ACTION(k) (k >> 24) #define _ACTION(a) (a << 24) #define _ACTION_MODS(m) (m << 16) +#define ZK_KEY(a) (a & 0xFFFF) #define ZK_MODS(a) ((a >> 16) & 0xFF) #define ZMK_ACTION_KEY 0x01 diff --git a/src/endpoints.c b/src/endpoints.c index 3f2d576..668380a 100644 --- a/src/endpoints.c +++ b/src/endpoints.c @@ -56,9 +56,6 @@ int zmk_endpoints_send_report() int zmk_endpoints_send_key_event(struct zmk_key_event key_event) { - struct zmk_hid_report *report; - int err; - LOG_DBG("key %d, state %d\n", key_event.key, key_event.pressed); if (key_event.pressed) diff --git a/src/handlers.c b/src/handlers.c index 8c463a9..ff969b1 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -32,8 +32,16 @@ bool zmk_handle_action(zmk_action action, struct zmk_key_event *key_event) zmk_hid_unregister_mods(mods); if (action_effect_pending & BIT(flattened_index)) { - // Allow baseline keycode to flow to the endpoints! - return true; + struct zmk_key_event non_mod_event = + { + .row = key_event->row, + .column = key_event->column, + .key = ZK_KEY(key_event->key), + .pressed = true}; + + zmk_handle_key(non_mod_event); + non_mod_event.pressed = false; + zmk_handle_key(non_mod_event); } else { -- cgit v1.3.1