scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

fis merge conflict?

Browse source
This commit is contained in:
jlukanc 2021-01-23 16:12:06 -05:00
parent bf7d77bd34
commit 4cbcc99c8d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -457,7 +457,6 @@ set(INCLUDE_FILES
components/ble/ImmediateAlertService.h components/ble/ImmediateAlertService.h
components/ble/ServiceDiscovery.h components/ble/ServiceDiscovery.h
components/ble/BleClient.h components/ble/BleClient.h
components/motor/MotorController.h
drivers/Cst816s.h drivers/Cst816s.h
FreeRTOS/portmacro.h FreeRTOS/portmacro.h
FreeRTOS/portmacro_cmsis.h FreeRTOS/portmacro_cmsis.h
@ -474,6 +473,7 @@ set(INCLUDE_FILES
systemtask/SystemMonitor.h systemtask/SystemMonitor.h
displayapp/screens/Symbols.h displayapp/screens/Symbols.h
drivers/TwiMaster.h drivers/TwiMaster.h
components/motor/MotorController.h
) )
include_directories( include_directories(