diff --git a/config/boards/shields/hillside46/hillside46.dtsi b/config/boards/shields/hillside46/hillside46.dtsi index 453df20..d4f68f9 100644 --- a/config/boards/shields/hillside46/hillside46.dtsi +++ b/config/boards/shields/hillside46/hillside46.dtsi @@ -32,6 +32,7 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,5) RC(3,6 compatible = "zmk,kscan-gpio-matrix"; label = "KSCAN"; + wakeup-source; diode-direction = "col2row"; row-gpios = <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> @@ -65,4 +66,4 @@ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(3,5) RC(3,6 sensors = <&left_encoder &right_encoder>; }; -}; \ No newline at end of file +}; diff --git a/config/hillside46.conf b/config/hillside46.conf index 162b85a..c68fbe2 100644 --- a/config/hillside46.conf +++ b/config/hillside46.conf @@ -7,8 +7,9 @@ # RGB Underglow (Uncomment these two lines to add support to your firmware) # RGB quickly drains battery power -CONFIG_ZMK_RGB_UNDERGLOW=y +#CONFIG_ZMK_RGB_UNDERGLOW=y CONFIG_WS2812_STRIP=y +CONFIG_ZMK_SLEEP=y # Boost the Bluetooth signal only if having connection issues CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/config/hillside46.keymap b/config/hillside46.keymap index f09d13f..a615849 100644 --- a/config/hillside46.keymap +++ b/config/hillside46.keymap @@ -56,7 +56,7 @@ &kp RBKT &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp SINGLE_QUOTE &kp LBKT &kp GRAVE &mt LALT A &mt LGUI R &mt LCTRL S &mt LSHIFT T &kp G &kp M &mt LSHIFT N &mt LCTRL E &mt LGUI I &mt LALT O &kp SEMICOLON &kp BSLH &kp Z &mt RALT X &kp C &kp D &kp V &lang_switch &lang_switch &kp K &kp H &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS - < 4 ESC < 3 SPACE < 5 TAB &sk LG(LS(LA(LCTRL))) &none < 8 ENTER < 6 BACKSPACE &kp DEL + &sk LG(LS(LA(LCTRL))) < 4 ESC < 3 SPACE < 5 TAB < 8 ENTER < 6 BACKSPACE &kp DEL &none >; }; @@ -74,8 +74,8 @@ &kp GRAVE &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp SINGLE_QUOTE &kp LBKT &kp LSHIFT &kp A &kp R &kp S &kp T &kp G &kp M &mt LSHIFT N &mt LCTRL E &mt LGUI I &mt LALT O &kp SEMICOLON &kp LCTRL &kp Z &kp X &kp C &kp D &kp V &tog 2 &lang_switch &kp K &kp H &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS - &kp ESC &kp SPACE &kp TAB &kp BACKSLASH &none < 8 ENTER < 6 BACKSPACE &kp DEL - >; + &kp BACKSLASH &kp ESC &kp SPACE &kp TAB < 8 ENTER < 6 BACKSPACE &kp DEL &none + >; }; nav { @@ -83,7 +83,7 @@ &none &none &none &none &none &none &none &kp HOME &kp PG_DN &kp PG_UP &kp END &none &none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &caps_w_l &kp LEFT &kp DOWN &kp UP &kp RIGHT &none &none &none &kp RALT &none &none &none &none &none &none &none &none &none &none &none - &none &trans &none &none &none &kp RET &kp BSPC &kp DEL + &none &none &trans &none &kp RET &kp BSPC &kp DEL &none >; }; @@ -92,7 +92,7 @@ &none &none &none &none &none &none &rgb_ug RGB_TOG &rgb_ug RGB_EFF &rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_EFF &bt BT_CLR &none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &rgb_ug RGB_BRI &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_NEXT &none &none &none &kp RALT &none &none &none &none &none &rgb_ug RGB_SPI &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none - &trans &none &none &none &none &kp C_STOP &kp C_PP &kp C_MUTE + &none &trans &none &none &kp C_STOP &kp C_PP &kp C_MUTE &none >; }; @@ -101,7 +101,7 @@ &none &none &none &none &none &none &none &mkp MB4 &none &none &mkp MB5 &none &none &none &none &none &none &none &none &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &none &none &none &none &none &none &none &none &none &none &msc SCRL_LEFT &msc SCRL_DOWN &msc SCRL_UP &msc SCRL_RIGHT &none - &none &none &trans &none &none &mkp MB2 &mkp MB1 &mkp MB3 + &none &none &none &trans &mkp MB2 &mkp MB1 &mkp MB3 &none >; }; @@ -110,7 +110,7 @@ &none &kp LBKT &kp N7 &kp N8 &kp N9 &kp RBKT &none &none &none &none &none &none &none &kp SEMI &kp N4 &kp N5 &kp N6 &kp EQUAL &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none &none &kp GRAVE &kp N1 &kp N2 &kp N3 &kp BSLH &none &none &none &none &none &kp RALT &none &none - &kp KP_DOT &kp N0 &kp MINUS &none &none &none &trans &none + &none &kp KP_DOT &kp N0 &kp MINUS &none &trans &none &none >; }; @@ -128,7 +128,7 @@ &none &kp F12 &kp F7 &kp F8 &kp F9 &kp PSCRN &none &none &none &none &none &none &none &kp F11 &kp F4 &kp F5 &kp F6 &kp SCROLLLOCK &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none &none &kp F10 &kp F1 &kp F2 &kp F3 &kp C_PAUSE &tog 2 &none &none &none &none &kp RALT &none &none - &kp ESC &kp SPACE &kp TAB &none &none &trans &none &none + &none &kp ESC &kp SPACE &kp TAB &trans &none &none &none >; }; }; diff --git a/flake.lock b/flake.lock index 86cc909..e4fd1ea 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1738009863, - "narHash": "sha256-KxmFlQ2j9PpDhKRXWu85bv3R2wmfkUqdpJhEwz9JN/E=", + "lastModified": 1739834344, + "narHash": "sha256-PUAcU3YlKNFYrBBHkqshO4wRfMunzhMTEIH1dyhjTtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f898cbfddfab52593da301a397a17d0af801bbc3", + "rev": "f0295845e58ada369322524631821b01c0db13a7", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1737851654, - "narHash": "sha256-gjwXV87R/AQJi6MIFNcmB4RrWWzGCE/jXRkf1i0iZyM=", + "lastModified": 1739666186, + "narHash": "sha256-Q052i4ojEXzKHDUf95EJvIbC2+VO+dqMwITS2/toZsY=", "owner": "lilyinstarlight", "repo": "zmk-nix", - "rev": "57a72f1e222e7f09ef29bbb06c5e629695c2285b", + "rev": "d9c7de21f56c4bc69bd10569148a14306cd0e5d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6d3ae13..c0aa5b3 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ "-DCONFIG_ZMK_POINTING=y" ]; - zephyrDepsHash = "sha256-yRzN+df/kzHEOWTiQLRLsPNRBDM4fV5qmLa6SevYKxc="; + zephyrDepsHash = "sha256-VTTvPN35QCspzbOcYowgoe4tnR2bPQldKM2gk/N6yfs="; meta = { description = "ZMK firmware";