kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated BlueMacro840 board config files.

Browse source
This commit is contained in:
310weber 2021-03-01 16:51:25 +00:00
parent c12853b6c5
commit 7f166e0fc4
8 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/boards/arm/bluemacro840/CMakeLists.txt
View file

@ -1,3 +1,6 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-c -c

4
app/boards/arm/bluemacro840/Kconfig
View file

@ -1,8 +1,8 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
config BOARD_ENABLE_DCDC 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_BLUEMICRO840_V1 depends on BOARD_BLUEMACRO840_V1

8
app/boards/arm/bluemacro840/Kconfig.board
View file

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

10
app/boards/arm/bluemacro840/Kconfig.defconfig
View file

@ -1,12 +1,12 @@
# BlueMicro840 board configuration # BlueMacro840 board configuration
# Copyright (c) 2020 Pete Johanson, Derek Schmell # Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
if BOARD_BLUEMICRO840_V1 if BOARD_BLUEMACRO840_V1
config BOARD config BOARD
default "bluemicro840_v1" default "bluemacro840_v1"
if USB if USB
@ -30,4 +30,4 @@ config ZMK_USB
config ZMK_BATTERY_VOLTAGE_DIVIDER config ZMK_BATTERY_VOLTAGE_DIVIDER
default y default y
endif # BOARD_BLUEMICRO840_V1 endif # BOARD_BLUEMACRO840_V1

22
app/boards/arm/bluemacro840/bluemacro840_v1.dts
View file

@ -1,16 +1,15 @@
/* /*
* Copyright (c) 2020 Pete Johanson, Derek Schmell * Copyright (c) 2020 The ZMK Contributors
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
/dts-v1/; /dts-v1/;
#include <nordic/nrf52840_qiaa.dtsi> #include <nordic/nrf52840_qiaa.dtsi>
#include "arduino_pro_micro_pins.dtsi"
/ { / {
model = "BlueMicro840_V1"; model = "BlueMacro840_V1";
compatible = "bluemicro840,v1"; compatible = "bluemacro840,v1";
chosen { chosen {
zephyr,code-partition = &code_partition; zephyr,code-partition = &code_partition;
@ -21,9 +20,14 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
blue_led: led_0 { blue_led: led_0 {
gpios = <&gpio0 42 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
label = "Blue LED"; label = "Blue LED";
}; };
red_led: led_1 {
gpios = <&gpio1 04 GPIO_ACTIVE_HIGH>;
label = "Red LED";
};
}; };
ext-power { ext-power {
@ -60,14 +64,14 @@
&i2c0 { &i2c0 {
compatible = "nordic,nrf-twi"; compatible = "nordic,nrf-twi";
sda-pin = <15>; sda-pin = <30>;
scl-pin = <17>; scl-pin = <2>;
}; };
&uart0 { &uart0 {
compatible = "nordic,nrf-uarte"; compatible = "nordic,nrf-uarte";
tx-pin = <6>; tx-pin = <28>;
rx-pin = <8>; rx-pin = <45>;
}; };
&usbd { &usbd {

4
app/boards/arm/bluemacro840/bluemacro840_v1.yaml
View file

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

3
app/boards/arm/bluemacro840/bluemacro840_v1_defconfig
View file

@ -1,8 +1,9 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y CONFIG_SOC_NRF52840_QIAA=y
CONFIG_BOARD_BLUEMICRO840_V1=y CONFIG_BOARD_BLUEMACRO840_V1=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y

2
app/boards/arm/bluemacro840/board.cmake
View file

@ -1,5 +1,7 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)