Merge pull request #91 from Na-Cly/boards/bluemicro52840_v1

Add bluemicro support

11 files changed, 245 insertions, 2 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eb7971..a87ce5f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     name: Build Test
     strategy:
       matrix:
-        board: [proton_c, nice_nano]
+        board: [proton_c, nice_nano, bluemicro52840_v1]
         shield:
           - corne_left
           - corne_right
diff --git a/app/boards/arm/bluemicro52840_v1/CMakeLists.txt b/app/boards/arm/bluemicro52840_v1/CMakeLists.txt
new file mode 100644
index 0000000..00952c3
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/CMakeLists.txt
@@ -0,0 +1,8 @@
+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/bluemicro52840_v1/Kconfig b/app/boards/arm/bluemicro52840_v1/Kconfig
new file mode 100644
index 0000000..67751a0
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/Kconfig
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: MIT
+
+config BOARD_ENABLE_DCDC
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
+	depends on BOARD_BLUEMICRO52840_V1
+
diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.board b/app/boards/arm/bluemicro52840_v1/Kconfig.board
new file mode 100644
index 0000000..dea0555
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/Kconfig.board
@@ -0,0 +1,8 @@
+# BlueMicro52840_V1 board configuration
+
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# SPDX-License-Identifier: MIT
+
+config BOARD_BLUEMICRO52840_V1
+	bool "BlueMicro52840_V1"
+	depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig b/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig
new file mode 100644
index 0000000..90a5ed9
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig
@@ -0,0 +1,30 @@
+# BlueMicro52840 board configuration
+
+# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# SPDX-License-Identifier: MIT
+
+if BOARD_BLUEMICRO52840_V1
+
+config BOARD
+	default "bluemicro52840_v1"
+
+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_BLUEMICRO52840_V1
diff --git a/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi b/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi
new file mode 100644
index 0000000..940d891
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020 Derek Schmell
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/ {
+	pro_micro_d: connector_d {
+		compatible = "arduino-pro-micro";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map
+			= <0 0 &gpio0 8 0>		/* D0	D2 */ 			
+			, <1 0 &gpio0 6 0>		/* D1 	D3*/			
+			, <2 0 &gpio0 15 0>		/* D2 	D1*/			
+			, <3 0 &gpio0 17 0>		/* D3 	D0*/			
+			, <4 0 &gpio0 20 0>		/* D4/A6 	D4*/		
+			, <5 0 &gpio0 13 0>		/* D5 	C6*/
+			, <6 0 &gpio0 24 0>		/* D6/A7 	D7*/
+			, <7 0 &gpio0 9 0>		/* D7 	E6*/
+			, <8 0 &gpio0 10 0>		/* D8/A8 	B4*/
+			, <9 0 &gpio1 6 0>		/* D9/A9 	B5*/
+			, <10 0 &gpio1 11 0>		/* D10/A10 	B6*/
+			, <16 0 &gpio0 28 0>	/* D16 	B2*/
+			, <14 0 &gpio0 3 0>	/* D14 	B3*/
+			, <15 0 &gpio1 13 0>	/* D15 	B1*/
+			;
+	};
+
+	pro_micro_a: connector_a {
+		compatible = "arduino-pro-micro";
+		#gpio-cells = <2>;
+		gpio-map-mask = <0xffffffff 0xffffffc0>;
+		gpio-map-pass-thru = <0 0x3f>;
+		gpio-map
+			= <0 0 &gpio0 2 0>	/* A0 	F7*/
+			, <1 0 &gpio0 29 0>	/* A1 	F6*/
+			, <2 0 &gpio0 26 0>	/* A2 	F5*/
+			, <3 0 &gpio0 30 0>	/* A3 	F4*/
+			, <6 0 &gpio0 20 0>	/* D4/A6 	D4*/
+			, <7 0 &gpio0 24 0>	/* D6/A7 	D7*/
+			, <8 0 &gpio0 10 0>	/* D8/A8 	B4*/
+			, <9 0 &gpio1 6 0>	/* D9/A9 	B5*/
+			, <10 0 &gpio1 13 0>	/* D10/A10 	B6*/
+			;
+	};
+};
+
+pro_micro_i2c: &i2c0 {};
+pro_micro_spi: &spi0 {};
+pro_micro_serial: &uart0 {};
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts
new file mode 100644
index 0000000..c56ca18
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2020 Pete Johanson, Derek Schmell
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/dts-v1/;
+#include <nordic/nrf52840_qiaa.dtsi>
+#include "arduino_pro_micro_pins.dtsi"
+
+/ {
+	model = "BlueMicro52840_V1";
+	compatible = "bluemicro52840,v1";
+
+	chosen {
+		zephyr,code-partition = &code_partition;
+		// zephyr,console = &uart0;
+		//zephyr,bt-mon-uart = &uart0;
+		//zephyr,bt-c2h-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		blue_led: led_0 {
+			gpios = <&gpio0 42 GPIO_ACTIVE_LOW>;
+			label = "Blue LED";
+		};
+	};
+
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};
+
+&i2c0 {
+	compatible = "nordic,nrf-twi";
+	sda-pin = <15>;
+	scl-pin = <17>;
+};
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	status = "okay";
+	current-speed = <115200>;
+	tx-pin = <39>;
+	rx-pin = <34>;
+	rts-pin = <33>;
+	cts-pin = <12>;
+};
+
+&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>;
+
+		boot_partition: partition@0 {
+			label = "adafruit_boot";
+			reg = <0x000000000 0x0000C000>;
+		};
+		code_partition: partition@26000 {
+			label = "code_partition";
+			reg = <0x00026000 0x000d2000>;
+		};
+
+		/*
+		 * The flash starting at 0x000f8000 and ending at
+		 * 0x000fffff is reserved for use by the application.
+		 */
+
+		/*
+		 * Storage partition will be used by FCB/LittleFS/NVS
+		 * if enabled.
+		 */
+		storage_partition: partition@f8000 {
+			label = "storage";
+			reg = <0x000f8000 0x00008000>;
+		};
+	};
+};
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml
new file mode 100644
index 0000000..fca969d
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml
@@ -0,0 +1,15 @@
+identifier: bluemicro52840_v1
+name: BlueMicro52840_V1
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - adc
+  - usb_device
+  - ble
+  - ieee802154
+  - pwm
+  - watchdog
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig
new file mode 100644
index 0000000..f87e69d
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_SOC_SERIES_NRF52X=y
+CONFIG_SOC_NRF52840_QIAA=y
+CONFIG_BOARD_BLUEMICRO52840_V1=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
\ No newline at end of file
diff --git a/app/boards/arm/bluemicro52840_v1/board.cmake b/app/boards/arm/bluemicro52840_v1/board.cmake
new file mode 100644
index 0000000..fa847d5
--- /dev/null
+++ b/app/boards/arm/bluemicro52840_v1/board.cmake
@@ -0,0 +1,5 @@
+# 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/docs/static/setup.sh b/docs/static/setup.sh
index 27dcb0b..55c96ff 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -11,7 +11,7 @@ title="ZMK Config Setup:"
 # TODO: Check for user.name and user.email git configs being set
 
 prompt="Pick an MCU board:"
-options=("nice!nano" "QMK Proton-C")
+options=("nice!nano" "QMK Proton-C" "BlueMicro52840 (v1)")
 
 echo "$title"
 echo ""
@@ -23,6 +23,7 @@ select opt in "${options[@]}" "Quit"; do
 
     1 ) board="nice_nano"; break;;
     2 ) board="proton_c"; break;;
+    3 ) board="bluemicro52840_v1"; break;;
 
     $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;;
     *) echo "Invalid option. Try another one.";continue;;