From 07d6a390d012f52264537b9090e58f3171d0573b Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:33:11 -0500 Subject: [PATCH 1/9] add summer breeze --- .../shields/summer_breeze/Kconfig.defconfig | 24 +++++++ .../shields/summer_breeze/Kconfig.shield | 8 +++ .../shields/summer_breeze/summer_breeze.conf | 0 .../shields/summer_breeze/summer_breeze.dtsi | 54 +++++++++++++++ .../summer_breeze/summer_breeze.keymap | 66 +++++++++++++++++++ .../summer_breeze/summer_breeze_left.conf | 1 + .../summer_breeze/summer_breeze_left.overlay | 18 +++++ .../summer_breeze/summer_breeze_right.conf | 1 + .../summer_breeze/summer_breeze_right.overlay | 21 ++++++ 9 files changed, 193 insertions(+) create mode 100644 app/boards/shields/summer_breeze/Kconfig.defconfig create mode 100644 app/boards/shields/summer_breeze/Kconfig.shield create mode 100644 app/boards/shields/summer_breeze/summer_breeze.conf create mode 100644 app/boards/shields/summer_breeze/summer_breeze.dtsi create mode 100644 app/boards/shields/summer_breeze/summer_breeze.keymap create mode 100644 app/boards/shields/summer_breeze/summer_breeze_left.conf create mode 100644 app/boards/shields/summer_breeze/summer_breeze_left.overlay create mode 100644 app/boards/shields/summer_breeze/summer_breeze_right.conf create mode 100644 app/boards/shields/summer_breeze/summer_breeze_right.overlay diff --git a/app/boards/shields/summer_breeze/Kconfig.defconfig b/app/boards/shields/summer_breeze/Kconfig.defconfig new file mode 100644 index 00000000..f28647ec --- /dev/null +++ b/app/boards/shields/summer_breeze/Kconfig.defconfig @@ -0,0 +1,24 @@ + +if SHIELD_SUMMER_BREEZE_LEFT + +config ZMK_KEYBOARD_NAME + default "SBreeze Left" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif + +if SHIELD_SUMMER_BREEZE_RIGHT + +config ZMK_KEYBOARD_NAME + default "SBreeze Right" + +endif + +if SHIELD_SUMMER_BREEZE_LEFT || SHIELD_SUMMER_BREEZE_RIGHT + +config ZMK_SPLIT + default y + +endif diff --git a/app/boards/shields/summer_breeze/Kconfig.shield b/app/boards/shields/summer_breeze/Kconfig.shield new file mode 100644 index 00000000..6a852bd9 --- /dev/null +++ b/app/boards/shields/summer_breeze/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_SUMMER_BREEZE_LEFT + def_bool $(shields_list_contains,summer_breeze_left) + +config SHIELD_SUMMER_BREEZE_RIGHT + def_bool $(shields_list_contains,summer_breeze_right) diff --git a/app/boards/shields/summer_breeze/summer_breeze.conf b/app/boards/shields/summer_breeze/summer_breeze.conf new file mode 100644 index 00000000..e69de29b diff --git a/app/boards/shields/summer_breeze/summer_breeze.dtsi b/app/boards/shields/summer_breeze/summer_breeze.dtsi new file mode 100644 index 00000000..d4d0c05e --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze.dtsi @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <9>; + rows = <10>; + +// | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | MC0 | MC1 | MC2 | +// | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | MC3 | MC4 | MC5 | +// | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | | AUP | | +// | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | ALT | ADN | ART | +// | LT0 | LT1 | LT2 | LT3 | RT0 | RT1 | RT2 | RT3 + + map = < +RC(0,8) RC(0,7) RC(0,6) RC(0,5) RC(0,4) RC(0,3) RC(0,2) RC(0,1) RC(0,0) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) RC(5,6) RC(5,7) RC(5,8) +RC(1,8) RC(1,7) RC(1,6) RC(1,5) RC(1,4) RC(1,3) RC(1,2) RC(1,1) RC(1,0) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) RC(6,6) RC(6,7) RC(6,8) + RC(2,7) RC(2,5) RC(2,4) RC(2,3) RC(2,2) RC(2,1) RC(2,0) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5) RC(7,7) +RC(3,8) RC(3,7) RC(3,6) RC(3,5) RC(3,4) RC(3,3) RC(3,2) RC(3,1) RC(3,0) RC(8,0) RC(8,1) RC(8,2) RC(8,3) RC(8,4) RC(8,5) RC(8,6) RC(8,7) RC(8,8) + RC(4,3) RC(4,2) RC(4,1) RC(4,0) RC(9,0) RC(9,1) RC(9,2) RC(9,3) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + + col-gpios + = <&pro_micro_d 16 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 2 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 3 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 4 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 5 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 6 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 7 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 8 GPIO_ACTIVE_HIGH> + , <&pro_micro_d 9 GPIO_ACTIVE_HIGH> + ; + + }; +}; diff --git a/app/boards/shields/summer_breeze/summer_breeze.keymap b/app/boards/shields/summer_breeze/summer_breeze.keymap new file mode 100644 index 00000000..8d6e2592 --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze.keymap @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { + +// Ref: https://zmkfirmware.dev/docs/codes/ + +// ----------------------------------------------------------------------------------------------------------------// | F1 | F2 | F3 |// | F1 | F2 | F3 | | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | DEL | | - | = |mo(2) | +// | F4 | F5 | F6 | | TAB | Q | W | E | R | T | | Y | U | I | O | P | ` | | [ | ] | \ | +// | | W | | | CAPS | A | S | D | F | G | | H | J | K | L | ; | ' | | | UP | | +// | A | S | D | | SHIFT | Z | X | C | V | B | | N | M | , | . | / | BSPC | | L | DN | R | +// | CTRL | GUI | ALT | SPACE | | ENTER |SHIFT | CTRL | mo(1) | + bindings = < +&kp F1 &kp F2 &kp F3 &gresc &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp DEL &kp MINUS &kp EQUAL &mo 2 +&kp F4 &kp F5 &kp F6 &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp GRAVE &kp LBKT &kp RBKT &kp BSLH + &kp W &kp CAPS &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS &kp UP +&kp A &kp S &kp D &kp RSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp BSPC &kp LEFT &kp DOWN &kp RIGHT + &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RET &mo 1 &kp RCTRL &mo 1 + >; + }; + + layer1 { +// ---------------------------------------------------------------------------------------------------------------------------------- +// | | | | | BTCLR | BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | | | | | +// | | | | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | | Mute | Play | +// | | | | | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | ~ | | | Vol+ | | +// | | | | | | | | | | | | | _ | + | { | } | "|" | | Prev | Vol- | Next | +// | | | | | | | | | | + bindings = < +&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 &trans &trans &trans &kp MINUS &kp EQUAL &trans &trans &trans &trans +&trans &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp LBKT &kp RBKT &kp BSLH &trans &kp C_MUTE &kp C_PLAY_PAUSE + &trans &kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp TILDE &kp C_VOL_UP +&trans &trans &trans &trans &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans &trans &trans &kp MINUS &kp KP_PLUS &kp LBRC &kp RBRC &kp RSHFT &kp C_PREV &kp C_VOL_DN &kp C_NEXT + &trans &trans &trans &trans &trans &trans &trans &trans + >; + }; + + layer2 { +// ---------------------------------------------------------------------------------------------------------------------------------- +// | | | | | | | | | | | | | | | | | | | | | | +// | | | | | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | | | | | +// | | | | | F1 | F2 | F3 | F4 | F5 | F6 | | | <- | ^ | v | -> | | | | | | +// | | | | | F7 | F8 | F9 | F10 | F11 | F12 | | + | - | = | [ | ] | \ | | | | | +// | | | | | | | | | | + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans &trans &trans &trans + &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans +&trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans + >; + }; + }; +}; diff --git a/app/boards/shields/summer_breeze/summer_breeze_left.conf b/app/boards/shields/summer_breeze/summer_breeze_left.conf new file mode 100644 index 00000000..b7db2541 --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze_left.conf @@ -0,0 +1 @@ +# Empty diff --git a/app/boards/shields/summer_breeze/summer_breeze_left.overlay b/app/boards/shields/summer_breeze/summer_breeze_left.overlay new file mode 100644 index 00000000..d0fa1473 --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze_left.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "summer_breeze.dtsi" + +&kscan0 { + row-gpios + = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + +}; diff --git a/app/boards/shields/summer_breeze/summer_breeze_right.conf b/app/boards/shields/summer_breeze/summer_breeze_right.conf new file mode 100644 index 00000000..b7db2541 --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze_right.conf @@ -0,0 +1 @@ +# Empty diff --git a/app/boards/shields/summer_breeze/summer_breeze_right.overlay b/app/boards/shields/summer_breeze/summer_breeze_right.overlay new file mode 100644 index 00000000..b41ccc0b --- /dev/null +++ b/app/boards/shields/summer_breeze/summer_breeze_right.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "summer_breeze.dtsi" + +&default_transform { + row-offset = <5>; +}; + +&kscan0 { + row-gpios + = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; +}; From a8fe8f28592ac1d155e10f142e02ade1c453843e Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:34:44 -0500 Subject: [PATCH 2/9] Commit to trigger builds --- app/boards/shields/summer_breeze/summer_breeze.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/summer_breeze/summer_breeze.keymap b/app/boards/shields/summer_breeze/summer_breeze.keymap index 8d6e2592..10c9db13 100644 --- a/app/boards/shields/summer_breeze/summer_breeze.keymap +++ b/app/boards/shields/summer_breeze/summer_breeze.keymap @@ -26,7 +26,7 @@ &kp F1 &kp F2 &kp F3 &gresc &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp DEL &kp MINUS &kp EQUAL &mo 2 &kp F4 &kp F5 &kp F6 &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp GRAVE &kp LBKT &kp RBKT &kp BSLH &kp W &kp CAPS &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS &kp UP -&kp A &kp S &kp D &kp RSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp BSPC &kp LEFT &kp DOWN &kp RIGHT +&kp A &kp S &kp D &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp BSPC &kp LEFT &kp DOWN &kp RIGHT &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RET &mo 1 &kp RCTRL &mo 1 >; }; From 9f4d0dad5700235d2ffa38954df2e31406312875 Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:03:34 -0500 Subject: [PATCH 3/9] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b790b665..3c8473e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: - nrfmicro_13 - proton_c shield: + - summer_breeze_left + - Summer_breeze_right - bfo9000_left - bfo9000_right - boardsource3x4 From 137ae6ae48ed8d7f6f758ae54a5c6a301c52e76d Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:05:30 -0500 Subject: [PATCH 4/9] build only owned boards --- .github/workflows/build.yml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c8473e1..a64bac7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,42 +26,15 @@ jobs: shield: - summer_breeze_left - Summer_breeze_right - - bfo9000_left - - bfo9000_right - - boardsource3x4 - corne_left - corne_right - - cradio_left - - cradio_right - - crbn - - eek - - helix_left - - helix_right - iris_left - iris_right - - jian_left - - jian_right - - jorne_left - - jorne_right - kyria_left - kyria_right - lily58_left - lily58_right - - microdox_left - - microdox_right - nibble - - qaz - - quefrency_left - - quefrency_right - - reviung41 - - romac - - romac_plus - - settings_reset - - sofle_left - - sofle_right - - splitreus62_left - - splitreus62_right - - tg4x - tidbit cmake-args: [""] include: From 028a8d75ac121159e950bedd4f7f837e0288e57c Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:08:08 -0500 Subject: [PATCH 5/9] Update build.yml --- .github/workflows/build.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a64bac7b..44de69b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,24 +18,13 @@ jobs: strategy: matrix: board: - - bluemicro840_v1 - - nice_nano - nice_nano_v2 - - nrfmicro_13 - - proton_c shield: - summer_breeze_left - Summer_breeze_right - corne_left - corne_right - - iris_left - - iris_right - - kyria_left - - kyria_right - - lily58_left - - lily58_right - nibble - - tidbit cmake-args: [""] include: - board: bdn9_rev2 From 8e34eb56333e9ec1f4ac0ace3b7a23de0d518320 Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:12:48 -0500 Subject: [PATCH 6/9] idk what i'm doing really --- .github/workflows/build.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44de69b2..530d3a57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,26 +21,19 @@ jobs: - nice_nano_v2 shield: - summer_breeze_left - - Summer_breeze_right + - summer_breeze_right - corne_left - corne_right - nibble cmake-args: [""] include: - - board: bdn9_rev2 - - board: dz60rgb_rev1 - - board: nrf52840_m2 - shield: m60 - - board: planck_rev6 - - board: proton_c - shield: clueboard_california - board: nice_nano_v2 - shield: kyria_left - cmake-args: -DCONFIG_ZMK_DISPLAY=y + shield: summer_breeze_right + cmake-args: -DCONFIG_ZMK_DISPLAY=n skip-archive: true - board: nice_nano_v2 - shield: kyria_right - cmake-args: -DCONFIG_ZMK_DISPLAY=y + shield: summer_breeze_left + cmake-args: -DCONFIG_ZMK_DISPLAY=n skip-archive: true steps: - name: Checkout From 82413cba34311c6b76d02e953853a8e9e20f0d17 Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:19:15 -0500 Subject: [PATCH 7/9] Update corne.conf --- app/boards/shields/corne/corne.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/boards/shields/corne/corne.conf b/app/boards/shields/corne/corne.conf index 974243c8..d6803d35 100644 --- a/app/boards/shields/corne/corne.conf +++ b/app/boards/shields/corne/corne.conf @@ -1,6 +1,7 @@ # Uncomment the following lines to enable the Corne RGB Underglow -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y +CONFIG_ZMK_RGB_UNDERGLOW=n +CONFIG_WS2812_STRIP=n # Uncomment the following line to enable the Corne OLED Display -# CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_DISPLAY=n +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y From 144f2c4b42895d66d8e3ba88422a60368ef8dd51 Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:19:51 -0500 Subject: [PATCH 8/9] Update corne.keymap --- app/boards/shields/corne/corne.keymap | 39 ++++++++++++++++++++------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/app/boards/shields/corne/corne.keymap b/app/boards/shields/corne/corne.keymap index 53218a86..6543177a 100644 --- a/app/boards/shields/corne/corne.keymap +++ b/app/boards/shields/corne/corne.keymap @@ -7,7 +7,11 @@ #include #include #include - +#define DEFAULT 0 +#define LOWER 1 +#define RAISE 2 +#define ADJUST 3 +&mt { tapping-term-ms = <450>;}; / { keymap { compatible = "zmk,keymap"; @@ -19,10 +23,10 @@ // | 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 EQUAL &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp MINUS &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 + &mt LSHIFT LEFT_BRACKET &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RIGHT_SHIFT RIGHT_BRACKET + &kp LGUI &kp BSPC < LOWER DEL < RAISE RET &kp SPACE &kp TAB >; }; lower_layer { @@ -32,10 +36,10 @@ // | 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 + &kp ESCAPE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp GRAVE + &kp LCTRL &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans + &mt LSHIFT LEFT_BRACE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &mt RIGHT_SHIFT RIGHT_BRACE + &kp RGUI &trans &mo ADJUST &kp RET &trans &kp RALT >; }; @@ -46,11 +50,26 @@ // | 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 TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp GRAVE &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 + &kp LALT &trans &mo ADJUST &kp RET &trans &kp RALT >; }; + + adjust_layer { +// ----------------------------------------------------------------------------------------- +// | bt next | bt 1 | bt2 | bt3 | bt4 | bt5 | | ^ | & | * | ( | ) | BKSP | +// | CTRL | | | | | | | - | = | [ | ] | \ | ` | +// | SHFT | | | | | bt clr | | _ | + | { | } | "|" | ~ | +// | GUI | | SPC | | ENT | | ALT | + bindings = < + &bt BT_NXT &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC + &trans &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE + &trans &trans &bt BT_CLR &reset &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + + &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + >; + }; }; }; From 2e66f8ad577072b29984db187aafdc2d637f1dab Mon Sep 17 00:00:00 2001 From: plentiful-bryan <52982883+plentiful-bryan@users.noreply.github.com> Date: Wed, 12 Jan 2022 13:20:37 -0500 Subject: [PATCH 9/9] i think it works now? --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 530d3a57..f2249cb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,6 @@ jobs: board: - nice_nano_v2 shield: - - summer_breeze_left - - summer_breeze_right - corne_left - corne_right - nibble