From 4a588fb81fb181b8aef8e22a6279b73fd44de2d0 Mon Sep 17 00:00:00 2001 From: Marco Massarelli <60667061+ceoloide@users.noreply.github.com> Date: Sun, 7 Jan 2024 18:33:18 +0000 Subject: [PATCH] Reworked the skeleton configuration to align with existing boards --- .../shields/corney_island/Kconfig.defconfig | 4 +- boards/shields/corney_island/Kconfig.shield | 4 +- .../shields/corney_island/corney_island.conf | 13 +++- .../shields/corney_island/corney_island.dtsi | 18 +++--- .../corney_island/corney_island.keymap | 59 +++++++++++++++++++ .../corney_island/corney_island.zmk.yml | 1 - .../corney_island/corney_island_left.conf | 0 .../corney_island/corney_island_right.conf | 0 build.yaml | 4 +- 9 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 boards/shields/corney_island/corney_island.keymap create mode 100644 boards/shields/corney_island/corney_island_left.conf create mode 100644 boards/shields/corney_island/corney_island_right.conf diff --git a/boards/shields/corney_island/Kconfig.defconfig b/boards/shields/corney_island/Kconfig.defconfig index 6dcdad4..a19ea11 100644 --- a/boards/shields/corney_island/Kconfig.defconfig +++ b/boards/shields/corney_island/Kconfig.defconfig @@ -1,4 +1,4 @@ -if CORNEY_ISLAND_LEFT +if SHIELD_CORNEY_ISLAND_LEFT config ZMK_KEYBOARD_NAME default "Corney Island" @@ -8,7 +8,7 @@ config ZMK_SPLIT_ROLE_CENTRAL endif -if CORNEY_ISLAND_LEFT || CORNEY_ISLAND_RIGHT +if SHIELD_CORNEY_ISLAND_LEFT || SHIELD_CORNEY_ISLAND_RIGHT config ZMK_SPLIT default y diff --git a/boards/shields/corney_island/Kconfig.shield b/boards/shields/corney_island/Kconfig.shield index f67bf8c..ea21e9c 100644 --- a/boards/shields/corney_island/Kconfig.shield +++ b/boards/shields/corney_island/Kconfig.shield @@ -1,5 +1,5 @@ -config CORNEY_ISLAND_LEFT +config SHIELD_CORNEY_ISLAND_LEFT def_bool $(shields_list_contains,corney_island_left) -config CORNEY_ISLAND_RIGHT +config SHIELD_CORNEY_ISLAND_RIGHT def_bool $(shields_list_contains,corney_island_right) \ No newline at end of file diff --git a/boards/shields/corney_island/corney_island.conf b/boards/shields/corney_island/corney_island.conf index dcd95fe..b5d345f 100644 --- a/boards/shields/corney_island/corney_island.conf +++ b/boards/shields/corney_island/corney_island.conf @@ -1 +1,12 @@ -CONFIG_ZMK_SLEEP=y \ No newline at end of file +# Uncomment the following line to enable deep sleep +CONFIG_ZMK_SLEEP=y + +# Uncomment the following line to increase the keyboard's wireless range +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y + +# Enable eager debouncing +CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1 +CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=7 + +# Uncomment the following line to enable USB Logging (this increases power usage by a significant amount, turn it off when not in use) +# CONFIG_ZMK_USB_LOGGING=y \ No newline at end of file diff --git a/boards/shields/corney_island/corney_island.dtsi b/boards/shields/corney_island/corney_island.dtsi index 621aedb..35e3068 100644 --- a/boards/shields/corney_island/corney_island.dtsi +++ b/boards/shields/corney_island/corney_island.dtsi @@ -8,17 +8,17 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <16>; + columns = <12>; rows = <4>; -// | 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 | -// | SW29 | SW28 | SW27 | SW26 | | SW26 | SW27 | SW28 | SW29 | +// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | +// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | +// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | +// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | map = < -RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) -RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) -RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) - RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) + RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) >; }; diff --git a/boards/shields/corney_island/corney_island.keymap b/boards/shields/corney_island/corney_island.keymap new file mode 100644 index 0000000..27af18c --- /dev/null +++ b/boards/shields/corney_island/corney_island.keymap @@ -0,0 +1,59 @@ +/* + * 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 | + label = "Base"; + 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 | + label = "Lower"; + 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 | + label = "Raise"; + 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 + >; + }; + }; +}; \ No newline at end of file diff --git a/boards/shields/corney_island/corney_island.zmk.yml b/boards/shields/corney_island/corney_island.zmk.yml index 7b0e7c3..753059c 100644 --- a/boards/shields/corney_island/corney_island.zmk.yml +++ b/boards/shields/corney_island/corney_island.zmk.yml @@ -7,7 +7,6 @@ requires: [pro_micro] exposes: [i2c_oled] features: - keys - - display siblings: - corney_island_left - corney_island_right \ No newline at end of file diff --git a/boards/shields/corney_island/corney_island_left.conf b/boards/shields/corney_island/corney_island_left.conf new file mode 100644 index 0000000..e69de29 diff --git a/boards/shields/corney_island/corney_island_right.conf b/boards/shields/corney_island/corney_island_right.conf new file mode 100644 index 0000000..e69de29 diff --git a/build.yaml b/build.yaml index e6b2f94..601b404 100644 --- a/build.yaml +++ b/build.yaml @@ -18,7 +18,7 @@ # --- include: - - board: corney_island + - board: nice_nano_v2 shield: corney_island_left - - board: corney_island + - board: nice_nano_v2 shield: corney_island_right \ No newline at end of file