From c49abff17e5f6f9457d88afcbbc181ae7a1ffdee Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Sun, 17 Nov 2024 13:51:28 -0500 Subject: [PATCH] refactor: return to zmkfirmware main --- config/corne.conf | 4 +-- config/corne.keymap | 64 +++++++++++---------------------------------- config/west.yml | 11 +++++--- 3 files changed, 24 insertions(+), 55 deletions(-) diff --git a/config/corne.conf b/config/corne.conf index e6b8df1..84b5d4f 100644 --- a/config/corne.conf +++ b/config/corne.conf @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Darryl deHaan +# Copyright (c) 2024 The ZMK Contributors # SPDX-License-Identifier: MIT # @@ -24,7 +24,7 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y #EXT POWER CONFIG_ZMK_EXT_POWER=y -# MOUSE +# Mouse clicks CONFIG_ZMK_MOUSE=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/config/corne.keymap b/config/corne.keymap index e7b6bdf..079cb6b 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,50 +5,21 @@ #include #include -#define ZMK_MOUSE_DEFAULT_MOVE_VAL 1200 // 600 -#define ZMK_MOUSE_DEFAULT_SCRL_VAL 20 // 10 -#define U_MS_U &mmv MOVE_UP -#define U_MS_D &mmv MOVE_DOWN -#define U_MS_L &mmv MOVE_LEFT -#define U_MS_R &mmv MOVE_RIGHT - / { behaviors { td0: td0 { compatible = "zmk,behavior-tap-dance"; - label = "TD0"; #binding-cells = <0>; bindings = <&kp LEFT_SHIFT>, <&kp CAPS>; }; - - mmv { - acceleration-exponent = <1>; // 1 - time-to-max-speed-ms = <900>; // 40 - delay-ms = <0>; // 0 - }; - - msc { - acceleration-exponent = <1>; // 0 - time-to-max-speed-ms = <400>; // 500 - delay-ms = <0>; // 10 - }; }; rgb_encoder: rgb_encoder { compatible = "zmk,behavior-sensor-rotate"; - label = "RGB_ENCODER"; #sensor-binding-cells = <0>; bindings = <&rgb_ug RGB_BRI>, <&rgb_ug RGB_BRD>; }; - scroll_encoder: scroll_encoder { - compatible = "zmk,behavior-sensor-rotate"; - #sensor-binding-cells = <0>; - bindings = <&msc SCRL_DOWN>, <&msc SCRL_UP>; - - tap-ms = <30>; - }; - keymap { compatible = "zmk,keymap"; @@ -71,7 +41,6 @@ &kp ENTER >; - label = "QWERTY"; sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; }; @@ -85,15 +54,14 @@ // | GUI | | SPC | | ENT | | ALT | bindings = < -&trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &mmv MOVE_UP &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC -&trans &bt BT_CLR_ALL &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &mmv MOVE_DOWN &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PG_UP -&trans &rgb_ug RGB_OFF &rgb_ug RGB_ON &trans &trans &rgb_ug RGB_EFF &mmv MOVE_LEFT &rgb_ug RGB_EFR &rgb_ug RGB_SPI &rgb_ug RGB_BRI &rgb_ug RGB_BRD &kp END &kp PG_DN - &kp C_MUTE &trans &trans &trans &mmv MOVE_RIGHT &kp INS &kp DEL &trans +&trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC +&trans &bt BT_CLR_ALL &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PG_UP +&trans &rgb_ug RGB_OFF &rgb_ug RGB_ON &trans &trans &rgb_ug RGB_EFF &trans &rgb_ug RGB_EFR &rgb_ug RGB_SPI &rgb_ug RGB_BRI &rgb_ug RGB_BRD &kp END &kp PG_DN + &kp C_MUTE &trans &trans &trans &trans &kp INS &kp DEL &trans &mkp LCLK >; - label = "NUMBER"; - sensor-bindings = <&scroll_encoder>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; }; raise_layer { @@ -106,29 +74,27 @@ // | GUI | | SPC | | ENT | | ALT | bindings = < -&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &mmv MOVE_UP &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &kp BSPC -&trans &bt BT_CLR &mkp LCLK &mkp MCLK &mkp RCLK &mkp MB4 &mmv MOVE_DOWN &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE -&trans &out OUT_USB &out OUT_BLE &none &none &mkp MB5 &mmv MOVE_LEFT &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &trans &trans &trans &kp SPACE &mmv MOVE_RIGHT &kp RET &trans &trans +&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &trans &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &kp BSPC +&trans &bt BT_CLR &mkp LCLK &mkp MCLK &mkp RCLK &mkp MB4 &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE +&trans &out OUT_USB &out OUT_BLE &none &none &mkp MB5 &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &trans &trans &trans &kp SPACE &trans &kp RET &trans &trans &mkp LCLK >; - label = "SYMBOL"; - sensor-bindings = <&scroll_encoder>; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; }; layer_3 { display-name = "Fn"; bindings = < -&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &mmv MOVE_UP &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&trans &trans &mkp LCLK &mkp MCLK &mkp RCLK &mkp MB4 &mmv MOVE_DOWN &bootloader &mkp LCLK &mkp MCLK &mkp RCLK &kp PRINTSCREEN &kp F12 -&trans &sys_reset &trans &bootloader &trans &mkp MB5 &mmv MOVE_LEFT &trans &trans &bootloader &sys_reset &kp SCROLLLOCK &kp PAUSE_BREAK - &kp C_MUTE &trans &trans &trans &mmv MOVE_RIGHT &trans &trans &trans +&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&trans &trans &mkp LCLK &mkp MCLK &mkp RCLK &mkp MB4 &trans &bootloader &mkp LCLK &mkp MCLK &mkp RCLK &kp PRINTSCREEN &kp F12 +&trans &sys_reset &trans &bootloader &trans &mkp MB5 &trans &trans &trans &bootloader &sys_reset &kp SCROLLLOCK &kp PAUSE_BREAK + &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans &mkp LCLK >; - label = "FN"; - sensor-bindings = <&scroll_encoder>; + sensor-bindings = <&rgb_encoder>; }; }; }; diff --git a/config/west.yml b/config/west.yml index 440a85c..d658e23 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,12 +1,15 @@ manifest: remotes: - - name: urob - url-base: https://github.com/urob + - name: zmkfirmware + url-base: https://github.com/zmkfirmware + # Additional modules containing boards/shields/custom code can be listed here as well. + # See: + # - https://zmk.dev/docs/features/modules + # - https://docs.zephyrproject.org/3.5.0/develop/west/manifest.html#projects projects: - name: zmk - remote: urob + remote: zmkfirmware revision: main import: app/west.yml self: path: config -