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

Merge remote-tracking branch 'upstream/main' into gpio-driver-max7318

Browse source
This commit is contained in:
zhiayang 2022-06-06 21:42:03 +08:00
commit a616d0d7ff
No known key found for this signature in database
GPG key ID: 5E2F30AD6F08571F
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/cmake/ZephyrBuildConfig.cmake
View file

@ -121,11 +121,11 @@ if(DEFINED SHIELD)
list(LENGTH S_PIECES S_PIECES_LEN) list(LENGTH S_PIECES S_PIECES_LEN)
while(NOT S_PIECES STREQUAL "") while(NOT S_PIECES STREQUAL "")
list(POP_BACK S_PIECES) list(POP_BACK S_PIECES)
list(JOIN S_PIECES "_" S_SUBSTR) list(JOIN S_PIECES "_" s_substr)
if (S_SUBSTR STREQUAL ${shield_dir_name}) if ("%{s_substr}" STREQUAL "" OR "${s_substr}" STREQUAL ${shield_dir_name})
break() break()
endif() endif()
list(APPEND shield_candidate_names ${S_SUBSTR}) list(APPEND shield_candidate_names ${s_substr})
endwhile() endwhile()
endforeach() endforeach()
endif() endif()
@ -133,12 +133,11 @@ endif()
if (ZMK_CONFIG) if (ZMK_CONFIG)
if (EXISTS ${ZMK_CONFIG}) if (EXISTS ${ZMK_CONFIG})
message(STATUS "ZMK Config directory: ${ZMK_CONFIG}") message(STATUS "ZMK Config directory: ${ZMK_CONFIG}")
list(APPEND DTS_ROOT ${ZMK_CONFIG})
list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}") list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}")
if (DEFINED SHIELD) if (DEFINED SHIELD)
foreach (s ${shield_candidate_names}) foreach (s ${shield_candidate_names} ${SHIELD_AS_LIST})
if (DEFINED $SHIELD_DIR_${s}) if (DEFINED ${SHIELD_DIR_${s}})
get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME) get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
endif() endif()
list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay") list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay")

2
app/drivers/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Copyright (c) 2020 The ZMK Contributors # Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
add_subdirectory(gpio) add_subdirectory_ifdef(CONFIG_ZMK_DRIVERS_GPIO gpio)
add_subdirectory(kscan) add_subdirectory(kscan)
add_subdirectory(sensor) add_subdirectory(sensor)
add_subdirectory(display) add_subdirectory(display)

3
app/drivers/gpio/Kconfig
View file

@ -1,3 +1,6 @@
menuconfig ZMK_DRIVERS_GPIO
bool "GPIO"
rsource "Kconfig.mcp23017" rsource "Kconfig.mcp23017"
rsource "Kconfig.max7318" rsource "Kconfig.max7318"
rsource "Kconfig.595" rsource "Kconfig.595"

1
app/drivers/gpio/Kconfig.595
View file

@ -10,6 +10,7 @@ menuconfig GPIO_595
default $(dt_compat_enabled,$(DT_COMPAT_ZMK_GPIO_595)) default $(dt_compat_enabled,$(DT_COMPAT_ZMK_GPIO_595))
depends on SPI depends on SPI
select HAS_DTS_GPIO select HAS_DTS_GPIO
select ZMK_DRIVERS_GPIO
help help
Enable driver for 595 shift register chip using SPI. Enable driver for 595 shift register chip using SPI.

1
app/drivers/gpio/Kconfig.mcp23017
View file

@ -7,6 +7,7 @@ menuconfig GPIO_MCP23017
bool "MCP23017 I2C-based GPIO chip" bool "MCP23017 I2C-based GPIO chip"
depends on I2C depends on I2C
select HAS_DTS_GPIO select HAS_DTS_GPIO
select ZMK_DRIVERS_GPIO
help help
Enable driver for MCP23017 I2C-based GPIO chip. Enable driver for MCP23017 I2C-based GPIO chip.