Merge upstream, adjust key timings, add combos, add macros, add behaviors

* point the zmk firmware to the main repo since Pete's work was merged

* update keymap and adjust trackball speed in prep for testing new input listener for mouse keys

* reduce timing on homerow mods and td for layer switching on NUM & NAV

* made slow mouse layer momentary so it doesn't get accidentally activated

* reduced layer activation time for space and delete keys

* pull down the prior idle time just a bit

* updated key names in svg

*update readme

---------

Co-authored-by: 280Zo <>

Author: 280Zo

.github/workflows/draw_keymaps.yaml

@@ -144,7 +144,7 @@ jobs:
               "&bootloader": "BOOT LDR",
               "&mkp RCLK": "R CLK",
               "&mkp LCLK": "L CLK",
-              "&mkp MCLK": "M CLK",
+              "&mkp MCLK": "Mid CLK",
               "&mkp MB4": "BACK",
               "&mkp MB5": "FWD",
               "&mmv MOVE_UP": "MOVE UP",
@@ -155,14 +155,24 @@ jobs:
               "&msc MOVE_DOWN": "WHEEL U",
               "&msc MOVE_LEFT": "WHEEL L",
               "&msc MOVE_RIGHT": "WHEEL R",
-              "&HSplit": "HSPLIT",
-              "&VSplit": "VSPLIT",
+              "&h_split": "HSPLIT",
+              "&v_split": "VSPLIT",
               "&caps_word": "CAPS WORD",
               "&td_bore": "L_BASE L_EXTRA",
               "&tdmt": "L1/BS LCLICK",
               "&tdbt": "L2/ESC RCLICK",
               "&td_layers": "L_BASE L_PHOTO L_GAME",
               "&td_cursor": "SCRL SLOW",
+              "&td_home": "~/",
+              "&td_equals": "=",
+              "td_hyphen": "-",
+              "td_grave": "`",
+              "detach_session": "DETACH",
+              "create_or_attach": "NEW SESH",
+              "sync_panes": "SYNC PANES",
+              "next_pane": "NEXT PANE",
+              "show_sessions": "SHOW SESHS",
+              "sync_panes": "-",
               "&shrug": "SHRUG",
               "&lgtm": "LGTM",
               "&gcm": "GIT COMMIT",

README.md

@@ -28,9 +28,6 @@ There are a few things to note about how the pre-built firmware is configured:
 - The Bluetooth/USB firmware can connect through Bluetooth, but the central side will have a shorter battery life because it needs to maintain that connection.
   - The central side can also be plugged in to USB and the keyboard can be used when Bluetooth on the host computer isn't available (e.g. BIOS navigation)
 - To add support for the PMW3610 low power trackball sensor, badjeff's [zmk-pmw3610-driver](https://github.com/badjeff/zmk-pmw3610-driver), [ZMK Input Behavior Listener](https://github.com/badjeff/zmk-input-behavior-listener?tab=readme-ov-file), and [ZMK Split Peripheral Input Relay](https://github.com/badjeff/zmk-split-peripheral-input-relay) modules are included in the firmware.
-- eigatech's [zmk-configs](https://github.com/eigatech/zmk-config?tab=readme-ov-file) played a major role in getting badjeff's drivers and modules fully configured and are a great resource
-- A separate branch builds the Bluetooth/USB firmware using [inorichi's driver](https://github.com/inorichi/zmk-pmw3610-driver?tab=readme-ov-file) as an alternative to badjeff's driver.
-- Pete Johanson (creator and lead of the ZMK firmware) developed a feature ([pointers-move-scroll](https://github.com/zmkfirmware/zmk/pull/2027)) that allows mouse keys to move and scroll. A successor feature ([pointers-with-input-processors](https://github.com/zmkfirmware/zmk/pull/2477)) was then developed that allows more flexibility. This feature is what will eventually be merged into the main ZMK branch, and it's what is used by this repo to build the firmware. Although it's not guranteed to be stable, it hasn't caused any noticible issues. That being said, if you'd prefer to use pointers-move-scroll which is in a stable state, you can update the west.yaml and adapt the config files accordingly.
 
 ## Flashing the Firmware
 
@@ -61,7 +58,7 @@ Here are a few tips for a quick start:
 
 - The left most thumb button has multiple functions
   - When held, the function of the trackball is changed from moving the cursor to scrolling.
-  - When double tapped, it will reduce the cursor speed for more precision, and activate the mouse layer.
+  - When double tapped and held, it will reduce the cursor speed for more precision.
   - When single tapped it outputs the escape key.
 
 ![keymap images](keymap-drawer/charybdis.svg)
@@ -126,13 +123,6 @@ To get this information, look at the PCB kcad files and follow the traces from k
 
 This repo uses the excellent work of caksoylar's [Keymap Drawer](https://keymap-drawer.streamlit.app/) to automatically generate a key mapping of each layer when the Github Actions are run.
 
-## Upcoming ZMK Features
-
-ZMK is actively being developed and there are a few features that will be added to these builds if/when they are approved.
-
-- Layer Lock - [Open PR](https://github.com/zmkfirmware/zmk/pull/1984)
-- Unicode Support - [Issue](https://github.com/zmkfirmware/zmk/issues/232)
-
 ## Credits
 
 - [eigatech](https://github.com/eigatech)

config/behaviors.dtsi

@@ -0,0 +1,106 @@
+/ {
+    behaviors {
+        hm: homerow_mod {
+            compatible = "zmk,behavior-hold-tap";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <175>; // triggers the hold behavior when the tapping-term-ms has expired
+            quick-tap-ms = <150>; // If you press a tapped hold-tap again within quick-tap-ms milliseconds of the first press, it will always trigger the tap behavior.
+            require-prior-idle-ms = <185>; // like quick-tap-ms however it will apply for any non-modifier key pressed before it
+            bindings = <&kp>, <&kp>;  // hold, tap
+        };
+
+        hm_right: homerow_mod_right {
+            compatible = "zmk,behavior-hold-tap";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <130>;
+            // quick-tap-ms = <200>;
+            // require-prior-idle-ms = <150>;
+            bindings = <&kp>, <&kp>;
+            hold-trigger-key-positions = <0 1 2 3 4 5 12 13 14 15 16 17 24 25 26 27 28 29 36 37 38>;
+        };
+
+        hm_left: homerow_mod_left {
+            compatible = "zmk,behavior-hold-tap";
+            #binding-cells = <2>;
+            flavor = "tap-preferred";
+            tapping-term-ms = <130>;
+            // quick-tap-ms = <200>;
+            // require-prior-idle-ms = <150>;
+            bindings = <&kp>, <&kp>;
+            hold-trigger-key-positions = <6 7 8 9 10 11 18 19 20 21 22 23 30 31 32 33 34 35 39 40>;
+        };
+
+        td_cursor: td_scroll_or_cursor {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&lt 9 ESC>, <&mo 8>; // hold, tap, double_tap
+        };
+
+        td_space: td_space {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            tapping-term-ms = <85>;
+            bindings = <&lt 2 SPACE>, <&kp SPACE>; // hold, tap, double_tap
+        };
+
+        td_bs: td_bs {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            tapping-term-ms = <85>;
+            bindings = <&lt 1 BACKSPACE>, <&kp BACKSPACE>; // hold, tap, double_tap
+        };
+
+        httl: ht_two_layers {
+            compatible = "zmk,behavior-hold-tap";
+            bindings = <&mo>, <&to>;
+            #binding-cells = <2>;
+            flavor = "balanced";
+            tapping-term-ms = <125>;
+        };
+
+        td_layers: td_layer_swap {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&to 0>, <&to 5>, <&to 4>; // tap, double_tap, tripple_tap
+        };
+
+        td_clk_scrl: td_click_or_scroll {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            tapping-term-ms = <250>;
+            bindings = <&mkp RCLK>, <&mo 9>;  // tap/hold, double_tap
+        };
+
+        td_bore: BASE_or_EXTRA {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&mo 6>, <&to 0>;
+        };
+
+        td_grave: DoubleTap_Grave {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&kp GRAVE>, <&grave_macro>;
+        };
+
+        td_hyphen: DoubleTap_Hyphen {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&kp MINUS>, <&minus_macro>;
+        };
+
+        td_equals: DoubleTap_Equals {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&kp EQUAL>, <&equals_macro>;
+        };
+
+        td_home: DoubleTap_Home {
+            compatible = "zmk,behavior-tap-dance";
+            #binding-cells = <0>;
+            bindings = <&kp FSLH>, <&home_macro>;
+        };
+    };
+};