diff options
| author | jlukanc <27705324+jlukanc1@users.noreply.github.com> | 2021-01-23 16:12:06 -0500 |
|---|---|---|
| committer | jlukanc <27705324+jlukanc1@users.noreply.github.com> | 2021-01-23 16:12:06 -0500 |
| commit | 4cbcc99c8dfbd27bf3c87ef1c2b13af871a9c269 (patch) | |
| tree | 9ddd150915e30ec7940d55058ee8013d3651069a | |
| parent | bf7d77bd341de7360d7e4331ee088dc7a72620fc (diff) | |
fis merge conflict?
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3fe5d50a..0ed2562f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -457,7 +457,6 @@ set(INCLUDE_FILES components/ble/ImmediateAlertService.h components/ble/ServiceDiscovery.h components/ble/BleClient.h - components/motor/MotorController.h drivers/Cst816s.h FreeRTOS/portmacro.h FreeRTOS/portmacro_cmsis.h @@ -474,6 +473,7 @@ set(INCLUDE_FILES systemtask/SystemMonitor.h displayapp/screens/Symbols.h drivers/TwiMaster.h + components/motor/MotorController.h ) include_directories( |