Remove custom ZMK enhancements

caksoylar · Jun 2, 2024 · 91b80b0 · 91b80b0
1 parent b26d519
commit 91b80b0
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 101 deletions.
diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf
@@ -1,22 +1,9 @@
-# Enable mouse for mouse keys
-CONFIG_ZMK_MOUSE=y
-
 # Boost Bluetooth TX power
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 # Require passkey on pairing
 CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
 
-# Zen display tweaks
-CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300
-# Stock status screen
-#CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y
-#CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y
-#CONFIG_CUSTOM_WIDGET_LOGO_IMAGE_ZMK=y
-# 8-bit status screen
-CONFIG_ZEN_STATUS_SCREEN_8BIT=y
-CONFIG_ZEN_STATUS_SCREEN_8BIT_HALF=y
-
 # Sleep timeout to 30 min
 CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap
@@ -1,4 +1,3 @@
-#define MOUSE_KEYS
 #include "keypos_def/keypos_36keys.h"
 #include "includes/3x5.dtsi"
 

diff --git a/config/grumpybird.conf b/config/grumpybird.conf
@@ -1,6 +1,3 @@
-# Enable mouse for mouse keys
-CONFIG_ZMK_MOUSE=y
-
 # Require passkey on pairing
 CONFIG_ZMK_BLE_PASSKEY_ENTRY=y
 

diff --git a/config/grumpybird.keymap b/config/grumpybird.keymap
@@ -1,3 +1,2 @@
-#define MOUSE_KEYS
 #include "keypos_def/keypos_28keys.h"
 #include "includes/3x5.dtsi"
diff --git a/config/includes/3x5.dtsi b/config/includes/3x5.dtsi
@@ -13,7 +13,6 @@
 #define SYM 3
 #define NAV 4
 #define FUN 5
-#define MSE 6
 
 // Desktop and tab navigation shortcuts
 #define D_LT   LC(LG(LEFT))
@@ -34,13 +33,6 @@
 #    define FN_EXTRA2 &kp PAUSE_BREAK
 #endif
 
-#ifdef MOUSE_KEYS
-#    include "mouse.dtsi"
-#    define MS_ACT(key) &lt MSE key
-#else
-#    define MS_ACT(key) &kp key
-#endif
-
 &mt {
     flavor = "hold-preferred";
     tapping-term-ms = <150>;
@@ -100,12 +92,12 @@
             hold-trigger-on-release;
         };
 
-        // Swapper for smart alt+tab
-        swapper: swapper {
-            compatible = "zmk,behavior-tri-state";
-            #binding-cells = <0>;
-            bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
-            ignored-key-positions = <SWP_POS>;
+        // sticky key to be used for alt-tab macro
+        sk_at: sk_alttabber {
+            compatible = "zmk,behavior-sticky-key";
+            #binding-cells = <1>;
+            bindings = <&kp>;
+            release-after-ms = <500>;
         };
     };
 
@@ -127,6 +119,15 @@
                 , <&macro_tap &kp KP_N1 &kp KP_N6 &kp KP_N8>
                 , <&macro_release &kp LALT>;
         )
+        ZMK_MACRO(alt_tabber,  // adapted from @moutis on ZMK Discord
+            wait-ms = <10>;
+            tap-ms = <10>;
+            bindings = <&macro_press &kp LALT>    // leave ALT down to keep menu up
+                     , <&macro_tap &kp TAB>       // open the menu
+                     , <&macro_pause_for_release> // wait until key release
+                     , <&macro_tap &sk_at RALT>   // start timer to release ALT after timeout
+                     , <&macro_release &kp LALT>; // now release the initial hold
+        )
     };
 
     keymap {
@@ -140,7 +141,7 @@
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
      &aml LCTRL A, &aml LGUI R,  &aml LALT S,  &asl LSHFT T, &kp G,            &kp M,        &asr RSHFT N, &amr RALT E,  &amr RGUI I,  &amr RCTRL O, \
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &kp Z,        &kp X,        &kp C,        MS_ACT(D),    &kp V,            &kp J,        &kp H,        &kp COMMA,    &kp DOT,      &kp SLASH,    \
+     &kp Z,        &kp X,        &kp C,        &kp D,        &kp V,            &kp J,        &kp H,        &kp COMMA,    &kp DOT,      &kp SLASH,    \
 // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
                                  &mt LGUI TAB, &mt LCTRL ESC, &lt NAV SPACE,   &lt SYM BSPC, &mt RSHFT RET, &mt RALT DEL                             \
 //                             ╰─────────────┴─────────────┴─────────────╯   ╰─────────────┴─────────────┴─────────────╯
@@ -155,7 +156,7 @@
 //, ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
      &aml LCTRL R, &aml LGUI S,  &aml LALT N,  &asl LSHFT T, &kp P,            &kp K,        &asr RSHFT H, &amr RALT E,  &amr RGUI I,  &amr RCTRL A, \
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &none,        &kp W,        &kp M,        MS_ACT(G),    &none,            &none,        &kp D,        &kp COMMA,    &kp DOT,      &none,        \
+     &none,        &kp W,        &kp M,        &kp G,        &none,            &none,        &kp D,        &kp COMMA,    &kp DOT,      &none,        \
 //, ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
                                  &mt LGUI TAB, &mt LCTRL ESC, &lt NAV SPACE,   &lt SYM BSPC, &mt RSHFT RET, &mt RALT DEL                             \
 //                             ╰─────────────┴─────────────┴─────────────╯   ╰─────────────┴─────────────┴─────────────╯
@@ -200,7 +201,7 @@
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
      &kp LCTRL,    &kp LGUI,     &kp LALT,     &mt LSHFT TAB, &kp C_VOL_DN,    &kp HOME,     &kp LEFT,     &kp DOWN,     &kp RIGHT,    &kp END,       \
 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &none,        &kp LS(TAB),  &swapper,     &kp LS(INS),  &kp C_PP,         &none,        &kp DEL,      &kp C_PREV,   &kp C_NEXT,   &none,         \
+     &none,        &none,        &alt_tabber,  &kp LS(INS),  &kp C_PP,         &none,        &kp DEL,      &kp C_PREV,   &kp C_NEXT,   &none,         \
 // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
                                  &kp LGUI,     &none,        &trans,           &trans,       &kp SPACE,    &kp RALT \
 //                             ╰─────────────┴─────────────┴─────────────╯   ╰─────────────┴─────────────┴─────────────╯
@@ -221,22 +222,5 @@
 //                             ╰─────────────┴─────────────┴─────────────╯   ╰─────────────┴─────────────┴─────────────╯
             )>;
         };
-
-#ifdef MOUSE_KEYS
-        mouse_layer {
-            display-name = "MSE";
-            bindings = <LAYER_FROM36( \
-// ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
-     &none,        &none,        &none,        &none,        &none,          &msc SCRL_LEFT, &msc SCRL_DOWN, &mmv MOVE_UP, &msc SCRL_UP, &msc SCRL_RIGHT, \
-// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &kp LCTRL,    &kp LGUI,     &kp LALT,     &kp LSHFT,    &none,            &mkp RCLK,  &mmv MOVE_LEFT, &mmv MOVE_DOWN, &mmv MOVE_RIGHT, &none,         \
-// ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤
-     &none,        &none,        &none,        &none,        &none,            &none,        &mkp MB4,     &mkp MCLK,    &mkp MB5,     &none,           \
-// ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤   ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯
-                                 &none,        &none,        &none,            &mkp LCLK,    &mkp RCLK,    &none                                        \
-//                             ╰─────────────┴─────────────┴─────────────╯   ╰─────────────┴─────────────┴─────────────╯
-            )>;
-        };
-#endif
     };
 };
diff --git a/config/includes/combos.dtsi b/config/includes/combos.dtsi
@@ -49,9 +49,5 @@ COMBO(slsh,   &kp SLASH,   RB2 RB3,     DEF BRD SYM,  80,  50)
 
 COMBO(f12,    &kp F12,     LB3 LB2,     FUN,         100, 200)
 COMBO(btclr,  &bt BT_CLR,  RB2 RB3,     FUN,         100, 200)
-
-#if defined(MOUSE_KEYS) && defined(LH1)
-COMBO(mse_l,  &mo MSE,     LH1 LH0,     DEF BRD,     150,   0, slow-release;)
-#endif
     };
 };
diff --git a/config/includes/mouse.dtsi b/config/includes/mouse.dtsi
diff --git a/config/rommana.conf b/config/rommana.conf
@@ -1,6 +1,3 @@
-# Enable mouse for mouse keys
-CONFIG_ZMK_MOUSE=y
-
 # Boost Bluetooth TX power
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 

diff --git a/config/rommana.keymap b/config/rommana.keymap
@@ -1,3 +1,2 @@
-#define MOUSE_KEYS
 #include "keypos_def/keypos_30keys.h"
 #include "includes/3x5.dtsi"
diff --git a/config/west.yml b/config/west.yml
@@ -6,8 +6,8 @@ manifest:
       url-base: https://github.com/caksoylar
   projects:
     - name: zmk
-      remote: caksoylar
-      revision: caksoylar/zen-8bit
+      remote: zmkfirmware
+      revision: main
       import: app/west.yml
     - name: zmk-rgbled-widget
       remote: caksoylar

diff --git a/config/zen-status-screen.md b/config/zen-status-screen.md