refactor: return to zmkfirmware main

This commit is contained in:
honorless 2024-11-17 13:51:28 -05:00
parent ff0acc1000
commit c49abff17e
No known key found for this signature in database
GPG Key ID: 1B48A311ABE8DA4D
3 changed files with 24 additions and 55 deletions

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022 Darryl deHaan # Copyright (c) 2024 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
@ -24,7 +24,7 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
#EXT POWER #EXT POWER
CONFIG_ZMK_EXT_POWER=y CONFIG_ZMK_EXT_POWER=y
# MOUSE # Mouse clicks
CONFIG_ZMK_MOUSE=y CONFIG_ZMK_MOUSE=y
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

View File

@ -1,4 +1,3 @@
#include <behaviors/mouse_keys.dtsi>
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h> #include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
@ -6,50 +5,21 @@
#include <dt-bindings/zmk/outputs.h> #include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/rgb.h> #include <dt-bindings/zmk/rgb.h>
#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 { behaviors {
td0: td0 { td0: td0 {
compatible = "zmk,behavior-tap-dance"; compatible = "zmk,behavior-tap-dance";
label = "TD0";
#binding-cells = <0>; #binding-cells = <0>;
bindings = <&kp LEFT_SHIFT>, <&kp CAPS>; 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 { rgb_encoder: rgb_encoder {
compatible = "zmk,behavior-sensor-rotate"; compatible = "zmk,behavior-sensor-rotate";
label = "RGB_ENCODER";
#sensor-binding-cells = <0>; #sensor-binding-cells = <0>;
bindings = <&rgb_ug RGB_BRI>, <&rgb_ug RGB_BRD>; 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 { keymap {
compatible = "zmk,keymap"; compatible = "zmk,keymap";
@ -71,7 +41,6 @@
&kp ENTER &kp ENTER
>; >;
label = "QWERTY";
sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>;
}; };
@ -85,15 +54,14 @@
// | GUI | | SPC | | ENT | | ALT | // | GUI | | SPC | | ENT | | ALT |
bindings = < 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 &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 &mmv MOVE_DOWN &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PG_UP &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 &mmv MOVE_LEFT &rgb_ug RGB_EFR &rgb_ug RGB_SPI &rgb_ug RGB_BRI &rgb_ug RGB_BRD &kp END &kp PG_DN &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 &mmv MOVE_RIGHT &kp INS &kp DEL &trans &kp C_MUTE &trans &trans &trans &trans &kp INS &kp DEL &trans
&mkp LCLK &mkp LCLK
>; >;
label = "NUMBER"; sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
sensor-bindings = <&scroll_encoder>;
}; };
raise_layer { raise_layer {
@ -106,29 +74,27 @@
// | GUI | | SPC | | ENT | | ALT | // | GUI | | SPC | | ENT | | ALT |
bindings = < 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 &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 &mmv MOVE_DOWN &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE &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 &mmv MOVE_LEFT &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE &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 &mmv MOVE_RIGHT &kp RET &trans &trans &trans &trans &trans &kp SPACE &trans &kp RET &trans &trans
&mkp LCLK &mkp LCLK
>; >;
label = "SYMBOL"; sensor-bindings = <&inc_dec_kp PG_UP PG_DN>;
sensor-bindings = <&scroll_encoder>;
}; };
layer_3 { layer_3 {
display-name = "Fn"; display-name = "Fn";
bindings = < 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 &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 &mmv MOVE_DOWN &bootloader &mkp LCLK &mkp MCLK &mkp RCLK &kp PRINTSCREEN &kp F12 &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 &mmv MOVE_LEFT &trans &trans &bootloader &sys_reset &kp SCROLLLOCK &kp PAUSE_BREAK &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 &mmv MOVE_RIGHT &trans &trans &trans &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans
&mkp LCLK &mkp LCLK
>; >;
label = "FN"; sensor-bindings = <&rgb_encoder>;
sensor-bindings = <&scroll_encoder>;
}; };
}; };
}; };

View File

@ -1,12 +1,15 @@
manifest: manifest:
remotes: remotes:
- name: urob - name: zmkfirmware
url-base: https://github.com/urob 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: projects:
- name: zmk - name: zmk
remote: urob remote: zmkfirmware
revision: main revision: main
import: app/west.yml import: app/west.yml
self: self:
path: config path: config