From 90a29f23a4145dcf2cdb135344147bbb626e4b9c Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 21:47:59 -0600 Subject: [PATCH 01/14] feat: Added the board sparkfun micromod nrf52840 and the micromod interconnect --- .../sparkfun_micromod_nrf52840/CMakeLists.txt | 11 ++ .../arm/sparkfun_micromod_nrf52840/Kconfig | 8 + .../sparkfun_micromod_nrf52840/Kconfig.board | 7 + .../Kconfig.defconfig | 22 +++ .../sparkfun_micromod_nrf52840/board.cmake | 6 + .../sparkfun_micromod.dtsi | 56 +++++++ .../sparkfun_micromod_nrf52840.dts | 143 ++++++++++++++++++ .../sparkfun_micromod_nrf52840.yaml | 15 ++ .../sparkfun_micromod_nrf52840.zmk.yml | 10 ++ .../sparkfun_micromod_nrf52840_defconfig | 32 ++++ .../sparkfun_micromod.zmk.yml | 8 + 11 files changed, 318 insertions(+) create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/Kconfig create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/board.cmake create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.yaml create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml create mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig create mode 100644 app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt b/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt new file mode 100644 index 00000000..964d6963 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt @@ -0,0 +1,11 @@ +# 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/sparkfun_micromod_nrf52840/Kconfig b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig new file mode 100644 index 00000000..5d65649c --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig @@ -0,0 +1,8 @@ +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config BOARD_ENABLE_DCDC + bool "Enable DCDC mode" + select SOC_DCDC_NRF52X + default y + depends on (BOARD_SPARKFUN_MICROMOD_NRF52840) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board new file mode 100644 index 00000000..987547c2 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board @@ -0,0 +1,7 @@ +#Copyright(c) 2021 The ZMK Contributors +#SPDX - License - Identifier : MIT + +config BOARD_SPARKFUN_MICROMOD_NRF52840 + bool "micromod_nrf52840" + depends on SOC_NRF52840_QIAA + diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig new file mode 100644 index 00000000..5aae8e77 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig @@ -0,0 +1,22 @@ +#Copyright(c) 2021 The ZMK Contributors +#SPDX - License - Identifier : MIT + +if BOARD_SPARKFUN_MICROMOD_NRF52840 + + config BOARD default "sparkfun_micromod_nrf52480" + + 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 + +endif #BOARD_SPARKFUN_MICROMOD_NRF52840 diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake b/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake new file mode 100644 index 00000000..e2698b36 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + + +board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") +include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) +include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi new file mode 100644 index 00000000..58c0e245 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +/ { + micromod: connector { + compatible = "sparkfun,micromod-gpio"; + #gpio-cells = <2>; + gpio-map-mask = <0xffffffff 0xffffffc0>; + gpio-map-pass-thru = <0 0x3f>; + gpio-map + = <0 0 &gpio0 29 0> /* G0 - GPIO0/P0.29 , MicroMod pad 40 */ + , <1 0 &gpio0 3 0> /* G1 - GPIO1/P0.03 , MicroMod pad 42 */ + , <2 0 &gpio1 13 0> /* G2 - GPIO2/P1.13 , MicroMod pad 44 */ + , <3 0 &gpio1 12 0> /* G3 - GPIO3/P1.12 , MicroMod pad 46 */ + , <4 0 &gpio1 11 0> /* G4 - GPIO4/P1.11 , MicroMod pad 48 */ + , <5 0 &gpio0 17 0> /* G5 - GPIO5/P0.17 , MicroMod pad 73 */ + , <6 0 &gpio1 6 0> /* G6 - GPIO6/P1.06 , MicroMod pad 71 */ + , <7 0 &gpio1 4 0> /* G7 - GPIO7/P1.04 , MicroMod pad 69 */ + , <8 0 &gpio1 14 0> /* G8 - GPIO8/P1.14 , MicroMod pad 67 */ + , <9 0 &gpio0 9 0> /* G9 - GPIO9/P0.09 , MicroMod pad 65 */ + , <10 0 &gpio0 10 0> /* G10 - GPIO10/P0.10 , MicroMod pad 63 */ + , <11 0 &gpio0 27 0> /* D0 - P0.27 , MicroMod pad pad 10 */ + , <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */ + , <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ + , <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ + ; + }; + + micromod_a: connector_a { + compatible = "sparkfun,micromod-gpio"; + #gpio-cells = <2>; + gpio-map-mask = <0xffffffff 0xffffffc0>; + gpio-map-pass-thru = <0 0x3f>; + gpio-map + = <0 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ + , <1 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ + + ; + }; + + +}; + +micromod_d: µmod {}; + +micromod_i2c1: &i2c0 {}; +micromod_i2c2: &i2c1 {}; + +micromod_spi1: &spi0 {}; +micromod_spi2: &spi1 {}; + +micromod_serial1: &uart0 {}; +micromod_serial2: &uart1 {}; diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts new file mode 100644 index 00000000..2e193bc3 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2021 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +/dts-v1/; +#include +#include "sparkfun_micromod.dtsi" + + +/ { + model = "Sparkfun MicroMod nrf52840"; + compatible = "sparkfun,micromod-gpio"; + + chosen { + zephyr,code-partition = &code_partition; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + }; + + leds { + compatible = "gpio-leds"; + blue_led: led_0 { + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; + label = "Blue LED"; + }; + }; +}; + +&adc { + status = "okay"; +}; + +&gpiote { + status = "okay"; +}; + +&gpio0 { + status = "okay"; +}; + +&gpio1 { + status = "okay"; +}; + +&usbd { + status = "okay"; +}; + + + +&spi1 { + compatible = "nordic,nrf-spim"; + /* Cannot be used together with i2c0. */ + status = "okay"; + sck-pin = <19>; + mosi-pin = <14>; // MOSI = COPI + miso-pin = <21>; // MISO = COPO + cs-gpios = <&gpio0 32 GPIO_ACTIVE_HIGH>; + + +}; + +&spi0 { + compatible = "nordic,nrf-spim"; + /* Cannot be used together with i2c0. */ + status = "okay"; + sck-pin = <28>; + mosi-pin = <31>; // MOSI = COPI + miso-pin = <2>; // MISO = COPO + cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; + + + +}; + + + +&i2c0 { + compatible = "nordic,nrf-twi"; + sda-pin = <8>; + scl-pin = <11>; +}; + +&i2c1 { + compatible = "nordic,nrf-twi"; + sda-pin = <33>; + scl-pin = <24>; +}; + +&uart0 { + compatible = "nordic,nrf-uarte"; + tx-pin = <35>; + rx-pin = <42>; +}; + + + + + + +&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/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.yaml b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.yaml new file mode 100644 index 00000000..6d084f52 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.yaml @@ -0,0 +1,15 @@ +identifier: sparkfun_micromod_nrf52840 +name: sparkfun micromod nrf52840 +type: mcu +arch: arm +toolchain: + - zephyr + - gnuarmemb + - xtools +supported: + - adc + - usb_device + - ble + - ieee802154 + - pwm + - watchdog diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml new file mode 100644 index 00000000..51838165 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml @@ -0,0 +1,10 @@ +file_format: "1" +id: sparkfun_micromod_nrf52840 +name: sparkfun micromod nrf52840 +type: board +arch: arm +outputs: + - usb + - ble +url: https://www.sparkfun.com/products/16984 +exposes: [micromod] diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig new file mode 100644 index 00000000..855395c2 --- /dev/null +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig @@ -0,0 +1,32 @@ +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT + + +CONFIG_SOC_SERIES_NRF52X=y +CONFIG_SOC_NRF52840_QIAA=y +CONFIG_BOARD_SPARKFUN_MICROMOD_NRF52840=y + +# Enable MPU +CONFIG_ARM_MPU=y + +# enable GPIO +CONFIG_GPIO=y + + +CONFIG_ZMK_DISPLAY=y +CONFIG_LVGL_USE_THEME_MONO=y +CONFIG_LVGL_COLOR_TRANSP_CUSTOM=y +CONFIG_LVGL_CUSTOM_COLOR_TRANSP_RED=0x00 +CONFIG_LVGL_CUSTOM_COLOR_TRANSP_GREEN=0x00 +CONFIG_LVGL_CUSTOM_COLOR_TRANSP_BLUE=0x00 + + + +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 \ No newline at end of file diff --git a/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml b/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml new file mode 100644 index 00000000..33018c5a --- /dev/null +++ b/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml @@ -0,0 +1,8 @@ +file_format: "1" +id: sparkfun_micromod +name: SparkFun Micro Mod +type: interconnect +url: https://www.sparkfun.com/micromod +manufacturer: SparkFun +description: | + #TODO Add this latter From 8926e9ca5f2ac765391bd4359ed971c5f5014282 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:00:18 -0600 Subject: [PATCH 02/14] fix: fixed sparkfun_micromod kconfig formating --- .../Kconfig.defconfig | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig index 5aae8e77..4e96601d 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig @@ -1,22 +1,29 @@ -#Copyright(c) 2021 The ZMK Contributors -#SPDX - License - Identifier : MIT +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT + if BOARD_SPARKFUN_MICROMOD_NRF52840 - config BOARD default "sparkfun_micromod_nrf52480" +config BOARD + default "nrf52480_m2" - if USB +if USB - config USB_NRFX default y +config USB_NRFX + default y - config USB_DEVICE_STACK default y +config USB_DEVICE_STACK + default y - endif #USB +endif # USB - config BT_CTLR default BT +config BT_CTLR + default BT - config ZMK_BLE default y +config ZMK_BLE + default y - config ZMK_USB default y +config ZMK_USB + default y -endif #BOARD_SPARKFUN_MICROMOD_NRF52840 +endif # BOARD_SPARKFUN_MICROMOD_NRF52840 From 1d7eeda624121eed1e8cd30d94890da9e07a5d22 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:05:57 -0600 Subject: [PATCH 03/14] fix: added description to micromod connector --- .../interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml b/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml index 33018c5a..0add4a7c 100644 --- a/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml +++ b/app/boards/interconnects/sparkfun_micromod/sparkfun_micromod.zmk.yml @@ -5,4 +5,4 @@ type: interconnect url: https://www.sparkfun.com/micromod manufacturer: SparkFun description: | - #TODO Add this latter + MicroMod is a modular interface developed by Sparkfun that uses an M.2 interface to connect a Processor board to a Carrier board. From a9358a626cff1b17339a7d3c48dc3354b1bd19c0 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:08:44 -0600 Subject: [PATCH 04/14] fix: copyright in the header of the cmake files --- app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt | 2 +- app/boards/arm/sparkfun_micromod_nrf52840/board.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt b/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt index 964d6963..b0cc2b8a 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt +++ b/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt @@ -1,6 +1,6 @@ +# Copyright (c) 2021 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 diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake b/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake index e2698b36..36030db7 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake +++ b/app/boards/arm/sparkfun_micromod_nrf52840/board.cmake @@ -1,6 +1,6 @@ +# Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT - board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) From 2628a39b8012e1cfda82800863dab8e3981ace70 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:13:46 -0600 Subject: [PATCH 05/14] fix: removed display from being configured in the board --- .../sparkfun_micromod_nrf52840_defconfig | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig index 855395c2..19c416fb 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig @@ -13,12 +13,7 @@ CONFIG_ARM_MPU=y CONFIG_GPIO=y -CONFIG_ZMK_DISPLAY=y -CONFIG_LVGL_USE_THEME_MONO=y -CONFIG_LVGL_COLOR_TRANSP_CUSTOM=y -CONFIG_LVGL_CUSTOM_COLOR_TRANSP_RED=0x00 -CONFIG_LVGL_CUSTOM_COLOR_TRANSP_GREEN=0x00 -CONFIG_LVGL_CUSTOM_COLOR_TRANSP_BLUE=0x00 + From 1959953554f6c1463aee5e23c41a8eb2bedddad1 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:19:10 -0600 Subject: [PATCH 06/14] fix: corrected interconnects to sparkfun_micromod instead of micromod --- .../sparkfun_micromod_nrf52840/Kconfig.board | 2 +- .../Kconfig.defconfig | 2 +- .../sparkfun_micromod.dtsi | 18 +++++++++--------- .../sparkfun_micromod_nrf52840.dts | 3 --- .../sparkfun_micromod_nrf52840.zmk.yml | 2 +- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board index 987547c2..cabc3129 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.board @@ -2,6 +2,6 @@ #SPDX - License - Identifier : MIT config BOARD_SPARKFUN_MICROMOD_NRF52840 - bool "micromod_nrf52840" + bool "sparkfun_micromod_nrf52840" depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig index 4e96601d..56dc97f3 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig +++ b/app/boards/arm/sparkfun_micromod_nrf52840/Kconfig.defconfig @@ -5,7 +5,7 @@ if BOARD_SPARKFUN_MICROMOD_NRF52840 config BOARD - default "nrf52480_m2" + default "sparkfun_micromod_nrf52840" if USB diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi index 58c0e245..7fd3a96d 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -5,7 +5,7 @@ */ / { - micromod: connector { + sparkfun_micromod: connector { compatible = "sparkfun,micromod-gpio"; #gpio-cells = <2>; gpio-map-mask = <0xffffffff 0xffffffc0>; @@ -29,7 +29,7 @@ ; }; - micromod_a: connector_a { + sparkfun_micromod_a: connector_a { compatible = "sparkfun,micromod-gpio"; #gpio-cells = <2>; gpio-map-mask = <0xffffffff 0xffffffc0>; @@ -44,13 +44,13 @@ }; -micromod_d: µmod {}; +sparkfun_micromod_d: &sparkfun_micromod {}; -micromod_i2c1: &i2c0 {}; -micromod_i2c2: &i2c1 {}; +sparkfun_micromod_i2c1: &i2c0 {}; +sparkfun_micromod_i2c2: &i2c1 {}; -micromod_spi1: &spi0 {}; -micromod_spi2: &spi1 {}; +sparkfun_micromod_spi1: &spi0 {}; +sparkfun_micromod_spi2: &spi1 {}; -micromod_serial1: &uart0 {}; -micromod_serial2: &uart1 {}; +sparkfun_micromod_serial1: &uart0 {}; +sparkfun_micromod_serial2: &uart1 {}; diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index 2e193bc3..5a426679 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -70,9 +70,6 @@ mosi-pin = <31>; // MOSI = COPI miso-pin = <2>; // MISO = COPO cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; - - - }; diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml index 51838165..54895714 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.zmk.yml @@ -7,4 +7,4 @@ outputs: - usb - ble url: https://www.sparkfun.com/products/16984 -exposes: [micromod] +exposes: [sparkfun_micromod] From 95c2bffe42d5523a6ce56f1fcb67059b85ed5422 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 24 Nov 2021 22:46:47 -0600 Subject: [PATCH 07/14] fix: sparkfun micromod export names --- .../sparkfun_micromod.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi index 7fd3a96d..e487dac4 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -46,11 +46,11 @@ sparkfun_micromod_d: &sparkfun_micromod {}; -sparkfun_micromod_i2c1: &i2c0 {}; -sparkfun_micromod_i2c2: &i2c1 {}; +sparkfun_micromod_i2c: &i2c0 {}; +sparkfun_micromod_i2c1: &i2c1 {}; -sparkfun_micromod_spi1: &spi0 {}; -sparkfun_micromod_spi2: &spi1 {}; +sparkfun_micromod_spi: &spi0 {}; +sparkfun_micromod_spi1: &spi1 {}; -sparkfun_micromod_serial1: &uart0 {}; -sparkfun_micromod_serial2: &uart1 {}; +sparkfun_micromod_serial: &uart0 {}; +sparkfun_micromod_serial1: &uart1 {}; From 1ccf924128e4dd68c9c8b634a27bf26ec01df54b Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Sun, 30 Jan 2022 22:21:24 -0600 Subject: [PATCH 08/14] Update app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts Co-authored-by: Pete Johanson --- .../sparkfun_micromod_nrf52840.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index 5a426679..ffcf0a0b 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -92,11 +92,6 @@ rx-pin = <42>; }; - - - - - &flash0 { /* * For more information, see: From 9d5db33886975fde34fcc26cbee88a26980bb937 Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Sun, 30 Jan 2022 22:24:49 -0600 Subject: [PATCH 09/14] Update sparkfun_micromod_nrf52840.dts Commented out i2c and spi interfaces --- .../sparkfun_micromod_nrf52840.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index ffcf0a0b..5586a2bc 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -48,7 +48,7 @@ status = "okay"; }; - +/** &spi1 { compatible = "nordic,nrf-spim"; @@ -72,7 +72,9 @@ cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; }; +**/ +/** &i2c0 { compatible = "nordic,nrf-twi"; @@ -86,6 +88,8 @@ scl-pin = <24>; }; +**/ + &uart0 { compatible = "nordic,nrf-uarte"; tx-pin = <35>; From 42fcb8f8bec2468d0ed7c86a9703e777fd3489ba Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Sun, 6 Feb 2022 10:43:56 +0000 Subject: [PATCH 10/14] fixed comment out --- .../sparkfun_micromod_nrf52840.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index 5586a2bc..d91ccd73 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -52,7 +52,7 @@ &spi1 { compatible = "nordic,nrf-spim"; - /* Cannot be used together with i2c0. */ + // Cannot be used together with i2c0. status = "okay"; sck-pin = <19>; mosi-pin = <14>; // MOSI = COPI @@ -64,7 +64,6 @@ &spi0 { compatible = "nordic,nrf-spim"; - /* Cannot be used together with i2c0. */ status = "okay"; sck-pin = <28>; mosi-pin = <31>; // MOSI = COPI @@ -74,8 +73,8 @@ **/ -/** +/** &i2c0 { compatible = "nordic,nrf-twi"; sda-pin = <8>; @@ -87,9 +86,9 @@ sda-pin = <33>; scl-pin = <24>; }; - **/ + &uart0 { compatible = "nordic,nrf-uarte"; tx-pin = <35>; From 279bbd6817c05edc64d0bda8c59ca2f6d06be3a9 Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Mon, 13 Jun 2022 23:00:16 -0500 Subject: [PATCH 11/14] fix: The CMakefile was causing an error to occur on the last step --- .../arm/sparkfun_micromod_nrf52840/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt b/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt deleted file mode 100644 index b0cc2b8a..00000000 --- a/app/boards/arm/sparkfun_micromod_nrf52840/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2021 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 -) From ab9dab4d091222dd00a3da81299b96d9d4e982c4 Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Mon, 13 Jun 2022 23:17:32 -0500 Subject: [PATCH 12/14] Fix: Applied updates needed for 3.0 --- .../sparkfun_micromod_nrf52840.dts | 6 ++++++ .../sparkfun_micromod_nrf52840_defconfig | 1 + 2 files changed, 7 insertions(+) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index d91ccd73..3f2b75c2 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -17,6 +17,7 @@ zephyr,code-partition = &code_partition; zephyr,sram = &sram0; zephyr,flash = &flash0; + zephyr,console = &cdc_acm_uart; }; leds { @@ -46,6 +47,11 @@ &usbd { status = "okay"; + cdc_acm_uart: cdc_acm_uart { + compatible = "zephyr,cdc-acm-uart"; + label = "CDC_ACM_0"; + }; + }; /** diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig index 19c416fb..12b28586 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840_defconfig @@ -13,6 +13,7 @@ CONFIG_ARM_MPU=y CONFIG_GPIO=y +CONFIG_BUILD_OUTPUT_UF2=y From 366fa20e61512160221d283167d3b09ff03f890d Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Tue, 14 Jun 2022 00:13:32 -0500 Subject: [PATCH 13/14] Fix: tried to fix usb --- .../sparkfun_micromod.dtsi | 12 ++-------- .../sparkfun_micromod_nrf52840.dts | 23 ++++++++++--------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi index e487dac4..0ae76154 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -26,20 +26,12 @@ , <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */ , <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ , <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ + , <15 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ + , <16 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ ; }; - sparkfun_micromod_a: connector_a { - compatible = "sparkfun,micromod-gpio"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map - = <0 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ - , <1 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ - ; - }; }; diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index 3f2b75c2..5e5e37f0 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -14,10 +14,10 @@ compatible = "sparkfun,micromod-gpio"; chosen { + zephyr,console = &cdc_acm_uart; zephyr,code-partition = &code_partition; zephyr,sram = &sram0; zephyr,flash = &flash0; - zephyr,console = &cdc_acm_uart; }; leds { @@ -45,14 +45,19 @@ status = "okay"; }; + +&uart0 { + compatible = "nordic,nrf-uarte"; + tx-pin = <35>; + rx-pin = <42>; +}; &usbd { status = "okay"; cdc_acm_uart: cdc_acm_uart { - compatible = "zephyr,cdc-acm-uart"; - label = "CDC_ACM_0"; - }; - -}; + compatible = "zephyr,cdc-acm-uart"; + label = "CDC_ACM_0"; + }; + }; /** @@ -95,11 +100,7 @@ **/ -&uart0 { - compatible = "nordic,nrf-uarte"; - tx-pin = <35>; - rx-pin = <42>; -}; + &flash0 { /* From 209f13df5af2c635b8bbc98cf2ffa5b51e0e6973 Mon Sep 17 00:00:00 2001 From: Thomas N Atkins Date: Sun, 26 Jun 2022 14:44:00 -0500 Subject: [PATCH 14/14] fixed pin config --- .../arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi index 0ae76154..9a4434e8 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -24,8 +24,8 @@ , <10 0 &gpio0 10 0> /* G10 - GPIO10/P0.10 , MicroMod pad 63 */ , <11 0 &gpio0 27 0> /* D0 - P0.27 , MicroMod pad pad 10 */ , <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */ - , <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ - , <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ + , <13 0 &gpio0 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ + , <14 0 &gpio0 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ , <15 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ , <16 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ ;