From 60d363f1036966d80b7c8a2a60076a5ad2753212 Mon Sep 17 00:00:00 2001 From: Jamie Ding Date: Sun, 20 Mar 2022 02:09:54 +0000 Subject: [PATCH] split tests in two --- .../macros/from-tap-hold/native_posix.keymap | 29 ------------------- .../basic}/events.patterns | 0 .../basic/keycode_events.snapshot | 6 ++++ .../basic/native_posix.keymap | 19 ++++++++++++ .../behavior_keymap.dtsi | 11 ++++--- .../macro_from_tap_hold/events.patterns | 2 ++ .../keycode_events.snapshot | 0 .../macro_from_tap_hold/native_posix.keymap | 19 ++++++++++++ 8 files changed, 53 insertions(+), 33 deletions(-) delete mode 100644 app/tests/macros/from-tap-hold/native_posix.keymap rename app/tests/macros/{from-tap-hold => mod-layer-from-macro/basic}/events.patterns (100%) create mode 100644 app/tests/macros/mod-layer-from-macro/basic/keycode_events.snapshot create mode 100644 app/tests/macros/mod-layer-from-macro/basic/native_posix.keymap rename app/tests/macros/{from-tap-hold => mod-layer-from-macro}/behavior_keymap.dtsi (80%) create mode 100644 app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/events.patterns rename app/tests/macros/{from-tap-hold => mod-layer-from-macro/macro_from_tap_hold}/keycode_events.snapshot (100%) create mode 100644 app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/native_posix.keymap diff --git a/app/tests/macros/from-tap-hold/native_posix.keymap b/app/tests/macros/from-tap-hold/native_posix.keymap deleted file mode 100644 index c2256e90..00000000 --- a/app/tests/macros/from-tap-hold/native_posix.keymap +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2022 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include -#include "behavior_keymap.dtsi" - -&kscan { - events = < - ZMK_MOCK_PRESS( 1,1,10) - ZMK_MOCK_PRESS( 0,1,10) - ZMK_MOCK_RELEASE(0,1,10) - ZMK_MOCK_RELEASE(1,1,10) - - //ZMK_MOCK_PRESS( 0,0,10) - //ZMK_MOCK_PRESS( 0,1,10) - //ZMK_MOCK_RELEASE(0,1,10) - //ZMK_MOCK_RELEASE(0,0,10) -// - //ZMK_MOCK_PRESS( 1,0,10) - //ZMK_MOCK_PRESS( 1,1,10) - //ZMK_MOCK_RELEASE(1,1,10) - //ZMK_MOCK_RELEASE(1,0,10) - >; -}; \ No newline at end of file diff --git a/app/tests/macros/from-tap-hold/events.patterns b/app/tests/macros/mod-layer-from-macro/basic/events.patterns similarity index 100% rename from app/tests/macros/from-tap-hold/events.patterns rename to app/tests/macros/mod-layer-from-macro/basic/events.patterns diff --git a/app/tests/macros/mod-layer-from-macro/basic/keycode_events.snapshot b/app/tests/macros/mod-layer-from-macro/basic/keycode_events.snapshot new file mode 100644 index 00000000..18ca3b54 --- /dev/null +++ b/app/tests/macros/mod-layer-from-macro/basic/keycode_events.snapshot @@ -0,0 +1,6 @@ +mo_pressed: position 0 layer 1 +kp_pressed: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00 +kp_pressed: usage_page 0x07 keycode 0x13 implicit_mods 0x00 explicit_mods 0x00 +kp_released: usage_page 0x07 keycode 0x13 implicit_mods 0x00 explicit_mods 0x00 +mo_released: position 0 layer 1 +kp_released: usage_page 0x07 keycode 0xe1 implicit_mods 0x00 explicit_mods 0x00 diff --git a/app/tests/macros/mod-layer-from-macro/basic/native_posix.keymap b/app/tests/macros/mod-layer-from-macro/basic/native_posix.keymap new file mode 100644 index 00000000..63e4b702 --- /dev/null +++ b/app/tests/macros/mod-layer-from-macro/basic/native_posix.keymap @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS( 1,0,10) + ZMK_MOCK_PRESS( 1,1,10) + ZMK_MOCK_RELEASE(1,1,10) + ZMK_MOCK_RELEASE(1,0,10) + >; +}; \ No newline at end of file diff --git a/app/tests/macros/from-tap-hold/behavior_keymap.dtsi b/app/tests/macros/mod-layer-from-macro/behavior_keymap.dtsi similarity index 80% rename from app/tests/macros/from-tap-hold/behavior_keymap.dtsi rename to app/tests/macros/mod-layer-from-macro/behavior_keymap.dtsi index 85d94c35..0c17a6e6 100644 --- a/app/tests/macros/from-tap-hold/behavior_keymap.dtsi +++ b/app/tests/macros/mod-layer-from-macro/behavior_keymap.dtsi @@ -19,10 +19,13 @@ #binding-cells = <0>; wait-ms = <1>; bindings - // tog doesn't work, the tog on release doesn't seem to fire - = <¯o_press &mo RAISE &kp LSHFT> + //= <¯o_press &mo RAISE &kp LSHFT> + = <¯o_press &mo RAISE> + , <¯o_press &kp LSHFT> , <¯o_pause_for_release> - , <¯o_release &mo RAISE &kp LSHFT> + //, <¯o_release &mo RAISE &kp LSHFT> + , <¯o_release &mo RAISE> + , <¯o_release &kp LSHFT> ; }; }; @@ -51,7 +54,7 @@ raise_layer { bindings = < - &mth L M &kp N + &kp M &kp N &kp O &kp P>; }; }; diff --git a/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/events.patterns b/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/events.patterns new file mode 100644 index 00000000..a23e0563 --- /dev/null +++ b/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/events.patterns @@ -0,0 +1,2 @@ +s/.*hid_listener_keycode/kp/p +s/.*mo_keymap_binding/mo/p diff --git a/app/tests/macros/from-tap-hold/keycode_events.snapshot b/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/keycode_events.snapshot similarity index 100% rename from app/tests/macros/from-tap-hold/keycode_events.snapshot rename to app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/keycode_events.snapshot diff --git a/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/native_posix.keymap b/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/native_posix.keymap new file mode 100644 index 00000000..99476eaf --- /dev/null +++ b/app/tests/macros/mod-layer-from-macro/macro_from_tap_hold/native_posix.keymap @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include "../behavior_keymap.dtsi" + +&kscan { + events = < + ZMK_MOCK_PRESS( 0,0,10) + ZMK_MOCK_PRESS( 0,1,10) + ZMK_MOCK_RELEASE(0,1,10) + ZMK_MOCK_RELEASE(0,0,10) + >; +}; \ No newline at end of file