diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:30 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-02-14 14:19:30 +0100 |
| commit | 5fdfb2112e2f6413c4d01c74dd04492e27a6d406 (patch) | |
| tree | 983bd7fb1780c433aa12331377e67ced9b46b3a8 /src/CMakeLists.txt | |
| parent | 4c3803450e33e321dd2f90bdf62b9abe99f1e491 (diff) | |
| parent | 1e2cc3ce91b402459790332b84e3f8dcbe5dc340 (diff) | |
Fix merge conflict.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 863d3179..78f7cebb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,10 +36,12 @@ set(SDK_SOURCE_FILES # Base SDK "${NRF5_SDK_PATH}/components/boards/boards.c" "${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.c" + "${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.h" "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_clock.c" "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_gpiote.c" "${NRF5_SDK_PATH}/modules/nrfx/soc/nrfx_atomic.c" "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c" + "${NRF5_SDK_PATH}/components/libraries/timer/app_timer.h" # FreeRTOS ${NRF5_SDK_PATH}/external/freertos/source/croutine.c @@ -468,6 +470,7 @@ list(APPEND SOURCE_FILES components/ble/ServiceDiscovery.cpp components/ble/HeartRateService.cpp components/firmwarevalidator/FirmwareValidator.cpp + components/motor/MotorController.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c @@ -577,6 +580,7 @@ set(INCLUDE_FILES components/heartrate/Biquad.h components/heartrate/Ptagc.h components/heartrate/HeartRateController.h + components/motor/MotorController.h ) include_directories( |