From fa8772b928f329634db4054d7e06047ef867ed20 Mon Sep 17 00:00:00 2001 From: Temur Beisov Date: Mon, 31 Jan 2022 15:19:32 +0300 Subject: [PATCH] lotus58 keymap update PR fix --- app/boards/shields/lotus58/Kconfig.defconfig | 2 +- app/boards/shields/lotus58/Kconfig.shield | 2 +- app/boards/shields/lotus58/lotus58.conf | 2 +- app/boards/shields/lotus58/lotus58.dtsi | 2 +- app/boards/shields/lotus58/lotus58.keymap | 79 +++++++++++++------ app/boards/shields/lotus58/lotus58_left.conf | 2 - .../shields/lotus58/lotus58_left.overlay | 2 +- app/boards/shields/lotus58/lotus58_right.conf | 2 - .../shields/lotus58/lotus58_right.overlay | 2 +- 9 files changed, 62 insertions(+), 33 deletions(-) delete mode 100644 app/boards/shields/lotus58/lotus58_left.conf delete mode 100644 app/boards/shields/lotus58/lotus58_right.conf diff --git a/app/boards/shields/lotus58/Kconfig.defconfig b/app/boards/shields/lotus58/Kconfig.defconfig index 367c825b..f0d35f4d 100644 --- a/app/boards/shields/lotus58/Kconfig.defconfig +++ b/app/boards/shields/lotus58/Kconfig.defconfig @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Temur Beissov +# Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT if SHIELD_LOTUS58_LEFT diff --git a/app/boards/shields/lotus58/Kconfig.shield b/app/boards/shields/lotus58/Kconfig.shield index ecfe647b..dbf7ba01 100644 --- a/app/boards/shields/lotus58/Kconfig.shield +++ b/app/boards/shields/lotus58/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Temur Beissov +# Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_LOTUS58_LEFT diff --git a/app/boards/shields/lotus58/lotus58.conf b/app/boards/shields/lotus58/lotus58.conf index 8798a914..193f1ab4 100644 --- a/app/boards/shields/lotus58/lotus58.conf +++ b/app/boards/shields/lotus58/lotus58.conf @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Temur Beissov +# Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT # Uncomment the following line to enable the Lotus58 OLED Display diff --git a/app/boards/shields/lotus58/lotus58.dtsi b/app/boards/shields/lotus58/lotus58.dtsi index 2d36062a..fb0d174f 100644 --- a/app/boards/shields/lotus58/lotus58.dtsi +++ b/app/boards/shields/lotus58/lotus58.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Temur Beissov + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/lotus58/lotus58.keymap b/app/boards/shields/lotus58/lotus58.keymap index 8c034621..cfe4342c 100644 --- a/app/boards/shields/lotus58/lotus58.keymap +++ b/app/boards/shields/lotus58/lotus58.keymap @@ -10,29 +10,62 @@ #include / { + combos { + compatible = "zmk,combos"; + combo_dsklg { + timeout-ms = <100>; + key-positions = <24 52>; + layers = <0>; + bindings = <&kp LGUI>; + }; + }; + + behaviors { + fofunc: four_ffour { + compatible = "zmk,behavior-mod-morph"; + label = "FOUR_FUNCFOUR"; + #binding-cells = <0>; + bindings = <&kp N4>, <&kp F4>; + mods = <(MOD_LALT|MOD_RALT)>; + }; + sleft: s_left { + compatible = "zmk,behavior-mod-morph"; + label = "S_LEFT"; + #binding-cells = <0>; + bindings = <&kp S>, <&kp LEFT>; + mods = <(MOD_LGUI|MOD_RGUI)>; + }; + fright: f_right { + compatible = "zmk,behavior-mod-morph"; + label = "R_RIGHT"; + #binding-cells = <0>; + bindings = <&kp F>, <&kp RIGHT>; + mods = <(MOD_LGUI|MOD_RGUI)>; + }; + }; + keymap { compatible = "zmk,keymap"; default_layer { -// ------------------------------------------------------------------------------------------------------------ -// | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | = | -// | TAB | Q | W | E | R | T | | Y | U | I | O | P | [ | -// | SFT | A | S | D | F | G | RESET | | RESET | H | J | K | L | ; | ' SFT | -// | CTRL | Z | X | C | V | B | MUTE | | PLAY | N | M | , | . | / | \ CTRL| -// |ENT RS| ALT | SPACE|DELETE LW| |ENTER RS| BSPC | ] LW | RGUI | +// ------------------------------------------------------------------------------------------------------------ +// 0| ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | = | 11 +// 12| TAB | Q | W | E | R | T | | Y | U | I | O | P | [ | 23 +// 24| SFT | A | S | D | F | G | RESET | | RESET | H | J | K | L | ; | ' SFT | 37 +// 38| CTRL | Z | X | C | V | B | MUTE | | PLAY | N | M | , | . | / | \ CTRL| 51 +// 52 |ENT RS| ALT | SPACE|DELETE LW| |ENTER RS| BSPC | ] LW | RGUI | 59 bindings = < -&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp EQUAL +&kp ESC &kp N1 &kp N2 &kp N3 &fofunc &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp EQUAL &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT -&kp LSHFT &kp A &kp S &kp D &kp F &kp G &reset &reset &kp H &kp J &kp K &kp L &kp SEMI &mt RSHFT SQT +&kp LSHFT &kp A &sleft &kp D &fright &kp G &reset &reset &kp H &kp J &kp K &kp L &kp SEMI &mt RSHFT SQT &kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp C_MUTE &kp C_PP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RCTRL BSLH - < 2 RET &kp LALT &kp SPACE < 1 DEL < 2 RET &kp BSPC < 1 RBKT &kp RGUI + < 2 RET &kp LALT &kp SPACE < 1 DEL < 2 RET &kp BSPC < 1 RBKT &kp LGUI >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>; + sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>; }; lower_layer { -// TODO: Some binds are waiting for shifted keycode support. // ------------------------------------------------------------------------------------------------------------ // | ` | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | // | | ! | HOME| ^ | END | % | | VOL^ | PGUP | INS | ^ | PSCR | - | @@ -47,25 +80,25 @@ &kp F11 &trans &trans &trans &trans &trans &trans &kp F12 >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp C_NEXT C_PREV>; + sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp C_NEXT C_PREV>; }; raise_layer { // ------------------------------------------------------------------------------------------------------------ -// |BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | -// |OUTTG| INS | PSCR | GUI | RESET | | | PGUP | | ^ | | | | -// | | ALT | CTRL | SHIFT | FLASH | CAPS | | PGDN | <- | v | -> | DEL | BSPC | -// | | UNDO | CUT | COPY | PASTE | | | | | | | | | | | -// | | | | | | | | | | | | +// |BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | |OUTTOG|OUTUSB| OUTBT | | RESET | FLASH | +// | | INS | PSCR | GUI | RESET | | | PGUP | | ^ | | | | +// | | ALT | CTRL | SHIFT | FLASH | CAPS | | | | PGDN | <- | v | -> | DEL | BSPC | +// | | UNDO | CUT | COPY | PASTE | | | | | | |> | <|<| | |>|> | | | +// | | | | | | | | | | bindings = < -&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans -&out OUT_TOG &kp INS &kp PSCRN &kp K_CMENU &reset &trans &kp PG_UP &trans &kp UP &trans &kp N0 &trans -&trans &kp LALT &kp LCTRL &kp LSHFT &bootloader &kp CLCK &trans &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp DEL &kp BSPC -&trans &kp K_UNDO &kp K_CUT &kp K_COPY &kp K_PASTE &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans +&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &out OUT_TOG &out OUT_USB &out OUT_BLE &trans &reset &bootloader +&trans &kp INS &kp PSCRN &kp K_CMENU &reset &trans &kp PG_UP &trans &kp UP &trans &trans &trans +&trans &kp LALT &kp LCTRL &kp LSHFT &bootloader &kp CLCK &trans &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &kp DEL &kp BSPC +&trans &kp K_UNDO &kp K_CUT &kp K_COPY &kp K_PASTE &trans &trans &trans &trans &kp C_PP &kp C_PREV &kp C_NEXT &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>; + sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>; }; }; }; diff --git a/app/boards/shields/lotus58/lotus58_left.conf b/app/boards/shields/lotus58/lotus58_left.conf deleted file mode 100644 index a8176451..00000000 --- a/app/boards/shields/lotus58/lotus58_left.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) 2022 Temur Beissov -# SPDX-License-Identifier: MIT diff --git a/app/boards/shields/lotus58/lotus58_left.overlay b/app/boards/shields/lotus58/lotus58_left.overlay index ca3c7374..9755ae0b 100644 --- a/app/boards/shields/lotus58/lotus58_left.overlay +++ b/app/boards/shields/lotus58/lotus58_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Temur Beissov + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/lotus58/lotus58_right.conf b/app/boards/shields/lotus58/lotus58_right.conf deleted file mode 100644 index a8176451..00000000 --- a/app/boards/shields/lotus58/lotus58_right.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) 2022 Temur Beissov -# SPDX-License-Identifier: MIT diff --git a/app/boards/shields/lotus58/lotus58_right.overlay b/app/boards/shields/lotus58/lotus58_right.overlay index 54043cd8..dffcaeb1 100644 --- a/app/boards/shields/lotus58/lotus58_right.overlay +++ b/app/boards/shields/lotus58/lotus58_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Temur Beissov + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */