Skip to content

Commit

Permalink
revert changes from master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Schaller committed Jun 7, 2024
1 parent 7b5a5a8 commit 54a2c45
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 80 deletions.
4 changes: 2 additions & 2 deletions build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 4 additions & 9 deletions config/klor.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
116 changes: 53 additions & 63 deletions config/klor.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)>;
};

};

Expand All @@ -79,13 +48,10 @@
key-positions = <0 1>;
bindings = <&kp ESC>;
};

};





keymap {
compatible = "zmk,keymap";
// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
Expand All @@ -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>;
};

// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
Expand Down Expand Up @@ -168,4 +158,4 @@ label= "ADJUST" ;
sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
};
};
};
};
7 changes: 1 addition & 6 deletions config/west.yml
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 54a2c45

Please sign in to comment.