From b85db264365b9d82775c9beafbe3ab5108bb56f0 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:56:49 -0700 Subject: [PATCH 01/11] Create stratapad_deconfig --- boards/shields/stratapad/stratapad_deconfig | 1 + 1 file changed, 1 insertion(+) create mode 100644 boards/shields/stratapad/stratapad_deconfig diff --git a/boards/shields/stratapad/stratapad_deconfig b/boards/shields/stratapad/stratapad_deconfig new file mode 100644 index 0000000..06145c8 --- /dev/null +++ b/boards/shields/stratapad/stratapad_deconfig @@ -0,0 +1 @@ +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y From 86dadbbc1e8ea5dc6121ee28b436d4f268e2162e Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:03:21 -0700 Subject: [PATCH 02/11] Update stratapad.conf --- boards/shields/stratapad/stratapad.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/shields/stratapad/stratapad.conf b/boards/shields/stratapad/stratapad.conf index e69de29..d9d3347 100644 --- a/boards/shields/stratapad/stratapad.conf +++ b/boards/shields/stratapad/stratapad.conf @@ -0,0 +1 @@ +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y From 29b8e6762cc9af9d1f314e477271b7e9dfe63f6b Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:03:44 -0700 Subject: [PATCH 03/11] Delete boards/shields/stratapad/stratapad_deconfig --- boards/shields/stratapad/stratapad_deconfig | 1 - 1 file changed, 1 deletion(-) delete mode 100644 boards/shields/stratapad/stratapad_deconfig diff --git a/boards/shields/stratapad/stratapad_deconfig b/boards/shields/stratapad/stratapad_deconfig deleted file mode 100644 index 06145c8..0000000 --- a/boards/shields/stratapad/stratapad_deconfig +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y From 542b09aabb085a5f72b0cb72794269a9b83eeb17 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:39:43 -0700 Subject: [PATCH 04/11] Update stratapad.conf --- boards/shields/stratapad/stratapad.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/shields/stratapad/stratapad.conf b/boards/shields/stratapad/stratapad.conf index d9d3347..56e73dd 100644 --- a/boards/shields/stratapad/stratapad.conf +++ b/boards/shields/stratapad/stratapad.conf @@ -1 +1,2 @@ CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_ZMK_BLE_PASSKEY_ENTRY=y From 79e2369eab79fa4f4e18dad21bc25b90ada4aef6 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:27:08 -0700 Subject: [PATCH 05/11] Update build.yaml --- build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.yaml b/build.yaml index 6732761..4472805 100644 --- a/build.yaml +++ b/build.yaml @@ -21,7 +21,9 @@ include: - board: seeeduino_xiao_ble shield: stratapad artifact-name: stratapad_wasd_keymap + snippet: zmk-usb-logging - board: seeeduino_xiao_ble shield: stratapad cmake-args: -DKEYMAP_FILE=../../config/stratapad_arrows.keymap artifact-name: stratapad_arrows_keymap + snippet: zmk-usb-logging From ff64e5e2bd98baa328e826c4cd664a8d41eba48d Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:53:43 -0700 Subject: [PATCH 06/11] Update stratapad.keymap --- boards/shields/stratapad/stratapad.keymap | 25 ++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/boards/shields/stratapad/stratapad.keymap b/boards/shields/stratapad/stratapad.keymap index 0472239..90255c6 100644 --- a/boards/shields/stratapad/stratapad.keymap +++ b/boards/shields/stratapad/stratapad.keymap @@ -2,7 +2,21 @@ #include #include +#define DEFAULT 0 +#define BT_SET 1 + +#define NONE 0 + / { + behaviors { + td0: tap_dance_0 { + compatible = "zmk,behavior-tap-dance"; + #binding-cells = <0>; + tapping-term-ms = <200>; + bindings = <&kp LCTRL>, <&kp LCTRL>, <&mo BT_SET>; + }; + }; + keymap { compatible = "zmk,keymap"; @@ -12,7 +26,16 @@ &kp A &kp S &kp D - &kp LCTRL + &td0 + >; + }; + bt_cmds_layer { + bindings = < + &bt BT_CLR + &bt BT_SEL 0 + &bt BT_SEL 1 + &bt BT_SEL 2 + &kp none >; }; }; From b2ba5312f785313df78486a15819220f2f4c670c Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:15:14 -0700 Subject: [PATCH 07/11] Update stratapad.keymap --- boards/shields/stratapad/stratapad.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/shields/stratapad/stratapad.keymap b/boards/shields/stratapad/stratapad.keymap index 90255c6..4c6abe3 100644 --- a/boards/shields/stratapad/stratapad.keymap +++ b/boards/shields/stratapad/stratapad.keymap @@ -35,7 +35,7 @@ &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 - &kp none + &none >; }; }; From 7f1c7a97e545550fe5411d8354f1048a873ca437 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Fri, 26 Jul 2024 07:31:25 -0700 Subject: [PATCH 08/11] Update stratapad.conf --- boards/shields/stratapad/stratapad.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/boards/shields/stratapad/stratapad.conf b/boards/shields/stratapad/stratapad.conf index 56e73dd..d9d3347 100644 --- a/boards/shields/stratapad/stratapad.conf +++ b/boards/shields/stratapad/stratapad.conf @@ -1,2 +1 @@ CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y -CONFIG_ZMK_BLE_PASSKEY_ENTRY=y From f7c462a58a058225e816ea4e4cf9300271800c40 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Fri, 26 Jul 2024 07:45:54 -0700 Subject: [PATCH 09/11] Update stratapad.conf --- boards/shields/stratapad/stratapad.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/shields/stratapad/stratapad.conf b/boards/shields/stratapad/stratapad.conf index d9d3347..7e44320 100644 --- a/boards/shields/stratapad/stratapad.conf +++ b/boards/shields/stratapad/stratapad.conf @@ -1 +1 @@ -CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y From 64ad12e95d7b9c4204c713a7fba6c0f40658e64f Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Fri, 26 Jul 2024 10:00:55 -0700 Subject: [PATCH 10/11] copying tapdance second layer to alt keymap and increasing tapdance term length --- boards/shields/stratapad/stratapad.keymap | 2 +- config/stratapad_arrows.keymap | 25 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/boards/shields/stratapad/stratapad.keymap b/boards/shields/stratapad/stratapad.keymap index 4c6abe3..b568246 100644 --- a/boards/shields/stratapad/stratapad.keymap +++ b/boards/shields/stratapad/stratapad.keymap @@ -12,7 +12,7 @@ td0: tap_dance_0 { compatible = "zmk,behavior-tap-dance"; #binding-cells = <0>; - tapping-term-ms = <200>; + tapping-term-ms = <500>; bindings = <&kp LCTRL>, <&kp LCTRL>, <&mo BT_SET>; }; }; diff --git a/config/stratapad_arrows.keymap b/config/stratapad_arrows.keymap index a18375c..be75dfd 100644 --- a/config/stratapad_arrows.keymap +++ b/config/stratapad_arrows.keymap @@ -2,7 +2,21 @@ #include #include +#define DEFAULT 0 +#define BT_SET 1 + +#define NONE 0 + / { + behaviors { + td0: tap_dance_0 { + compatible = "zmk,behavior-tap-dance"; + #binding-cells = <0>; + tapping-term-ms = <500>; + bindings = <&kp LCTRL>, <&kp LCTRL>, <&mo BT_SET>; + }; + }; + keymap { compatible = "zmk,keymap"; @@ -12,7 +26,16 @@ &kp LEFT &kp DOWN &kp RIGHT - &kp LCTRL + &td0 + >; + }; + bt_cmds_layer { + bindings = < + &bt BT_CLR + &bt BT_SEL 0 + &bt BT_SEL 1 + &bt BT_SEL 2 + &none >; }; }; From b9a5c7f06ba588dc3702b1ff3f8d87419ecafe20 Mon Sep 17 00:00:00 2001 From: Logan Butler <8854426+MatchstickWorks@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:25:11 -0700 Subject: [PATCH 11/11] Update build.yaml Removing logging --- build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.yaml b/build.yaml index 4472805..6732761 100644 --- a/build.yaml +++ b/build.yaml @@ -21,9 +21,7 @@ include: - board: seeeduino_xiao_ble shield: stratapad artifact-name: stratapad_wasd_keymap - snippet: zmk-usb-logging - board: seeeduino_xiao_ble shield: stratapad cmake-args: -DKEYMAP_FILE=../../config/stratapad_arrows.keymap artifact-name: stratapad_arrows_keymap - snippet: zmk-usb-logging