will/InfiniSim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100 from InfiniTimeOrg/TimerController_to_Timer

Browse Source 
Support TimerController rename to Timer
This commit is contained in:
NeroBurner 2023-05-01 21:04:45 +02:00 committed by GitHub
commit 512f25157b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -214,10 +214,10 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.h ${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.h
) )
if(EXISTS ${InfiniTime_DIR}/src/wrappers/FreeRTOS/Timer.h) if(EXISTS ${InfiniTime_DIR}/src/components/timer/Timer.h)
target_sources(infinisim PUBLIC target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/wrappers/FreeRTOS/Timer.h ${InfiniTime_DIR}/src/components/timer/Timer.h
${InfiniTime_DIR}/src/wrappers/FreeRTOS/Timer.cpp ${InfiniTime_DIR}/src/components/timer/Timer.cpp
) )
else() else()
target_compile_definitions(infinisim PUBLIC INFINITIME_TIMERCONTROLLER) target_compile_definitions(infinisim PUBLIC INFINITIME_TIMERCONTROLLER)

2
InfiniTime

@ -1 +1 @@
Subproject commit 238a829577c71dc9cfc5d96d01d098e47c9508ef Subproject commit 40f7e1c7be6882e01058b5ccf64d5005c6105346