Skip to content

Commit

Permalink
Move drivers up so they are shared across boards
Browse files Browse the repository at this point in the history
  • Loading branch information
@xingrz
xingrz committed Jan 13, 2023
1 parent 4df5b0c commit 98c0fc9
Show file tree
Hide file tree
Showing 29 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ...s/arm/hw75_dynamic/drivers/CMakeLists.txt → config/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 XiNGRZ
# SPDX-License-Identifier: MIT

add_subdirectory(sensor)
add_subdirectory(drivers)
2 changes: 1 addition & 1 deletion ...g/boards/arm/hw75_dynamic/drivers/Kconfig → config/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023 XiNGRZ
# SPDX-License-Identifier: MIT

rsource "sensor/Kconfig"
rsource "drivers/Kconfig"
1 change: 0 additions & 1 deletion config/boards/arm/hw75/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
# SPDX-License-Identifier: MIT

add_subdirectory_ifdef(CONFIG_BOARD_HW75 app)
add_subdirectory_ifdef(CONFIG_BOARD_HW75 drivers)
2 changes: 0 additions & 2 deletions config/boards/arm/hw75/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,4 @@ config BUILD_OUTPUT_UF2_USE_FLASH_OFFSET

endif # BUILD_OUTPUT_UF2

rsource "drivers/Kconfig"

endif # BOARD_HW75
1 change: 0 additions & 1 deletion config/boards/arm/hw75_dynamic/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
# SPDX-License-Identifier: MIT

add_subdirectory_ifdef(CONFIG_BOARD_HW75_DYNAMIC app)
add_subdirectory_ifdef(CONFIG_BOARD_HW75_DYNAMIC drivers)
2 changes: 0 additions & 2 deletions config/boards/arm/hw75_dynamic/Kconfig.defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,4 @@ config SSD1306_REVERSE_MODE

endif # SSD1306

rsource "drivers/Kconfig"

endif # BOARD_HW75_DYNAMIC
3 changes: 2 additions & 1 deletion ...ig/boards/arm/hw75/drivers/CMakeLists.txt → config/drivers/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2022-2023 XiNGRZ
# SPDX-License-Identifier: MIT

add_subdirectory(kscan)
add_subdirectory(led_strip)
add_subdirectory(sensor)
3 changes: 2 additions & 1 deletion config/boards/arm/hw75/drivers/Kconfig → config/drivers/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2022-2023 XiNGRZ
# SPDX-License-Identifier: MIT

rsource "kscan/Kconfig"
rsource "led_strip/Kconfig"
rsource "sensor/Kconfig"
0 ...rds/arm/hw75/drivers/kscan/CMakeLists.txt → config/drivers/kscan/CMakeLists.txt
View file
File renamed without changes.
0 config/boards/arm/hw75/drivers/kscan/Kconfig → config/drivers/kscan/Kconfig
View file
File renamed without changes.
0 ...m/hw75/drivers/kscan/kscan_gpio_74hc165.c → config/drivers/kscan/kscan_gpio_74hc165.c
View file
File renamed without changes.
0 ...arm/hw75/drivers/led_strip/CMakeLists.txt → config/drivers/led_strip/CMakeLists.txt
View file
File renamed without changes.
0 ...boards/arm/hw75/drivers/led_strip/Kconfig → config/drivers/led_strip/Kconfig
View file
File renamed without changes.
0 .../arm/hw75/drivers/led_strip/Kconfig.remap → config/drivers/led_strip/Kconfig.remap
View file
File renamed without changes.
0 ...d_strip/include/drivers/led_strip_remap.h → ...d_strip/include/drivers/led_strip_remap.h
View file
File renamed without changes.
0 .../hw75/drivers/led_strip/led_strip_remap.c → config/drivers/led_strip/led_strip_remap.c
View file
File renamed without changes.
0 ...w75_dynamic/drivers/sensor/CMakeLists.txt → config/drivers/sensor/CMakeLists.txt
View file
File renamed without changes.
0 ...s/arm/hw75_dynamic/drivers/sensor/Kconfig → config/drivers/sensor/Kconfig
View file
File renamed without changes.
7 changes: 5 additions & 2 deletions ...ynamic/drivers/sensor/knob/CMakeLists.txt → config/drivers/sensor/knob/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Copyright (c) 2022-2023 XiNGRZ
# SPDX-License-Identifier: MIT

if(CONFIG_KNOB)

zephyr_library_named(helloword__drivers__knob)
zephyr_library_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

add_subdirectory_ifdef(CONFIG_KNOB lib)
add_subdirectory(lib)
add_subdirectory(encoder)

add_subdirectory_ifdef(CONFIG_KNOB encoder)
endif()
0 .../hw75_dynamic/drivers/sensor/knob/Kconfig → config/drivers/sensor/knob/Kconfig
View file
File renamed without changes.
0 ...rivers/sensor/knob/encoder/CMakeLists.txt → ...rivers/sensor/knob/encoder/CMakeLists.txt
View file
File renamed without changes.
0 ...namic/drivers/sensor/knob/encoder/Kconfig → config/drivers/sensor/knob/encoder/Kconfig
View file
File renamed without changes.
0 ...rivers/sensor/knob/encoder/Kconfig.as5047 → ...rivers/sensor/knob/encoder/Kconfig.as5047
View file
File renamed without changes.
0 ...vers/sensor/knob/encoder/encoder_as5047.c → ...vers/sensor/knob/encoder/encoder_as5047.c
View file
File renamed without changes.
0 ...ensor/knob/include/knob/drivers/encoder.h → ...ensor/knob/include/knob/drivers/encoder.h
View file
File renamed without changes.
0 ...c/drivers/sensor/knob/include/knob/math.h → ...g/drivers/sensor/knob/include/knob/math.h
View file
File renamed without changes.
0 ...ic/drivers/sensor/knob/lib/CMakeLists.txt → ...ig/drivers/sensor/knob/lib/CMakeLists.txt
View file
File renamed without changes.
0 ...75_dynamic/drivers/sensor/knob/lib/knob.c → config/drivers/sensor/knob/lib/knob.c
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions config/zephyr/module.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build:
cmake: .
kconfig: Kconfig
settings:
dts_root: .

0 comments on commit 98c0fc9

Please sign in to comment.