diff --git a/app/boards/arm/tornblue/CMakeLists.txt b/app/boards/arm/tornblue/CMakeLists.txt new file mode 100644 index 00000000..044f93cd --- /dev/null +++ b/app/boards/arm/tornblue/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +set_property(GLOBAL APPEND PROPERTY extra_post_build_commands + COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py + -c + -b 0x26000 + -f 0xADA52840 + -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2 + ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin +) diff --git a/app/boards/arm/tornblue/Kconfig.board b/app/boards/arm/tornblue/Kconfig.board new file mode 100644 index 00000000..2a03812f --- /dev/null +++ b/app/boards/arm/tornblue/Kconfig.board @@ -0,0 +1,12 @@ +# tornblue board configuration + +# Copyright (c) 2021 Richard Titmuss +# SPDX-License-Identifier: MIT + +config BOARD_TORNBLUE_LEFT + bool "tornblue_left" + depends on SOC_NRF52840_QIAA + +config BOARD_TORNBLUE_RIGHT + bool "tornblue_right" + depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/tornblue/Kconfig.defconfig b/app/boards/arm/tornblue/Kconfig.defconfig new file mode 100644 index 00000000..15fb6cbd --- /dev/null +++ b/app/boards/arm/tornblue/Kconfig.defconfig @@ -0,0 +1,45 @@ +if BOARD_TORNBLUE_LEFT + +config ZMK_KEYBOARD_NAME + default "Tornblue Left" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif + +if BOARD_TORNBLUE_RIGHT + +config ZMK_KEYBOARD_NAME + default "Tornblue Right" + +endif + +if BOARD_TORNBLUE_LEFT || BOARD_TORNBLUE_RIGHT + +config ZMK_SPLIT + default y + +if USB + +config USB_NRFX + default y + +config USB_DEVICE_STACK + default y + +endif # USB + +config BT_CTLR + default BT + +config ZMK_BLE + default y + +config ZMK_USB + default y + +config ZMK_BATTERY_VOLTAGE_DIVIDER + default y + +endif diff --git a/app/boards/arm/tornblue/README.md b/app/boards/arm/tornblue/README.md new file mode 100644 index 00000000..26f9f5a9 --- /dev/null +++ b/app/boards/arm/tornblue/README.md @@ -0,0 +1,13 @@ +# tornblue + +tornblue is a split keyboard with visible smt components. https://github.com/rtitmuss/tornblue. + +## Building tornblue ZMK firmware +``` +west build -p -d build/tornblue_left -b tornblue_left +``` + +``` +west build -p -d build/tornblue_right -b tornblue_right +``` + diff --git a/app/boards/arm/tornblue/board.cmake b/app/boards/arm/tornblue/board.cmake new file mode 100644 index 00000000..ae1e2607 --- /dev/null +++ b/app/boards/arm/tornblue/board.cmake @@ -0,0 +1,7 @@ +# Copyright (c) 2020 The ZMK Contributors +# SPDX-License-Identifier: MIT + +board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") + +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) +include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) diff --git a/app/boards/arm/tornblue/tornblue.dtsi b/app/boards/arm/tornblue/tornblue.dtsi new file mode 100644 index 00000000..314671cd --- /dev/null +++ b/app/boards/arm/tornblue/tornblue.dtsi @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2021 Richard Titmuss + * + * SPDX-License-Identifier: MIT + */ + +/dts-v1/; +#include +#include + +/ { + model = "tornblue"; + compatible = "tornblue"; + + chosen { + zephyr,code-partition = &code_partition; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + zmk,underglow = &led_strip; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; +// | 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 | SW22 | | SW22 | 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(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; + + leds { + compatible = "gpio-leds"; + led1: led1 { + gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; + label = "LED 1"; + }; + led2: led2 { + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; + label = "LED 2"; + }; + led3: led3 { + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; + label = "LED 3"; + }; + }; + + ext-power { + compatible = "zmk,ext-power-generic"; + label = "EXT_POWER"; + control-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; + }; + + vbatt { + compatible = "zmk,battery-voltage-divider"; + label = "BATTERY"; + io-channels = <&adc 1>; + output-ohms = <2000000>; + full-ohms = <(2000000 + 806000)>; + }; + + aliases { + led1 = &led1; + led2 = &led2; + led3 = &led3; + }; +}; + +&adc { + status = "okay"; +}; + +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&spi0 { + compatible = "nordic,nrf-spim"; + // Cannot be used together with i2c0 + status = "okay"; + mosi-pin = <23>; + // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. + sck-pin = <6>; + miso-pin = <8>; + + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + label = "WS2812"; + + // SPI + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + // WS2812 + chain-length = <6>; /* LED strip length */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + }; +}; + +&usbd { + status = "okay"; +}; + +&flash0 { + /* + * For more information, see: + * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html + */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + sd_partition: partition@0 { + label = "softdevice"; + reg = <0x00000000 0x00026000>; + }; + code_partition: partition@26000 { + label = "code_partition"; + reg = <0x00026000 0x000c6000>; + }; + + /* + * The flash starting at 0x000ec000 and ending at + * 0x000f3fff is reserved for use by the application. + */ + + /* + * Storage partition will be used by FCB/LittleFS/NVS + * if enabled. + */ + storage_partition: partition@ec000 { + label = "storage"; + reg = <0x000ec000 0x00008000>; + }; + + boot_partition: partition@f4000 { + label = "adafruit_boot"; + reg = <0x000f4000 0x0000c000>; + }; + }; +}; diff --git a/app/boards/arm/tornblue/tornblue.keymap b/app/boards/arm/tornblue/tornblue.keymap new file mode 100644 index 00000000..ed72896e --- /dev/null +++ b/app/boards/arm/tornblue/tornblue.keymap @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 Richard Titmuss + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include + +#define DEFAULT 0 +#define NAVI 1 + +/ { + 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 | +// | SPC | GUI | LWR | SPC | | ENT | RSE | ALT | ENT | + 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 SPACE &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT &kp RET + >; + + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + }; + }; + +}; diff --git a/app/boards/arm/tornblue/tornblue.yaml b/app/boards/arm/tornblue/tornblue.yaml new file mode 100644 index 00000000..61249a50 --- /dev/null +++ b/app/boards/arm/tornblue/tornblue.yaml @@ -0,0 +1,14 @@ +identifier: tornblue +name: Tornblue +type: mcu +arch: arm +toolchain: + - zephyr + - gnuarmemb +supported: + - adc + - usb_device + - ble + - ieee802154 + - pwm + - watchdog diff --git a/app/boards/arm/tornblue/tornblue_left.dts b/app/boards/arm/tornblue/tornblue_left.dts new file mode 100644 index 00000000..c9bfd800 --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_left.dts @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2021 Richard Titmuss + * + * SPDX-License-Identifier: MIT + */ + +#include "tornblue.dtsi" + +&kscan0 { + col-gpios + = <&gpio0 31 GPIO_ACTIVE_HIGH> + , <&gpio0 4 GPIO_ACTIVE_HIGH> + , <&gpio0 5 GPIO_ACTIVE_HIGH> + , <&gpio0 7 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 12 GPIO_ACTIVE_HIGH> + ; +}; + +/ { + left_encoder: encoder_left { + compatible = "alps,ec11"; + label = "LEFT_ENCODER"; + a-gpios = <&gpio0 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + b-gpios = <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + resolution = <4>; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&left_encoder>; + }; +}; + +&left_encoder { + status = "okay"; +}; diff --git a/app/boards/arm/tornblue/tornblue_left.keymap b/app/boards/arm/tornblue/tornblue_left.keymap new file mode 100644 index 00000000..d3fed8cd --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_left.keymap @@ -0,0 +1,4 @@ +// Copyright (c) 2021 Richard Titmuss +// SPDX-License-Identifier: MIT + +#include "tornblue.keymap" diff --git a/app/boards/arm/tornblue/tornblue_left_defconfig b/app/boards/arm/tornblue/tornblue_left_defconfig new file mode 100644 index 00000000..38b9af42 --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_left_defconfig @@ -0,0 +1,30 @@ +CONFIG_SOC_SERIES_NRF52X=y +CONFIG_SOC_NRF52840_QIAA=y +CONFIG_BOARD_TORNBLUE_LEFT=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable GPIO +CONFIG_GPIO=y + +CONFIG_USE_DT_CODE_PARTITION=y + +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y + +CONFIG_ZMK_RGB_UNDERGLOW=y +CONFIG_WS2812_STRIP=y + +CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=160 +CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3 + +CONFIG_EC11=y +CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y + +# Turn on logging, and set ZMK logging to debug output +#CONFIG_ZMK_USB_LOGGING=y diff --git a/app/boards/arm/tornblue/tornblue_right.dts b/app/boards/arm/tornblue/tornblue_right.dts new file mode 100644 index 00000000..2b62cb6d --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_right.dts @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2021 Richard Titmuss + * + * SPDX-License-Identifier: MIT + */ + +#include "tornblue.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&gpio0 12 GPIO_ACTIVE_HIGH> + , <&gpio1 9 GPIO_ACTIVE_HIGH> + , <&gpio0 7 GPIO_ACTIVE_HIGH> + , <&gpio0 5 GPIO_ACTIVE_HIGH> + , <&gpio0 4 GPIO_ACTIVE_HIGH> + , <&gpio0 31 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/boards/arm/tornblue/tornblue_right.keymap b/app/boards/arm/tornblue/tornblue_right.keymap new file mode 100644 index 00000000..d3fed8cd --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_right.keymap @@ -0,0 +1,4 @@ +// Copyright (c) 2021 Richard Titmuss +// SPDX-License-Identifier: MIT + +#include "tornblue.keymap" diff --git a/app/boards/arm/tornblue/tornblue_right_defconfig b/app/boards/arm/tornblue/tornblue_right_defconfig new file mode 100644 index 00000000..22750b7d --- /dev/null +++ b/app/boards/arm/tornblue/tornblue_right_defconfig @@ -0,0 +1,21 @@ +CONFIG_SOC_SERIES_NRF52X=y +CONFIG_SOC_NRF52840_QIAA=y +CONFIG_BOARD_TORNBLUE_RIGHT=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable GPIO +CONFIG_GPIO=y + +CONFIG_USE_DT_CODE_PARTITION=y + +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y + +# Turn on logging, and set ZMK logging to debug output +#CONFIG_ZMK_USB_LOGGING=y