diff --git a/README.md b/README.md index 27db73c..acbb626 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,9 @@ Web Site: [cornedeon.ru](https://cornedeon.ru) Prepare build environvent (devcontainer) as described in ZMK docs. -~& cd zmk-workspace/zmk && git clone https://github.com/alko-kbd/zmk-cornedeon54 && cd .. +~# cd zmk-workspace/zmk + +~zmk-workspace# git clone https://github.com/alko-kbd/zmk-cornedeon54 ~zmk-workspace$ devcontainer exec --workspace-folder ./zmk /bin/bash diff --git a/boards/shields/cornedeon54/Kconfig.defconfig b/boards/shields/cornedeon54/Kconfig.defconfig index 8412dbc..f3bd8ff 100644 --- a/boards/shields/cornedeon54/Kconfig.defconfig +++ b/boards/shields/cornedeon54/Kconfig.defconfig @@ -4,9 +4,6 @@ config ZMK_SPLIT if SHIELD_CORNEDEON54_DONGLE || SHIELD_CORNEDEON54_LEFT_CENTRAL -config ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS - default 2 - config ZMK_SPLIT_ROLE_CENTRAL default y @@ -19,4 +16,14 @@ config BT_MAX_PAIRED config ZMK_USB default y +if SHIELD_CORNEDEON54_DONGLE +config ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS + default 2 +endif + +if SHIELD_CORNEDEON54_LEFT_CENTRAL +config ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS + default 1 +endif + endif # CENTRAL diff --git a/build.sh b/build.sh index a4403ed..b03a166 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,7 @@ # Keyboard name KEYBOARD="cornedeon54" +BOARD="nice_nano" # Paths CONFIG_DIR="/workspaces/zmk/zmk-${KEYBOARD}/config" @@ -18,7 +19,7 @@ SHIELD="${KEYBOARD}_$1" echo "=== Build: ${SHIELD} ===" -west build -s app -p -b nice_nano -S studio-rpc-usb-uart -- \ +west build -s app -p -b ${BOARD} -S studio-rpc-usb-uart -- \ -DSHIELD="$SHIELD" \ -DZMK_CONFIG="$CONFIG_DIR" \ -DZMK_EXTRA_MODULES="$MODULES_DIR" \ diff --git a/config/cornedeon54.keymap b/config/cornedeon54.keymap index 90ac188..2963402 100644 --- a/config/cornedeon54.keymap +++ b/config/cornedeon54.keymap @@ -24,11 +24,11 @@ // | | | | LALT | MO(1) | SPC | | SPC | MO(2) | GUI | | | | bindings = < -&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC -&kp TAB &kp Q &kp W &kp E &kp R &mt GRAVE T &kp Y &kp U &kp I &kp O &mt LBKT P &kp BSLH -&kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT -&kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp N &mt RBKT M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &kp LALT &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RGUI +&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC +&kp TAB &kp Q &kp W &kp E &kp R &mt GRAVE T &kp Y &kp U &kp I &kp O &mt LBKT P &kp BSLH +&kp LSHFT &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT +&kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp N &mt RBKT M &kp COMMA &kp DOT &kp FSLH &kp RSHFT + &kp LALT &mo 1 &kp SPACE &kp SPACE &mo 2 &kp RGUI >; }; @@ -43,11 +43,11 @@ // | | | END | ALT | | RET | | RET | | GUI | | | | bindings = < -&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 -&kp TAB &kp TILDE &kp LPAR &kp RPAR &kp STAR &kp FSLH &kp N7 &kp N8 &kp N9 &kp N0 &kp INS &kp DEL -&kp TAB &none &kp LBKT &kp RBKT &kp PLUS &kp MINUS &kp N4 &kp N5 &kp N6 &kp DOT &kp FSLH &kp BSLH -&kp LSHFT &none &kp LBRC &kp RBRC &kp LT &kp GT &kp N1 &kp N2 &kp N3 &kp EQUAL &kp UNDER &kp RSHFT - &kp LALT &trans &kp RET &kp RET &trans &kp RGUI +&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 +&kp TAB &kp TILDE &kp LPAR &kp RPAR &kp STAR &kp FSLH &kp N7 &kp N8 &kp N9 &kp N0 &kp INS &kp DEL +&kp TAB &none &kp LBKT &kp RBKT &kp PLUS &kp MINUS &kp N4 &kp N5 &kp N6 &kp DOT &kp FSLH &kp BSLH +&kp LSHFT &none &kp LBRC &kp RBRC &kp LT &kp GT &kp N1 &kp N2 &kp N3 &kp EQUAL &kp UNDER &kp RSHFT + &kp LALT &trans &kp RET &kp RET &trans &kp RGUI >; }; @@ -62,11 +62,11 @@ // | | | | ALT | | RET | | RET | | CAPS | | | | bindings = < -&none &none &none &none &none &none &none &none &none &none &none &none -&none &none &none &none &kp UP &none &none &none &none &none &kp PSCRN &kp PAUSE_BREAK -&none &none &none &kp LEFT &none &kp RIGHT &none &none &none &none &kp KP_NUM &kp SLCK -&kp LSHFT &none &none &kp DOWN &none &none &none &none &none &kp K_MENU &kp RSHFT - &kp LALT &trans &kp RET &kp RET &trans &kp CAPS +&none &none &none &none &none &none &none &none &none &none &none &none +&none &none &none &none &kp UP &none &none &none &none &none &kp PSCRN &kp PAUSE_BREAK +&none &none &none &kp LEFT &none &kp RIGHT &none &none &none &none &kp KP_NUM &kp SLCK +&kp LSHFT &none &none &none &kp DOWN &none &none &none &none &none &kp K_MENU &kp RSHFT + &kp LALT &trans &kp RET &kp RET &trans &kp CAPS >; }; diff --git a/firmware/zmk_cornedeon54_left_central.uf2 b/firmware/zmk_cornedeon54_left_central.uf2 index 433a2cb..0282798 100644 Binary files a/firmware/zmk_cornedeon54_left_central.uf2 and b/firmware/zmk_cornedeon54_left_central.uf2 differ