diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-12-08 22:06:56 -0500 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-08 22:20:12 -0500 |
| commit | e6a27b15c1d8e1a14549e01af770fa9273a4f23a (patch) | |
| tree | cea3fa5a0ad5396610c7f34bfc06b10a0035ec23 | |
| parent | 02673e2f1d0b6c2ab349b14cf0ab3fcf9b82df51 (diff) | |
fix(kscan): Fix building kscan for tests.
| -rw-r--r-- | app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | app/drivers/kscan/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | app/drivers/kscan/Kconfig | 2 | ||||
| -rw-r--r-- | app/drivers/kscan/kscan_composite.c (renamed from app/src/kscan_composite.c) | 0 | ||||
| -rw-r--r-- | app/drivers/kscan/kscan_mock.c (renamed from app/src/kscan_mock.c) | 0 |
5 files changed, 6 insertions, 5 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 658412a..8e88e08 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -57,8 +57,6 @@ target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/battery.c) target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split_listener.c) target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split/bluetooth/service.c) target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL app PRIVATE src/split/bluetooth/central.c) -target_sources_ifdef(CONFIG_ZMK_KSCAN_MOCK_DRIVER app PRIVATE src/kscan_mock.c) -target_sources_ifdef(CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER app PRIVATE src/kscan_composite.c) target_sources_ifdef(CONFIG_USB app PRIVATE src/usb.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c) target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c) diff --git a/app/drivers/kscan/CMakeLists.txt b/app/drivers/kscan/CMakeLists.txt index 19933aa..b5f86ab 100644 --- a/app/drivers/kscan/CMakeLists.txt +++ b/app/drivers/kscan/CMakeLists.txt @@ -1,8 +1,11 @@ # Copyright (c) 2020 The ZMK Contributors # SPDX-License-Identifier: MIT -zephyr_library() +zephyr_library_named(zmk__drivers__kscan) +zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include) zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_GPIO_DRIVER kscan_gpio_matrix.c) zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_GPIO_DRIVER kscan_gpio_direct.c) -zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_GPIO_DRIVER kscan_gpio_demux.c)
\ No newline at end of file +zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_GPIO_DRIVER kscan_gpio_demux.c) +zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_MOCK_DRIVER kscan_mock.c) +zephyr_library_sources_ifdef(CONFIG_ZMK_KSCAN_COMPOSITE_DRIVER kscan_composite.c) diff --git a/app/drivers/kscan/Kconfig b/app/drivers/kscan/Kconfig index 5b913f3..654e0ee 100644 --- a/app/drivers/kscan/Kconfig +++ b/app/drivers/kscan/Kconfig @@ -22,4 +22,4 @@ config ZMK_KSCAN_INIT_PRIORITY int "Keyboard scan driver init priority" default 40 help - Keyboard scan device driver initialization priority.
\ No newline at end of file + Keyboard scan device driver initialization priority. diff --git a/app/src/kscan_composite.c b/app/drivers/kscan/kscan_composite.c index f8e8d60..f8e8d60 100644 --- a/app/src/kscan_composite.c +++ b/app/drivers/kscan/kscan_composite.c diff --git a/app/src/kscan_mock.c b/app/drivers/kscan/kscan_mock.c index f1614f1..f1614f1 100644 --- a/app/src/kscan_mock.c +++ b/app/drivers/kscan/kscan_mock.c |