diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf index e50cab5..841ecd1 100644 --- 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 index 5e9021b..f2872a3 100644 --- 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 index c7bbdbf..453375e 100644 --- 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 index f06fd91..87c6606 100644 --- 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 index c17fae7..495b0eb 100644 --- a/config/includes/3x5.dtsi +++ b/config/includes/3x5.dtsi @@ -15,7 +15,6 @@ #define SYM 3 #define NAV 4 #define FUN 5 -#define MSE 6 // Desktop and tab navigation shortcuts #define D_LT LC(LG(LEFT)) @@ -36,13 +35,6 @@ # define FN_EXTRA2 &kp PAUSE_BREAK #endif -#ifdef MOUSE_KEYS -# include "mouse.dtsi" -# define MS_ACT(key) < MSE key -#else -# define MS_ACT(key) &kp key -#endif - &mt { flavor = "hold-preferred"; tapping-term-ms = <150>; @@ -150,7 +142,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, < NAV SPACE, < SYM BSPC, &mt RSHFT RET, &mt RALT DEL \ // ╰─────────────┴─────────────┴─────────────╯ ╰─────────────┴─────────────┴─────────────╯ @@ -165,7 +157,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, < NAV SPACE, < SYM BSPC, &mt RSHFT RET, &mt RALT DEL \ // ╰─────────────┴─────────────┴─────────────╯ ╰─────────────┴─────────────┴─────────────╯ @@ -231,22 +223,5 @@ // ╰─────────────┴─────────────┴─────────────╯ ╰─────────────┴─────────────┴─────────────╯ )>; }; - -#ifdef MOUSE_KEYS - mouse_layer { - display-name = "MSE"; - bindings = ; - }; -#endif }; }; diff --git a/config/includes/combos.dtsi b/config/includes/combos.dtsi index 51f4fa3..614d084 100644 --- a/config/includes/combos.dtsi +++ b/config/includes/combos.dtsi @@ -50,9 +50,5 @@ COMBO(btclr, &bt BT_CLR, RB2 RB3, FUN, 100, 200) COMBO(indbat, &ind_bat, LT2 RT2, FUN, 100, 200) COMBO(indcon, &ind_con, LT1 RT1, 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 deleted file mode 100644 index ea8ade8..0000000 --- a/config/includes/mouse.dtsi +++ /dev/null @@ -1,16 +0,0 @@ -#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1500 // 600 -#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20 // 10 - -#include - -&mmv { - acceleration-exponent = <1>; // 1 - time-to-max-speed-ms = <500>; // 300 - delay-ms = <0>; // 0 -}; - -&msc { - acceleration-exponent = <1>; // 0 - time-to-max-speed-ms = <40>; // 300 - delay-ms = <0>; // 0 -}; diff --git a/config/rommana.conf b/config/rommana.conf index c0fe13f..7a11c19 100644 --- 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 index 66b042e..8f1eb4b 100644 --- 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 index d3c473d..cec1b51 100644 --- a/config/west.yml +++ b/config/west.yml @@ -6,14 +6,14 @@ 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 revision: main - name: zmk-tri-state remote: caksoylar - revision: split-locality + revision: main self: path: config diff --git a/config/zen-status-screen.md b/config/zen-status-screen.md deleted file mode 100644 index fa6c3c3..0000000 --- a/config/zen-status-screen.md +++ /dev/null @@ -1,23 +0,0 @@ -# 8-bit status screen for Corne-ish Zen - -![Picture of status screen](https://repository-images.githubusercontent.com/340512296/020f96b5-a5cd-4d94-939a-2f70d6075a18) - -## Output widget - -Ranks: -- `J`/`Q`: BLE/peripheral paired & connected -- ❗: paired but not connected -- ❓: not paired, advertising -- 🔌: USB output - -Suits: -- ♠️: BLE profile 1/5 -- ♥️: BLE profile 2 -- ♦️: BLE profile 3 -- ♣️: BLE profile 4 - -## Battery widget - -A few pixels at the top of the display covertly shows the battery level, using the length of the line starting from top left and stretching to the right. - -The pixel art is not original, it is a design that was adapted from the creator of the 8bit deck: .