pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #106 from petejohanson/boards/bluemicro840-naming-refactor

Browse source 
refactor(boards): Rename to bluemicro840_v1.
This commit is contained in:
Pete Johanson 2020-08-19 19:00:27 -04:00 committed by GitHub
commit e6ed051ff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -8,7 +8,7 @@ jobs:
name: Build Test name: Build Test
strategy: strategy:
matrix: matrix:
board: [proton_c, nice_nano, bluemicro52840_v1, nrfmicro_13] board: [proton_c, nice_nano, bluemicro840_v1, nrfmicro_13]
shield: shield:
- corne_left - corne_left
- corne_right - corne_right

0
app/boards/arm/bluemicro52840_v1/CMakeLists.txt → app/boards/arm/bluemicro840/CMakeLists.txt
View file

2
app/boards/arm/bluemicro52840_v1/Kconfig → app/boards/arm/bluemicro840/Kconfig
View file

@ -4,5 +4,5 @@ config BOARD_ENABLE_DCDC
bool "Enable DCDC mode" bool "Enable DCDC mode"
select SOC_DCDC_NRF52X select SOC_DCDC_NRF52X
default y default y
depends on BOARD_BLUEMICRO52840_V1 depends on BOARD_BLUEMICRO840_V1

6
app/boards/arm/bluemicro52840_v1/Kconfig.board → app/boards/arm/bluemicro840/Kconfig.board
View file

@ -1,8 +1,8 @@
# BlueMicro52840_V1 board configuration # BlueMicro840 board configuration
# Copyright (c) 2020 Pete Johanson, Derek Schmell # Copyright (c) 2020 Pete Johanson, Derek Schmell
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
config BOARD_BLUEMICRO52840_V1 config BOARD_BLUEMICRO840_V1
bool "BlueMicro52840_V1" bool "BlueMicro840_V1"
depends on SOC_NRF52840_QIAA depends on SOC_NRF52840_QIAA

8
app/boards/arm/bluemicro52840_v1/Kconfig.defconfig → app/boards/arm/bluemicro840/Kconfig.defconfig
View file

@ -1,12 +1,12 @@
# BlueMicro52840 board configuration # BlueMicro840 board configuration
# Copyright (c) 2020 Pete Johanson, Derek Schmell # Copyright (c) 2020 Pete Johanson, Derek Schmell
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
if BOARD_BLUEMICRO52840_V1 if BOARD_BLUEMICRO840_V1
config BOARD config BOARD
default "bluemicro52840_v1" default "bluemicro840_v1"
if USB if USB
@ -27,4 +27,4 @@ config ZMK_BLE
config ZMK_USB config ZMK_USB
default y default y
endif # BOARD_BLUEMICRO52840_V1 endif # BOARD_BLUEMICRO840_V1

0
app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi → app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
View file

4
app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts → app/boards/arm/bluemicro840/bluemicro840_v1.dts
View file

@ -9,8 +9,8 @@
#include "arduino_pro_micro_pins.dtsi" #include "arduino_pro_micro_pins.dtsi"
/ { / {
model = "BlueMicro52840_V1"; model = "BlueMicro840_V1";
compatible = "bluemicro52840,v1"; compatible = "bluemicro840,v1";
chosen { chosen {
zephyr,code-partition = &code_partition; zephyr,code-partition = &code_partition;

4
app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml → app/boards/arm/bluemicro840/bluemicro840_v1.yaml
View file

@ -1,5 +1,5 @@
identifier: bluemicro52840_v1 identifier: bluemicro840_v1
name: BlueMicro52840_V1 name: BlueMicro840_V1
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

2
app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig → app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
View file

@ -2,7 +2,7 @@
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y CONFIG_SOC_NRF52840_QIAA=y
CONFIG_BOARD_BLUEMICRO52840_V1=y CONFIG_BOARD_BLUEMICRO840_V1=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

0
app/boards/arm/bluemicro52840_v1/board.cmake → app/boards/arm/bluemicro840/board.cmake
View file

2
docs/docs/hardware.md
View file

@ -17,6 +17,8 @@ That being said, there are currently only a few specific [boards](/docs/faq#what
## Boards ## Boards
- [nice!nano](https://docs.nicekeyboards.com/#/nice!nano/) (`nice_nano`) - [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`) - [QMK Proton-C](https://qmk.fm/proton-c/) (`proton_c`)
## Keyboard Shields ## Keyboard Shields

4
docs/static/setup.sh vendored
View file

@ -11,7 +11,7 @@ title="ZMK Config Setup:"
# TODO: Check for user.name and user.email git configs being set # TODO: Check for user.name and user.email git configs being set
prompt="Pick an MCU board:" prompt="Pick an MCU board:"
options=("nice!nano" "QMK Proton-C" "BlueMicro52840 (v1)") options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)")
echo "$title" echo "$title"
echo "" echo ""
@ -23,7 +23,7 @@ select opt in "${options[@]}" "Quit"; do
1 ) board="nice_nano"; break;; 1 ) board="nice_nano"; break;;
2 ) board="proton_c"; break;; 2 ) board="proton_c"; break;;
3 ) board="bluemicro52840_v1"; break;; 3 ) board="bluemicro840_v1"; break;;
$(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;; $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;;
*) echo "Invalid option. Try another one.";continue;; *) echo "Invalid option. Try another one.";continue;;