From d801899376bb69a7da68815e49bd4a26f392ef23 Mon Sep 17 00:00:00 2001 From: Darren Victoriano Date: Fri, 7 Feb 2025 21:01:13 -0800 Subject: [PATCH] resolve conflivt --- config/corne.keymap | 9 ++++++--- images/config_keymap-drawer.yaml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index b16f064..37a33e7 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -7,6 +7,9 @@ #include #include +#define LOWER 1 +#define RAISE 2 + / { keymap { compatible = "zmk,keymap"; @@ -16,7 +19,7 @@ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp RET &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + &kp LGUI &mo LOWER &kp SPACE &kp SPACE &mo RAISE &kp RALT >; }; @@ -25,7 +28,7 @@ &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp DELETE &kp LCTRL &none &none &kp RC(RS(TAB)) &kp RC(TAB) &kp LG(LS(J)) &kp LEFT &kp DOWN &kp UP &kp RIGHT &none &kp RET &kp LSHFT &none &none &none &none &kp LG(LA(SPACE)) &kp C_VOL_DN &kp C_VOL_UP &none &none &none &kp RSHFT - &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + &kp LGUI &mo LOWER &kp SPACE &kp SPACE &mo RAISE &kp RALT >; }; @@ -34,7 +37,7 @@ &kp ESC &kp EXCL &kp AT &kp POUND &kp DOLLAR &kp PERCENT &kp CARET &kp AMPS &kp STAR &kp PLUS &kp EQUAL &kp DELETE &kp LCTRL &kp GRAVE &kp TILDE &kp LEFT_BRACE &kp LEFT_BRACKET &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS &kp RIGHT_BRACKET &kp RIGHT_BRACE &kp BACKSLASH &kp PIPE &kp RET &kp LSHFT &none &none &none &kp SQT &kp DOUBLE_QUOTES &kp UNDER &kp MINUS &none &none &none &kp RSHFT - &kp LGUI &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RALT + &kp LGUI &mo LOWER &kp SPACE &kp SPACE &mo RAISE &kp RALT >; }; }; diff --git a/images/config_keymap-drawer.yaml b/images/config_keymap-drawer.yaml index 2302ae4..acfc920 100644 --- a/images/config_keymap-drawer.yaml +++ b/images/config_keymap-drawer.yaml @@ -436,8 +436,8 @@ parse_config: RCMD: $$mdi:apple-keyboard-command$$ RGUI: $$mdi:apple-keyboard-command$$ LS(LC(LALT)): $$mdi:triangle$$ # Meh - 1: ⇣ - 2: ⇡ + LOWER: ⇣ + RAISE: ⇡ # Arrows UP: $$mdi:arrow-up-bold$$