From d471b3d959368cb0d764bab2647179bbb5554d5d Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Sat, 10 Sep 2022 20:23:35 +0200 Subject: [PATCH] cleanup + fix key layout --- .../shields/leko_pona/Kconfig.defconfig | 2 +- .../boards/shields/leko_pona/leko_pona.dtsi | 7 +-- .../boards/shields/leko_pona/leko_pona.keymap | 11 ++-- config/corne.keymap | 56 ------------------- 4 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 config/corne.keymap diff --git a/config/boards/shields/leko_pona/Kconfig.defconfig b/config/boards/shields/leko_pona/Kconfig.defconfig index a93df94..ad53793 100644 --- a/config/boards/shields/leko_pona/Kconfig.defconfig +++ b/config/boards/shields/leko_pona/Kconfig.defconfig @@ -9,7 +9,7 @@ config ZMK_USB if SHIELD_LEKO_PONA_LEFT config ZMK_KEYBOARD_NAME - default "leko pona wan" + default "leko pona 1" config ZMK_SPLIT_ROLE_CENTRAL default y diff --git a/config/boards/shields/leko_pona/leko_pona.dtsi b/config/boards/shields/leko_pona/leko_pona.dtsi index f9d089f..47ac37b 100644 --- a/config/boards/shields/leko_pona/leko_pona.dtsi +++ b/config/boards/shields/leko_pona/leko_pona.dtsi @@ -10,15 +10,10 @@ compatible = "zmk,matrix-transform"; columns = <36>; rows = <1>; -// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | -// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | -// | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | -// | SW24 | SW23 | SW22 | SW21 | SW20 | SW19 | SW25 | | SW25 | SW19 | SW20 | SW21 | SW22 | SW23 | SW24 | -// | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | map = < RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,22) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,27) RC(0,26) RC(0,25) RC(0,24) RC(0,23) -RC(0,10) RC(0,11) RC(0,12) RC(0,12) RC(0,14) RC(0,32) RC(0,31) RC(0,30) RC(0,29) RC(0,28) +RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,32) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,15) RC(0,16) RC(0,17) RC(0,35) RC(0,34) RC(0,33) >; }; diff --git a/config/boards/shields/leko_pona/leko_pona.keymap b/config/boards/shields/leko_pona/leko_pona.keymap index c96ce45..53ad8a7 100644 --- a/config/boards/shields/leko_pona/leko_pona.keymap +++ b/config/boards/shields/leko_pona/leko_pona.keymap @@ -4,13 +4,12 @@ / { keymap { compatible = "zmk,keymap"; - default_layer { -// -------------------------------------------------------------------------------------------------------------------------------------------------------------------- -// | ESC | W | E | R | T | | Y | U | I | O | P | -// | A | S | D | F | G | | H | J | K | L | ; | -// | SHIFT | X | C | V | B | | M | , | . | / | R CTRL | -// | GUI | DEL | RETURN || TAB | BSPC | R ALT | +// -------------------------------------------------------------------------------------------------------------------------- +// | ESC | W | F | P | B | | J | L | U | Y | <- | +// | A | R | S | T | G | | M | N | E | I | O | +// | LCTRL | X | C | D | V | | K | H | Z | Q | RET | +// | LALT | L1 | SPACE || SHIFT | L2 | SUPER | bindings = < &kp ESC &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp BACKSPACE &kp A &kp R &kp S &kp T &kp G &kp M &kp N &kp E &kp I &kp O diff --git a/config/corne.keymap b/config/corne.keymap deleted file mode 100644 index 53218a8..0000000 --- a/config/corne.keymap +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | -// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC | -// | GUI | LWR | SPC | | ENT | RSE | ALT | - bindings = < - &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 SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC - &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT - >; - }; - lower_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | -// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | | -// | SHFT | | | | | | | | | | | | | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - - raise_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | -// | CTRL | | | | | | | - | = | [ | ] | \ | ` | -// | SHFT | | | | | | | _ | + | { | } | "|" | ~ | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &kp LSHFT &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - }; -};