Skip to content

Commit

Permalink
Merge branch 'main' into battery-report-ble-config-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReFil
ReFil committed Nov 15, 2023
2 parents b74f58c + 3027b2a commit 0267e15
Show file tree
Hide file tree
Showing 84 changed files with 1,402 additions and 153 deletions.
8 changes: 7 additions & 1 deletion app/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,17 @@ menu "Output Types"

config ZMK_USB
bool "USB"
depends on (!ZMK_SPLIT || (ZMK_SPLIT && ZMK_SPLIT_ROLE_CENTRAL))
select USB
select USB_DEVICE_STACK
select USB_DEVICE_HID

config ZMK_USB_BOOT
bool "USB Boot Protocol Support"
depends on ZMK_USB
select USB_HID_BOOT_PROTOCOL
select USB_DEVICE_SOF

if ZMK_USB

config USB_NUMOF_EP_WRITE_RETRIES
Expand Down Expand Up @@ -575,4 +582,3 @@ osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"


source "Kconfig.zephyr"

3 changes: 0 additions & 3 deletions app/boards/arm/bdn9/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ config BOARD
config ZMK_KEYBOARD_NAME
default "BDN9 Rev2"

config ZMK_USB
default y

config ZMK_RGB_UNDERGLOW
select SPI
select WS2812_STRIP
Expand Down
1 change: 1 addition & 0 deletions app/boards/arm/bdn9/bdn9_rev2_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024
# clock configuration
CONFIG_CLOCK_CONTROL=y

CONFIG_ZMK_USB=y
6 changes: 0 additions & 6 deletions app/boards/arm/bluemicro840/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,4 @@ endif # USB_DEVICE_STACK
config BT_CTLR
default BT

config ZMK_BLE
default y

config ZMK_USB
default y

endif # BOARD_BLUEMICRO840_V1
3 changes: 3 additions & 0 deletions app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ CONFIG_SETTINGS_NVS=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
6 changes: 0 additions & 6 deletions app/boards/arm/bt60/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ endif # USB
config BT_CTLR
default BT

config ZMK_BLE
default y

config ZMK_USB
default y

config ZMK_KEYBOARD_NAME
default "BT60"

Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/bt60/bt60_v1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ CONFIG_SETTINGS_NVS=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
3 changes: 3 additions & 0 deletions app/boards/arm/bt60/bt60_v1_hs_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ CONFIG_SETTINGS_NVS=y
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
6 changes: 0 additions & 6 deletions app/boards/arm/ckp/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,4 @@ endif # USB
config BT_CTLR
default BT

config ZMK_BLE
default y

config ZMK_USB
default y

endif # BOARD_BT60_V2 || BOARD_BT65_V1 || BOARD_BT75_V1
3 changes: 3 additions & 0 deletions app/boards/arm/ckp/bt60_v2_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ CONFIG_WS2812_STRIP=y
CONFIG_SPI=y

CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
3 changes: 3 additions & 0 deletions app/boards/arm/ckp/bt65_v1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ CONFIG_WS2812_STRIP=y
CONFIG_SPI=y

CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
3 changes: 3 additions & 0 deletions app/boards/arm/ckp/bt75_v1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ CONFIG_WS2812_STRIP=y
CONFIG_SPI=y

CONFIG_BT_CTLR_TX_PWR_PLUS_8=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y
6 changes: 0 additions & 6 deletions app/boards/arm/corneish_zen/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ config ZMK_SPLIT
config BT_CTLR
default BT

config ZMK_BLE
default y

config ZMK_USB
default y

if USB

config USB_NRFX
Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/corneish_zen/corneish_zen_v1_left_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ CONFIG_FLASH_MAP=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y

# enable display drivers
CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/corneish_zen/corneish_zen_v1_right_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ CONFIG_FLASH_MAP=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y

# enable display drivers
CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ CONFIG_FLASH_MAP=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y

# enable display drivers
CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ CONFIG_FLASH_MAP=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
CONFIG_CLOCK_CONTROL_NRF_K32SRC_30PPM=y

CONFIG_ZMK_USB=y
CONFIG_ZMK_BLE=y

# enable display drivers
CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048
Expand Down
3 changes: 0 additions & 3 deletions app/boards/arm/dz60rgb/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@ if BOARD_DZ60RGB_REV1
config ZMK_KEYBOARD_NAME
default "DZ60RGB Rev 1"

config ZMK_USB
default y

endif # BOARD_DZ60RGB_REV1
2 changes: 2 additions & 0 deletions app/boards/arm/dz60rgb/dz60rgb_rev1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
CONFIG_CLOCK_STM32_AHB_PRESCALER=1
CONFIG_CLOCK_STM32_APB1_PRESCALER=2
CONFIG_CLOCK_STM32_APB2_PRESCALER=1

CONFIG_ZMK_USB=y
3 changes: 0 additions & 3 deletions app/boards/arm/ferris/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ config BOARD
config ZMK_KEYBOARD_NAME
default "Ferris rev 0.2"

config ZMK_USB
default y

config ZMK_KSCAN_MATRIX_POLLING
default y

Expand Down
3 changes: 3 additions & 0 deletions app/boards/arm/glove80/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
zephyr_library()
zephyr_library_sources(usb_serial_number.c)
zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
8 changes: 8 additions & 0 deletions app/boards/arm/glove80/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT

config BOARD_ENABLE_DCDC
bool "Enable DCDC mode"
select SOC_DCDC_NRF52X
default y
depends on (BOARD_GLOVE80_LH || BOARD_GLOVE80_RH)
10 changes: 10 additions & 0 deletions app/boards/arm/glove80/Kconfig.board
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT

config BOARD_GLOVE80_LH
bool "Glove80 LH"
depends on SOC_NRF52840_QIAA

config BOARD_GLOVE80_RH
bool "Glove80 RH"
depends on SOC_NRF52840_QIAA
65 changes: 65 additions & 0 deletions app/boards/arm/glove80/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT

if BOARD_GLOVE80_LH

config BOARD
default "glove80 lh"

config ZMK_SPLIT_BLE_ROLE_CENTRAL
default y

endif # BOARD_GLOVE80_LH

if BOARD_GLOVE80_RH

config BOARD
default "glove80 rh"

endif # BOARD_GLOVE80_RH

if BOARD_GLOVE80_LH || BOARD_GLOVE80_RH

config ZMK_SPLIT
default y

config BT_CTLR
default BT

config ZMK_KSCAN_MATRIX_WAIT_BETWEEN_OUTPUTS
default 5

config PINCTRL
default y

if USB

config USB_NRFX
default y

config USB_DEVICE_STACK
default y

endif # USB

if ZMK_BACKLIGHT

config PWM
default y

config LED_PWM
default y

endif # ZMK_BACKLIGHT

if ZMK_RGB_UNDERGLOW

config SPI
default y

config WS2812_STRIP
default y

endif # ZMK_RGB_UNDERGLOW

endif # BOARD_GLOVE80_LH || BOARD_GLOVE80_RH
6 changes: 6 additions & 0 deletions app/boards/arm/glove80/board.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) 2021 The ZMK Contributors
# 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)
Loading

0 comments on commit 0267e15

Please sign in to comment.