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

Merge branch 'main' into CrossR/Sofle

Browse source
This commit is contained in:
CrossR 2020-08-16 12:25:47 +01:00
commit e593e971ec
16 changed files with 117 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/boards/arm/nice_nano/Kconfig Normal file
View file

@ -0,0 +1,6 @@
config BOARD_ENABLE_DCDC
bool "Enable DCDC mode"
select SOC_DCDC_NRF52X
default y
depends on BOARD_NICE_NANO

1
app/boards/arm/nice_nano/Kconfig.board
View file

@ -6,3 +6,4 @@
config BOARD_NICE_NANO
bool "nice!nano"
depends on SOC_NRF52840_QIAA

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

@ -1,4 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)

2
app/boards/arm/proton_c/CMakeLists.txt
View file

@ -1,4 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT
if(CONFIG_PINMUX)
zephyr_library()

2
app/boards/arm/proton_c/pinmux.c
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2017 I-SENSE group of ICCS
*
* SPDX-License-Identifier: Apache-2.0
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>

3
app/boards/shields/corne/corne.conf
View file

@ -1,5 +1,6 @@
# Uncomment the following line to enable the Corne RGB Underglow
# Uncomment the following lines to enable the Corne RGB Underglow
# ZMK_RGB_UNDERGLOW=y
# CONFIG_WS2812_STRIP=y
# Uncomment the following line to enable the Corne OLED Display
# CONFIG_ZMK_DISPLAY=y

3
app/boards/shields/kyria/kyria.conf
View file

@ -5,5 +5,6 @@
# Uncomment the following line to enable the Kyria OLED Display
# CONFIG_ZMK_DISPLAY=y
# Uncomment the following line to enable RGB underglow
# Uncomment the following lines to enable RGB underglow
# CONFIG_ZMK_RGB_UNDERGLOW=y
# CONFIG_WS2812_STRIP=y