From b25ec7a0a472f083c6545f48d283009a0c6e5940 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Sun, 20 Dec 2020 21:01:47 +0000 Subject: [PATCH] Finish port of itsybitsy and azarashi64 for testing --- keyboards/zmk-config/README.md | 4 ++ .../itsybitsy_nrf52840/CMakeLists.txt | 0 .../{ => arm}/itsybitsy_nrf52840/Kconfig | 0 .../itsybitsy_nrf52840/Kconfig.board | 0 .../itsybitsy_nrf52840/Kconfig.defconfig | 0 .../{ => arm}/itsybitsy_nrf52840/README.md | 0 .../{ => arm}/itsybitsy_nrf52840/board.cmake | 0 .../itsybitsy_nrf52840/itsybitsy_nrf52840.dts | 0 .../itsybitsy_nrf52840.yaml | 0 .../itsybitsy_nrf52840_defconfig | 0 .../shields/azarashi64/Kconfig.defconfig | 16 ++++++ .../boards/shields/azarashi64/Kconfig.shield | 8 +++ .../boards/shields/azarashi64/README.md | 3 ++ .../boards/shields/azarashi64/azarashi64.conf | 0 .../boards/shields/azarashi64/azarashi64.dtsi | 32 ++++++++++++ .../shields/azarashi64/azarashi64.keymap | 51 +++++++++++++++++++ .../shields/azarashi64/azarashi64_left.conf | 2 + .../azarashi64/azarashi64_left.overlay | 36 +++++++++++++ .../shields/azarashi64/azarashi64_right.conf | 2 + .../azarashi64/azarashi64_right.overlay | 44 ++++++++++++++++ 20 files changed, 198 insertions(+) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/CMakeLists.txt (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/Kconfig (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/Kconfig.board (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/Kconfig.defconfig (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/README.md (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/board.cmake (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/itsybitsy_nrf52840.dts (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/itsybitsy_nrf52840.yaml (100%) rename keyboards/zmk-config/config/boards/{ => arm}/itsybitsy_nrf52840/itsybitsy_nrf52840_defconfig (100%) create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.shield create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/README.md create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.conf create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.keymap create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.overlay create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf create mode 100644 keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.overlay diff --git a/keyboards/zmk-config/README.md b/keyboards/zmk-config/README.md index 19c6284b..2c923dca 100644 --- a/keyboards/zmk-config/README.md +++ b/keyboards/zmk-config/README.md @@ -10,6 +10,10 @@ Need to have the `zmk-config` directory mounted at `/workspaces/zmk-config` in D west build --board nice_nano -d build/tidbit -- -DSHIELD=tidbit -DZMK_CONFIG=/workspaces/zmk-config/keyboards/zmk-config/config +west build --board itsybitsy_nrf52840 -d build/azarashi64/left -- -DSHIELD=azarashi64_left -DZMK_CONFIG=/workspaces/zmk-config/keyboards/zmk-config/config + +west build --board itsybitsy_nrf52840 -d build/azarashi64/right -- -DSHIELD=azarashi64_right -DZMK_CONFIG=/workspaces/zmk-config/keyboards/zmk-config/config + west build --board nice_nano -d build/lily58/left -- -DSHIELD=lily58_left -DZMK_CONFIG=/workspaces/zmk-config/keyboards/zmk-config/config west build --board nice_nano -d build/lily58/right -- -DSHIELD=lily58_right -DZMK_CONFIG=/workspaces/zmk-config/keyboards/zmk-config/config diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/CMakeLists.txt b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/CMakeLists.txt similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/CMakeLists.txt rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/CMakeLists.txt diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig.board b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig.board similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig.board rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig.board diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig.defconfig b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig.defconfig similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/Kconfig.defconfig rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/Kconfig.defconfig diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/README.md b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/README.md similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/README.md rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/README.md diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/board.cmake b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/board.cmake similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/board.cmake rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/board.cmake diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840.dts b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840.dts similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840.dts rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840.dts diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840.yaml b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840.yaml similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840.yaml rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840.yaml diff --git a/keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840_defconfig b/keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840_defconfig similarity index 100% rename from keyboards/zmk-config/config/boards/itsybitsy_nrf52840/itsybitsy_nrf52840_defconfig rename to keyboards/zmk-config/config/boards/arm/itsybitsy_nrf52840/itsybitsy_nrf52840_defconfig diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig new file mode 100644 index 00000000..cb8310c9 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.defconfig @@ -0,0 +1,16 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_AZARASHI64_LEFT + +config ZMK_KEYBOARD_NAME + default "Azarashi64 Left" + +endif + +if SHIELD_AZARASHI64_RIGHT + +config ZMK_KEYBOARD_NAME + default "Azarashi64 Right" + +endif diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.shield b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.shield new file mode 100644 index 00000000..b69a7f0c --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_AZARASHI64_LEFT + def_bool $(shields_list_contains,azarashi64_left) + +config SHIELD_AZARASHI64_RIGHT + def_bool $(shields_list_contains,azarashi64_right) diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/README.md b/keyboards/zmk-config/config/boards/shields/azarashi64/README.md new file mode 100644 index 00000000..3bceede9 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/README.md @@ -0,0 +1,3 @@ +# azarashi64 + +Forked from https://github.com/nuxiom/zmk.git \ No newline at end of file diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.conf b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.conf new file mode 100644 index 00000000..e69de29b diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi new file mode 100644 index 00000000..a151f067 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.dtsi @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + + zmk,matrix_transform = &default_transform; + }; + + /* + * This transform correspondsto the 60% left without macro keypad and 65% right, even this + * combination of PCBs can have keys in different locations based on configuration. + */ + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <14>; + rows = <6>; + map = < +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(1,5) /**/ RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(2,5) /**/ RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(3,5) /**/ RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,13) +RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(4,5) /**/ RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) RC(3,13) +RC(4,0) RC(4,1) RC(4,2) RC(4,4) /**/ RC(4,7) RC(4,8) RC(4,9) RC(4,11) RC(4,12) RC(4,13) + >; + }; +}; diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.keymap b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.keymap new file mode 100644 index 00000000..2092e805 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64.keymap @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + +// ---------------------------------------------- ---------------------------------------------- +// | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BKSPC | +// | TAB | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | \ | +// | LCTRL | A | S | D | F | G | | H | J | K | L | ; | ' | ENTER | +// | SHIFT | Z | X | C | V | B | | N | M | , | . | / | RSHFT | UP | +// | LCTRL | LGUI | LALT | SPACE | | SPACE | RALT | FN | RCTRL | LFT | DWN | +// ------------------------------------------- ----------------------------------------------- + + default_layer { + bindings = < + &kp ESC &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 /**/ &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp MINUS &kp EQL &kp BKSP &kp BKSP + &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 RBKT &kp BSLH + &bt BT_CLR &kp A &kp S &kp D &kp F &kp G /**/ &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT &kp RET + &kp LSFT &kp Z &kp X &kp C &kp V &kp B /**/ &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT &kp UARW &mo 1 + &kp LCTL &kp LGUI &kp LALT &kp SPC /**/ &kp SPC &kp RALT &mo 1 &kp LARW &kp DARW &kp RARW + >; + }; + +// ---------------------------------------------- ---------------------------------------------- +// |BT_CLR| F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | +// | | BT-0 | BT-1| BT-2 | | | | | | | | | | | | +// | | | | | | | | | | | | | | | +// | | | | | | | | | | | | | | | +// | | | | | | | | | | | | | +// ------------------------------------------- ----------------------------------------------- + + fn_layer { + bindings = < + &bt BT_CLR &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 /**/ &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &bt BT_CLR + &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &trans &trans /**/ &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans /**/ &trans &trans &trans &trans &trans &trans + >; + }; + }; +}; diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf new file mode 100644 index 00000000..1e028a78 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.overlay b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.overlay new file mode 100644 index 00000000..ef60bd1f --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_left.overlay @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "azarashi64.dtsi" + +/ { + /* This kscan is for the 60% left half without macro keys the + * macro pad layout may require different column and row pins + */ + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "row2col"; + + + col-gpios + = <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + row-gpios + = <&gpio0 31 (GPIO_ACTIVE_HIGH)> + , <&gpio0 2 (GPIO_ACTIVE_HIGH)> + , <&gpio0 5 (GPIO_ACTIVE_HIGH)> + , <&gpio0 26 (GPIO_ACTIVE_HIGH)> + , <&gpio0 11 (GPIO_ACTIVE_HIGH)> + ; + }; +}; diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf new file mode 100644 index 00000000..990cf7c0 --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y diff --git a/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.overlay b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.overlay new file mode 100644 index 00000000..9ce6f62a --- /dev/null +++ b/keyboards/zmk-config/config/boards/shields/azarashi64/azarashi64_right.overlay @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "azarashi64.dtsi" + +&default_transform { + col-offset = <6>; +}; + +/ { + + /* This kscan is for the 65% right half the 60% right half + * may require different column and row pins + */ + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "row2col"; + + + + col-gpios + = <&gpio0 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio0 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + + row-gpios + = <&gpio0 12 (GPIO_ACTIVE_HIGH)> + , <&gpio0 3 (GPIO_ACTIVE_HIGH)> + , <&gpio0 30 (GPIO_ACTIVE_HIGH)> + , <&gpio0 2 (GPIO_ACTIVE_HIGH)> + , <&gpio0 31 (GPIO_ACTIVE_HIGH)> + ; + }; +};