From 506c3b031e042430149cd663a561a13cd6e5835b Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Wed, 19 Aug 2020 16:35:18 -0400 Subject: [PATCH] refactor(boards): Rename to bluemicro840_v1. --- .github/workflows/build.yml | 2 +- .../{bluemicro52840_v1 => bluemicro840}/CMakeLists.txt | 0 .../arm/{bluemicro52840_v1 => bluemicro840}/Kconfig | 2 +- .../arm/{bluemicro52840_v1 => bluemicro840}/Kconfig.board | 6 +++--- .../{bluemicro52840_v1 => bluemicro840}/Kconfig.defconfig | 8 ++++---- .../arduino_pro_micro_pins.dtsi | 0 .../bluemicro840_v1.dts} | 4 ++-- .../bluemicro840_v1.yaml} | 4 ++-- .../bluemicro840_v1_defconfig} | 2 +- .../arm/{bluemicro52840_v1 => bluemicro840}/board.cmake | 0 docs/docs/hardware.md | 2 ++ docs/static/setup.sh | 4 ++-- 12 files changed, 18 insertions(+), 16 deletions(-) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/CMakeLists.txt (100%) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/Kconfig (76%) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/Kconfig.board (53%) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/Kconfig.defconfig (67%) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/arduino_pro_micro_pins.dtsi (100%) rename app/boards/arm/{bluemicro52840_v1/bluemicro52840_v1.dts => bluemicro840/bluemicro840_v1.dts} (96%) rename app/boards/arm/{bluemicro52840_v1/bluemicro52840_v1.yaml => bluemicro840/bluemicro840_v1.yaml} (72%) rename app/boards/arm/{bluemicro52840_v1/bluemicro52840_v1_defconfig => bluemicro840/bluemicro840_v1_defconfig} (84%) rename app/boards/arm/{bluemicro52840_v1 => bluemicro840}/board.cmake (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a2ea9a1..0f0e74a5 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, bluemicro52840_v1, nrfmicro_13] + board: [proton_c, nice_nano, bluemicro840_v1, nrfmicro_13] shield: - corne_left - corne_right diff --git a/app/boards/arm/bluemicro52840_v1/CMakeLists.txt b/app/boards/arm/bluemicro840/CMakeLists.txt similarity index 100% rename from app/boards/arm/bluemicro52840_v1/CMakeLists.txt rename to app/boards/arm/bluemicro840/CMakeLists.txt diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig b/app/boards/arm/bluemicro840/Kconfig similarity index 76% rename from app/boards/arm/bluemicro52840_v1/Kconfig rename to app/boards/arm/bluemicro840/Kconfig index 67751a0f..0e6743d3 100644 --- a/app/boards/arm/bluemicro52840_v1/Kconfig +++ b/app/boards/arm/bluemicro840/Kconfig @@ -4,5 +4,5 @@ config BOARD_ENABLE_DCDC bool "Enable DCDC mode" select SOC_DCDC_NRF52X default y - depends on BOARD_BLUEMICRO52840_V1 + depends on BOARD_BLUEMICRO840_V1 diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.board b/app/boards/arm/bluemicro840/Kconfig.board similarity index 53% rename from app/boards/arm/bluemicro52840_v1/Kconfig.board rename to app/boards/arm/bluemicro840/Kconfig.board index dea05550..bc271af3 100644 --- a/app/boards/arm/bluemicro52840_v1/Kconfig.board +++ b/app/boards/arm/bluemicro840/Kconfig.board @@ -1,8 +1,8 @@ -# BlueMicro52840_V1 board configuration +# BlueMicro840 board configuration # Copyright (c) 2020 Pete Johanson, Derek Schmell # SPDX-License-Identifier: MIT -config BOARD_BLUEMICRO52840_V1 - bool "BlueMicro52840_V1" +config BOARD_BLUEMICRO840_V1 + bool "BlueMicro840_V1" depends on SOC_NRF52840_QIAA diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig b/app/boards/arm/bluemicro840/Kconfig.defconfig similarity index 67% rename from app/boards/arm/bluemicro52840_v1/Kconfig.defconfig rename to app/boards/arm/bluemicro840/Kconfig.defconfig index 90a5ed9a..566b5a42 100644 --- a/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig +++ b/app/boards/arm/bluemicro840/Kconfig.defconfig @@ -1,12 +1,12 @@ -# BlueMicro52840 board configuration +# BlueMicro840 board configuration # Copyright (c) 2020 Pete Johanson, Derek Schmell # SPDX-License-Identifier: MIT -if BOARD_BLUEMICRO52840_V1 +if BOARD_BLUEMICRO840_V1 config BOARD - default "bluemicro52840_v1" + default "bluemicro840_v1" if USB @@ -27,4 +27,4 @@ config ZMK_BLE config ZMK_USB default y -endif # BOARD_BLUEMICRO52840_V1 +endif # BOARD_BLUEMICRO840_V1 diff --git a/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi similarity index 100% rename from app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi rename to app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts similarity index 96% rename from app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts rename to app/boards/arm/bluemicro840/bluemicro840_v1.dts index f8abc667..c693662a 100644 --- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts +++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts @@ -9,8 +9,8 @@ #include "arduino_pro_micro_pins.dtsi" / { - model = "BlueMicro52840_V1"; - compatible = "bluemicro52840,v1"; + model = "BlueMicro840_V1"; + compatible = "bluemicro840,v1"; chosen { zephyr,code-partition = &code_partition; diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml b/app/boards/arm/bluemicro840/bluemicro840_v1.yaml similarity index 72% rename from app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml rename to app/boards/arm/bluemicro840/bluemicro840_v1.yaml index fca969d3..9e1dd54c 100644 --- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml +++ b/app/boards/arm/bluemicro840/bluemicro840_v1.yaml @@ -1,5 +1,5 @@ -identifier: bluemicro52840_v1 -name: BlueMicro52840_V1 +identifier: bluemicro840_v1 +name: BlueMicro840_V1 type: mcu arch: arm toolchain: diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig similarity index 84% rename from app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig rename to app/boards/arm/bluemicro840/bluemicro840_v1_defconfig index f87e69d7..96f03ca4 100644 --- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig +++ b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig @@ -2,7 +2,7 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_BLUEMICRO52840_V1=y +CONFIG_BOARD_BLUEMICRO840_V1=y # Enable MPU CONFIG_ARM_MPU=y diff --git a/app/boards/arm/bluemicro52840_v1/board.cmake b/app/boards/arm/bluemicro840/board.cmake similarity index 100% rename from app/boards/arm/bluemicro52840_v1/board.cmake rename to app/boards/arm/bluemicro840/board.cmake diff --git a/docs/docs/hardware.md b/docs/docs/hardware.md index 951cee04..9e6a956f 100644 --- a/docs/docs/hardware.md +++ b/docs/docs/hardware.md @@ -17,6 +17,8 @@ That being said, there are currently only a few specific [boards](/docs/faq#what ## Boards - [nice!nano](https://docs.nicekeyboards.com/#/nice!nano/) (`nice_nano`) +- [nrfMicro](https://github.com/joric/nrfmicro) (`nrfmicro_13`, `nrfmicro_11`, `nrfmicro_11_flipped`) +- [BlueMicro840](https://store.jpconstantineau.com/#/group/bluemicro) (`bluemicro840_v1`) - [QMK Proton-C](https://qmk.fm/proton-c/) (`proton_c`) ## Keyboard Shields diff --git a/docs/static/setup.sh b/docs/static/setup.sh index 55c96ff9..bb61df60 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" "BlueMicro52840 (v1)") +options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)") echo "$title" echo "" @@ -23,7 +23,7 @@ select opt in "${options[@]}" "Quit"; do 1 ) board="nice_nano"; break;; 2 ) board="proton_c"; break;; - 3 ) board="bluemicro52840_v1"; break;; + 3 ) board="bluemicro840_v1"; break;; $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;; *) echo "Invalid option. Try another one.";continue;;