From 97123d1e1d7ba3120d993ddccc48c2f64f996760 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Mon, 13 May 2024 22:32:26 +0200 Subject: [PATCH 01/25] Update west.yml --- config/west.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/west.yml b/config/west.yml index 379d291..f5c7c14 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,11 +1,15 @@ manifest: remotes: + - name: schadenn + url-base: https://github.com/schadenn + - name: MangoIV + url-base: https://github.com/MangoIV - name: zmkfirmware url-base: https://github.com/zmkfirmware projects: - name: zmk - remote: zmkfirmware - revision: main + remote: schadenn + revision: zmkfirmware-main import: app/west.yml self: path: config From db787471821b41b66ba524a0bd0b000e0097fddf Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Mon, 13 May 2024 22:41:20 +0200 Subject: [PATCH 02/25] Update west.yml --- config/west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/west.yml b/config/west.yml index f5c7c14..2d0dd95 100644 --- a/config/west.yml +++ b/config/west.yml @@ -8,8 +8,8 @@ manifest: url-base: https://github.com/zmkfirmware projects: - name: zmk - remote: schadenn - revision: zmkfirmware-main + remote: zmkfirmware + revision: a1e0607a22deb72ce4ac64e442f0baa721e32b0b import: app/west.yml self: path: config From 3ea79b223ce4a8211d7fb4c0ef5db0053c077624 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 12:38:27 +0200 Subject: [PATCH 03/25] Update klor.keymap --- config/klor.keymap | 54 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index ca2f6a4..549ae23 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -29,15 +29,46 @@ / { behaviors { - hm: homerow_mods { + hm: homerow_mods { compatible = "zmk,behavior-hold-tap"; label = "HOMEROW_MODS"; #binding-cells = <2>; - tapping-term-ms = <150>; - quick_tap_ms = <0>; + tapping-term-ms = <320>; + quick-tap-ms = <0>; flavor = "tap-preferred"; bindings = <&kp>, <&kp>; }; + comma: comma_semi { + compatible = "zmk,behavior-mod-morph"; + label = "comma_semi"; + #binding-cells = <0>; + bindings = <&kp COMMA>, <&kp SEMI>; + mods = <(MOD_LSFT)>; + }; + + dot: dot_colon { + compatible = "zmk,behavior-mod-morph"; + label = "dot_colon"; + #binding-cells = <0>; + bindings = <&kp DOT>, <&kp COLON>; + mods = <(MOD_LSFT)>; + }; + + quest: question_excl { + compatible = "zmk,behavior-mod-morph"; + label = "question_excl"; + #binding-cells = <0>; + bindings = <&kp QUESTION>, <&kp EXCL>; + mods = <(MOD_LSFT)>; + }; + + ctlalt: control_alt { + compatible = "zmk,behavior-mod-morph"; + label = "control_alt"; + #binding-cells = <0>; + bindings = <&kp LEFT_CONTROL>, <&kp LEFT_ALT>; + mods = <(MOD_RGUI)>; + }; }; @@ -48,10 +79,13 @@ key-positions = <0 1>; bindings = <&kp ESC>; }; + }; + + keymap { compatible = "zmk,keymap"; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ @@ -71,13 +105,13 @@ label= "BASE" ; │ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SEMI - &kp TAB &kp A &kp R &kp S &hm LSHFT T &kp D &kp H &hm RSHFT N &kp E &kp I &kp O &kp SQT - &kp DEL &kp Z &kp X &kp C &kp V &kp B &trans &trans &kp K &kp M &kp COMMA &kp DOT &kp FSLH &kp BSLH - &kp LCTRL &mo LOWER &kp SPACE &kp LALT &kp LGUI &kp RET &mo RAISE &kp BSPC + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC + &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET + &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ @@ -158,4 +192,4 @@ label= "ADJUST" ; sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; }; }; -}; \ No newline at end of file +}; From 9a97fef6eec62689652504ffed4eaf2d4ae7fbd2 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 14:20:19 +0200 Subject: [PATCH 04/25] Update klor.keymap --- config/klor.keymap | 64 +++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 44 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 549ae23..87e596c 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -95,21 +95,13 @@ // ┌───────────────────────────────────────────────────────────┐ label= "BASE" ; // └───────────────────────────────────────────────────────────┘ -/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ - │ Q │ W │ F │ P │ G │ │ J │ L │ U │ Y │ ; │ - ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ - │ TAB │ A │ R │ S │ T │ D │ │ H │ N │ E │ I │ O │ " │ - ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ - │ DEL │ Z │ X │ C │ V │ B ││ MUTE ││PLY/PSE ││ K │ M │ , │ . │ / │ \ │ - └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ - │ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │ - └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ + bindings = < //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET - &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL + &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo SIGNS &mo NUM &kp DEL >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; @@ -117,53 +109,37 @@ label= "BASE" ; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - lower_layer { + signs_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "LOWER" ; +label= "SIGNS" ; // └───────────────────────────────────────────────────────────┘ -/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ - │ │ │ UP │ │ { │ │ } │ 7 │ 8 │ 9 │ + │ - ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ - │ │ │ LEFT │ DOWN │ RIGHT │ [ │ │ ] │ 4 │ 5 │ 6 │ - │ │ - ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ - │ │ │ P UP │ C LOCK │ P DOWN │ ( ││ ││ ││ ) │ 1 │ 2 │ 3 │ * │ │ - └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ - │ │ │ │ ││ │ │ 0 │ │ - └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ + bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &ext_power EP_TOG &trans &kp UP &trans &kp LBRC &kp RBRC &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_PLUS - &trans &rgb_ug RGB_EFF &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_MINUS &trans - &trans &trans &kp PG_UP &kp CAPS &kp PG_DN &kp LPAR &trans &trans &kp RPAR &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_MULTIPLY &trans - &trans &trans &trans &trans &trans &kp DELETE &kp KP_N0 &trans + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &kp AT_SIGN &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPS &kp STAR &kp SEMI &kp PLUS &trans + &trans &trans &kp EQUAL &kp DQT &kp GRAVE &kp SQT &kp LPAR &kp RPAR &kp LT &kp GT &kp MINUS &trans + &trans &trans &kp TILDE &kp SLASH &kp BSLH &kp PIPE &trans &trans &kp LBRC &kp RBRC &kp LBKT &kp RBKT &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - raise_layer { + num_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "RAISE" ; +label= "NUM" ; // └───────────────────────────────────────────────────────────┘ -/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ - │ │ │ │ │ │ │ │ │ Ü │ │ │ - ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ - │ Ä │ │ ß │ │ │ │ │ │ │ │ │ Ö │ │ - ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ - │ │ │ │ │ │ ││ ││ ││ │ │ │ │ │ │ - └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ - │ ADJUST │ │ │ ││ │ │ │ │ - └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ + bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &trans &trans &trans &trans &trans &trans &trans &kp RA(U) &trans &trans - &kp RA(A) &trans &kp RA(S) &trans &trans &trans &trans &trans &trans &trans &kp RA(O) &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &mo ADJUST &trans &trans &trans &trans &trans &trans &trans + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans &rgb_ug RGB_EFF &kp UP &rgb_ug RGB_BRI &trans + &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &KP UP &kp RIGHT &trans &trans + &trans &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ From 0c9ad94a9c08cb5620f173bfdc97ccf136b65389 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 14:28:05 +0200 Subject: [PATCH 05/25] Update klor.keymap --- config/klor.keymap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 87e596c..5fce343 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -97,11 +97,11 @@ label= "BASE" ; // └───────────────────────────────────────────────────────────┘ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC - &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET - &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo SIGNS &mo NUM &kp DEL + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC + &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET + &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo ZEICHEN &mo NUMMERN &kp DEL >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; @@ -111,7 +111,7 @@ label= "BASE" ; signs_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "SIGNS" ; +label= "ZEICHEN" ; // └───────────────────────────────────────────────────────────┘ bindings = < @@ -129,7 +129,7 @@ label= "SIGNS" ; num_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "NUM" ; +label= "NUMMERN" ; // └───────────────────────────────────────────────────────────┘ bindings = < From 008c08c7c4e101d4946d6e0b09f1bb249a4b4199 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 14:33:33 +0200 Subject: [PATCH 06/25] Update klor.keymap --- config/klor.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 5fce343..4ba1497 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -97,11 +97,11 @@ label= "BASE" ; // └───────────────────────────────────────────────────────────┘ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC - &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET - &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo ZEICHEN &mo NUMMERN &kp DEL + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC + &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &kp N &kp M &comma &dot &kp MINUS &kp RET + &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; From 33ccfe044fb2cd0aec54da5353909ace2bc24a76 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 14:36:01 +0200 Subject: [PATCH 07/25] Update klor.keymap --- config/klor.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/klor.keymap b/config/klor.keymap index 4ba1497..bdaf743 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -135,7 +135,7 @@ label= "NUMMERN" ; bindings = < //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans &rgb_ug RGB_EFF &kp UP &rgb_ug RGB_BRI &trans - &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &KP UP &kp RIGHT &trans &trans + &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans &trans &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; From a16afd20984c8abb8ffa09be1f20a3ee66f2823b Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 16:42:38 +0200 Subject: [PATCH 08/25] Update build.yaml --- build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.yaml b/build.yaml index fc14f5b..0c5eb08 100644 --- a/build.yaml +++ b/build.yaml @@ -17,5 +17,5 @@ include: shield: klor_left - board: nice_nano_v2 shield: klor_right -# - board: nice_nano_v2 -# shield: settings_reset \ No newline at end of file + - board: nice_nano_v2 + shield: settings_reset From 8bb2afef3eac5f2cd375f0fe4a02428ac7106f9b Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 16:44:02 +0200 Subject: [PATCH 09/25] Update klor.conf --- config/klor.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/klor.conf b/config/klor.conf index 9893b99..1ba1579 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -9,4 +9,5 @@ CONFIG_ZMK_DISPLAY=y CONFIG_ZMK_RGB_UNDERGLOW=y CONFIG_WS2812_STRIP=y -CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 \ No newline at end of file +CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 +CONFIG_ZMK_USB_LOGGING=y From a920125467bff16b48846aa1a2912ccee13537c0 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 17:02:30 +0200 Subject: [PATCH 10/25] Update klor.conf --- config/klor.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/klor.conf b/config/klor.conf index 1ba1579..ae342ee 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -3,11 +3,11 @@ CONFIG_EC11=y CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # Uncomment the following line to enable the KLOR OLED Display -CONFIG_ZMK_DISPLAY=y +# CONFIG_ZMK_DISPLAY=y # Uncomment the following lines to enable per key RGB -CONFIG_ZMK_RGB_UNDERGLOW=y -CONFIG_WS2812_STRIP=y +# CONFIG_ZMK_RGB_UNDERGLOW=y +# CONFIG_WS2812_STRIP=y -CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 +# CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 CONFIG_ZMK_USB_LOGGING=y From ff8c15e6755859f72e17c0695b768bdc1849ff35 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 22:50:29 +0200 Subject: [PATCH 11/25] Update klor.keymap --- config/klor.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/klor.keymap b/config/klor.keymap index bdaf743..792e2f1 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -100,7 +100,7 @@ label= "BASE" ; //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC - &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &kp N &kp M &comma &dot &kp MINUS &kp RET + &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; From af0eec6794f29eee326e55621fa99962eba8a2ee Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 23:22:32 +0200 Subject: [PATCH 12/25] Update klor.conf --- config/klor.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/klor.conf b/config/klor.conf index ae342ee..2c8389d 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -11,3 +11,4 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 CONFIG_ZMK_USB_LOGGING=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y From 573690ebe1505a43e78db2477596c16305e87ff8 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 23:25:54 +0200 Subject: [PATCH 13/25] Update klor.conf --- config/klor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/klor.conf b/config/klor.conf index 2c8389d..596d820 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -11,4 +11,4 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 CONFIG_ZMK_USB_LOGGING=y -CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y +CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y From a87e750a9fd8bf4b2a99f2541cb5d7e1939f9b60 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 23:30:05 +0200 Subject: [PATCH 14/25] Update klor.conf --- config/klor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/klor.conf b/config/klor.conf index 596d820..5498e6d 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -11,4 +11,4 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 CONFIG_ZMK_USB_LOGGING=y -CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y +CONFIG_BT_CTLR_PHY_2M=y From 8719265864db981bbc39b90cdfd06f24e60f4b05 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 23:45:58 +0200 Subject: [PATCH 15/25] Update klor.keymap --- config/klor.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 792e2f1..4282299 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -98,8 +98,8 @@ label= "BASE" ; bindings = < //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC + &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL >; @@ -135,8 +135,8 @@ label= "NUMMERN" ; bindings = < //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans &rgb_ug RGB_EFF &kp UP &rgb_ug RGB_BRI &trans - &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &trans &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &trans + &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &bt BT_CLR + &trans &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &bt BT_NXT &trans &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; From 85236f047baf44a5708c135aae914356c8e6ed1d Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Wed, 15 May 2024 23:56:14 +0200 Subject: [PATCH 16/25] Update klor.conf --- config/klor.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/klor.conf b/config/klor.conf index 5498e6d..45dad2c 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -11,4 +11,5 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 CONFIG_ZMK_USB_LOGGING=y -CONFIG_BT_CTLR_PHY_2M=y +# CONFIG_BT_CTLR_PHY_2M=y +CONFIG_BT_CTLR_PHY_CODED=y From 107ac6c70b579ad96beacc4404791e9594a39d87 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Thu, 16 May 2024 00:03:54 +0200 Subject: [PATCH 17/25] Update klor.keymap --- config/klor.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 4282299..35ffb66 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -135,8 +135,8 @@ label= "NUMMERN" ; bindings = < //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans &rgb_ug RGB_EFF &kp UP &rgb_ug RGB_BRI &trans - &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &bt BT_CLR - &trans &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &bt BT_NXT + &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &bt BT_SEL 0 + &bt BT_CLR &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &bt BT_SEL 1 &trans &trans &trans &trans &trans &trans &trans &trans >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; From fa95ea3009eb82fccd13331a86a5362fe923bf6c Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Thu, 16 May 2024 12:48:10 +0200 Subject: [PATCH 18/25] Update klor.keymap --- config/klor.keymap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/klor.keymap b/config/klor.keymap index 35ffb66..1246d57 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -97,11 +97,11 @@ label= "BASE" ; // └───────────────────────────────────────────────────────────┘ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC - &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET - &kp LALT &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp RGUI &mo 1 &mo 2 &kp DEL + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P + &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC + &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET + &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp LALT &kp DEL &kp RGUI &mo 1 &mo 2 >; sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; }; From 8a2c20d372528b550d014822ed79d5a15316be05 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:29:23 +0200 Subject: [PATCH 19/25] Update klor.conf --- config/klor.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/klor.conf b/config/klor.conf index 45dad2c..603c8ac 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -10,6 +10,8 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_WS2812_STRIP=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 -CONFIG_ZMK_USB_LOGGING=y -# CONFIG_BT_CTLR_PHY_2M=y -CONFIG_BT_CTLR_PHY_CODED=y +# CONFIG_ZMK_USB_LOGGING=y +CONFIG_BT_CTLR_PHY_2M=n +# CONFIG_BT_CTLR_PHY_CODED=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y +CONFIG_BT_BAS=y From 379ecab279e8f9b43d60bfa5ced37f6f20d9ef53 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:32:43 +0200 Subject: [PATCH 20/25] Update klor.conf --- config/klor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/klor.conf b/config/klor.conf index 603c8ac..7a43838 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -13,5 +13,5 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_USB_LOGGING=y CONFIG_BT_CTLR_PHY_2M=n # CONFIG_BT_CTLR_PHY_CODED=y -CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y +# CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y CONFIG_BT_BAS=y From 49f1bdaef32dacebd3f370156a3b1a9c8edc2ce8 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:33:54 +0200 Subject: [PATCH 21/25] Update west.yml --- config/west.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/west.yml b/config/west.yml index 2d0dd95..175fa2f 100644 --- a/config/west.yml +++ b/config/west.yml @@ -9,7 +9,8 @@ manifest: projects: - name: zmk remote: zmkfirmware - revision: a1e0607a22deb72ce4ac64e442f0baa721e32b0b + revision: main + # a1e0607a22deb72ce4ac64e442f0baa721e32b0b import: app/west.yml self: path: config From dc1866f6c685cc34a797443de3c077678a8856a9 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:45:01 +0200 Subject: [PATCH 22/25] Update Kconfig.defconfig --- config/boards/shields/klor/Kconfig.defconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/boards/shields/klor/Kconfig.defconfig b/config/boards/shields/klor/Kconfig.defconfig index 480f469..91d0075 100644 --- a/config/boards/shields/klor/Kconfig.defconfig +++ b/config/boards/shields/klor/Kconfig.defconfig @@ -24,9 +24,6 @@ if ZMK_DISPLAY config SSD1306 default y - config SSD1306_REVERSE_MODE - default y - endif # ZMK_DISPLAY From 4e56ec1390da8b380a3f8ee68eb51a6e1af525c7 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:45:41 +0200 Subject: [PATCH 23/25] Update klor_common.dtsi --- config/boards/shields/klor/klor_common.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/config/boards/shields/klor/klor_common.dtsi b/config/boards/shields/klor/klor_common.dtsi index c52ab05..969cd12 100644 --- a/config/boards/shields/klor/klor_common.dtsi +++ b/config/boards/shields/klor/klor_common.dtsi @@ -56,5 +56,6 @@ display-offset = <0>; multiplex-ratio = <63>; prechargep = <0x22>; + inversion-on; }; }; From 7b5a5a8aece706fa15018e9d27e4fe47d3921fa3 Mon Sep 17 00:00:00 2001 From: schadenn <38312007+schadenn@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:52:33 +0200 Subject: [PATCH 24/25] Update klor.conf --- config/klor.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/klor.conf b/config/klor.conf index 7a43838..72cd8fe 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -11,7 +11,7 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 # CONFIG_ZMK_USB_LOGGING=y -CONFIG_BT_CTLR_PHY_2M=n +# CONFIG_BT_CTLR_PHY_2M=n # CONFIG_BT_CTLR_PHY_CODED=y -# CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y -CONFIG_BT_BAS=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y +# CONFIG_BT_BAS=y From 54a2c45948d11c5b75d268acfccb857e27da94d0 Mon Sep 17 00:00:00 2001 From: Dennis Schaller Date: Fri, 7 Jun 2024 10:19:00 +0200 Subject: [PATCH 25/25] revert changes from master --- build.yaml | 4 +- config/klor.conf | 13 ++--- config/klor.keymap | 116 +++++++++++++++++++++------------------------ config/west.yml | 7 +-- 4 files changed, 60 insertions(+), 80 deletions(-) diff --git a/build.yaml b/build.yaml index 0c5eb08..fc14f5b 100644 --- a/build.yaml +++ b/build.yaml @@ -17,5 +17,5 @@ include: shield: klor_left - board: nice_nano_v2 shield: klor_right - - board: nice_nano_v2 - shield: settings_reset +# - board: nice_nano_v2 +# shield: settings_reset \ No newline at end of file diff --git a/config/klor.conf b/config/klor.conf index 72cd8fe..9893b99 100644 --- a/config/klor.conf +++ b/config/klor.conf @@ -3,15 +3,10 @@ CONFIG_EC11=y CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # Uncomment the following line to enable the KLOR OLED Display -# CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_DISPLAY=y # Uncomment the following lines to enable per key RGB -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y +CONFIG_ZMK_RGB_UNDERGLOW=y +CONFIG_WS2812_STRIP=y -# CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 -# CONFIG_ZMK_USB_LOGGING=y -# CONFIG_BT_CTLR_PHY_2M=n -# CONFIG_BT_CTLR_PHY_CODED=y -CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y -# CONFIG_BT_BAS=y +CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=40 \ No newline at end of file diff --git a/config/klor.keymap b/config/klor.keymap index 1246d57..ca2f6a4 100644 --- a/config/klor.keymap +++ b/config/klor.keymap @@ -29,46 +29,15 @@ / { behaviors { - hm: homerow_mods { + hm: homerow_mods { compatible = "zmk,behavior-hold-tap"; label = "HOMEROW_MODS"; #binding-cells = <2>; - tapping-term-ms = <320>; - quick-tap-ms = <0>; + tapping-term-ms = <150>; + quick_tap_ms = <0>; flavor = "tap-preferred"; bindings = <&kp>, <&kp>; }; - comma: comma_semi { - compatible = "zmk,behavior-mod-morph"; - label = "comma_semi"; - #binding-cells = <0>; - bindings = <&kp COMMA>, <&kp SEMI>; - mods = <(MOD_LSFT)>; - }; - - dot: dot_colon { - compatible = "zmk,behavior-mod-morph"; - label = "dot_colon"; - #binding-cells = <0>; - bindings = <&kp DOT>, <&kp COLON>; - mods = <(MOD_LSFT)>; - }; - - quest: question_excl { - compatible = "zmk,behavior-mod-morph"; - label = "question_excl"; - #binding-cells = <0>; - bindings = <&kp QUESTION>, <&kp EXCL>; - mods = <(MOD_LSFT)>; - }; - - ctlalt: control_alt { - compatible = "zmk,behavior-mod-morph"; - label = "control_alt"; - #binding-cells = <0>; - bindings = <&kp LEFT_CONTROL>, <&kp LEFT_ALT>; - mods = <(MOD_RGUI)>; - }; }; @@ -79,13 +48,10 @@ key-positions = <0 1>; bindings = <&kp ESC>; }; - }; - - keymap { compatible = "zmk,keymap"; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ @@ -95,51 +61,75 @@ // ┌───────────────────────────────────────────────────────────┐ label= "BASE" ; // └───────────────────────────────────────────────────────────┘ - +/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ + │ Q │ W │ F │ P │ G │ │ J │ L │ U │ Y │ ; │ + ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ + │ TAB │ A │ R │ S │ T │ D │ │ H │ N │ E │ I │ O │ " │ + ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ + │ DEL │ Z │ X │ C │ V │ B ││ MUTE ││PLY/PSE ││ K │ M │ , │ . │ / │ \ │ + └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ + │ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │ + └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp Q &kp W &kp E &kp R &kp T &kp Z &kp U &kp I &kp O &kp P - &kp TAB &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &quest &kp BSPC - &kp ESC &kp Y &kp X &kp C &kp V &kp B &trans &trans &kp N &kp M &comma &dot &kp MINUS &kp RET - &kp LSHFT &hm LC(LS(LALT)) SPACE &kp LCTRL &kp LALT &kp DEL &kp RGUI &mo 1 &mo 2 + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &kp Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SEMI + &kp TAB &kp A &kp R &kp S &hm LSHFT T &kp D &kp H &hm RSHFT N &kp E &kp I &kp O &kp SQT + &kp DEL &kp Z &kp X &kp C &kp V &kp B &trans &trans &kp K &kp M &kp COMMA &kp DOT &kp FSLH &kp BSLH + &kp LCTRL &mo LOWER &kp SPACE &kp LALT &kp LGUI &kp RET &mo RAISE &kp BSPC >; - sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - signs_layer { + lower_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "ZEICHEN" ; +label= "LOWER" ; // └───────────────────────────────────────────────────────────┘ - +/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ + │ │ │ UP │ │ { │ │ } │ 7 │ 8 │ 9 │ + │ + ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ + │ │ │ LEFT │ DOWN │ RIGHT │ [ │ │ ] │ 4 │ 5 │ 6 │ - │ │ + ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ + │ │ │ P UP │ C LOCK │ P DOWN │ ( ││ ││ ││ ) │ 1 │ 2 │ 3 │ * │ │ + └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ + │ │ │ │ ││ │ │ 0 │ │ + └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &kp AT_SIGN &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPS &kp STAR &kp SEMI &kp PLUS &trans - &trans &trans &kp EQUAL &kp DQT &kp GRAVE &kp SQT &kp LPAR &kp RPAR &kp LT &kp GT &kp MINUS &trans - &trans &trans &kp TILDE &kp SLASH &kp BSLH &kp PIPE &trans &trans &kp LBRC &kp RBRC &kp LBKT &kp RBKT &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &ext_power EP_TOG &trans &kp UP &trans &kp LBRC &kp RBRC &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_PLUS + &trans &rgb_ug RGB_EFF &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_MINUS &trans + &trans &trans &kp PG_UP &kp CAPS &kp PG_DN &kp LPAR &trans &trans &kp RPAR &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_MULTIPLY &trans + &trans &trans &trans &trans &trans &kp DELETE &kp KP_N0 &trans >; - sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - num_layer { + raise_layer { // ┌───────────────────────────────────────────────────────────┐ -label= "NUMMERN" ; +label= "RAISE" ; // └───────────────────────────────────────────────────────────┘ - +/* ┌─────────┬─────────┬─────────┬─────────┬─────────┐ ┌─────────┬─────────┬─────────┬─────────┬─────────┐ + │ │ │ │ │ │ │ │ │ Ü │ │ │ + ┌─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┐ + │ Ä │ │ ß │ │ │ │ │ │ │ │ │ Ö │ │ + ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤╭────────╮╭────────╮├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤ + │ │ │ │ │ │ ││ ││ ││ │ │ │ │ │ │ + └─────────┴─────────┴─────────┼─────────┼─────────┼─────────┼╰────────╯╰────────╯┼─────────┼─────────┼─────────┼─────────┴─────────┴─────────┘ + │ ADJUST │ │ │ ││ │ │ │ │ + └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ bindings = < - //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ - &trans &kp N7 &kp N8 &kp N9 &kp MINUS &trans &rgb_ug RGB_EFF &kp UP &rgb_ug RGB_BRI &trans - &trans &trans &kp N4 &kp N5 &kp N6 &kp PLUS &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &bt BT_SEL 0 - &bt BT_CLR &kp N0 &kp N1 &kp N2 &kp N3 &mt COMMA DOT &trans &trans &trans &rgb_ug RGB_HUI &trans &rgb_ug RGB_BRD &trans &bt BT_SEL 1 - &trans &trans &trans &trans &trans &trans &trans &trans + //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ + &trans &trans &trans &trans &trans &trans &trans &kp RA(U) &trans &trans + &kp RA(A) &trans &kp RA(S) &trans &trans &trans &trans &trans &trans &trans &kp RA(O) &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &mo ADJUST &trans &trans &trans &trans &trans &trans &trans >; - sensor-bindings = <&inc_dec_kp TAB LS(TAB) &inc_dec_kp LS(TAB) TAB>; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; }; // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ @@ -168,4 +158,4 @@ label= "ADJUST" ; sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; }; }; -}; +}; \ No newline at end of file diff --git a/config/west.yml b/config/west.yml index 175fa2f..379d291 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,16 +1,11 @@ manifest: remotes: - - name: schadenn - url-base: https://github.com/schadenn - - name: MangoIV - url-base: https://github.com/MangoIV - name: zmkfirmware url-base: https://github.com/zmkfirmware projects: - name: zmk remote: zmkfirmware - revision: main - # a1e0607a22deb72ce4ac64e442f0baa721e32b0b + revision: main import: app/west.yml self: path: config