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

Support "Centralize most color definitions" (#50)

Browse Source 
Support changes in InfiniTimeOrg/InfiniTime#1258

The file `lv_pinetime_theme.c` is renamed to `InfiniTimeTheme.cpp`.
Need to pick up that change in the simulator to compile with the new cpp
file if it exists.

Furthermore use the new `InfiniTimeTheme.h` header in simulator files.

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/49
This commit is contained in:
NeroBurner 2022-08-15 13:46:42 +02:00 committed by GitHub
parent fc96e5df31
commit b00dceb8c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -197,8 +197,6 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/displayapp/Colors.cpp ${InfiniTime_DIR}/src/displayapp/Colors.cpp
${InfiniTime_DIR}/src/displayapp/DisplayApp.h ${InfiniTime_DIR}/src/displayapp/DisplayApp.h
${InfiniTime_DIR}/src/displayapp/DisplayApp.cpp ${InfiniTime_DIR}/src/displayapp/DisplayApp.cpp
${InfiniTime_DIR}/src/displayapp/lv_pinetime_theme.h
${InfiniTime_DIR}/src/displayapp/lv_pinetime_theme.c
${InfiniTime_DIR}/src/displayapp/icons/bg_clock.c # used by WatchFaceAnalog.cpp ${InfiniTime_DIR}/src/displayapp/icons/bg_clock.c # used by WatchFaceAnalog.cpp
${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.h ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.h
${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.cpp ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.cpp
@ -231,6 +229,18 @@ target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/systemtask/SystemMonitor.cpp ${InfiniTime_DIR}/src/systemtask/SystemMonitor.cpp
) )
if(EXISTS ${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.cpp)
target_compile_definitions(infinisim PUBLIC INFINITIME_THEME_CPP)
target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.cpp
${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.h
)
else()
target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/displayapp/lv_pinetime_theme.h
${InfiniTime_DIR}/src/displayapp/lv_pinetime_theme.c
)
endif()
# QCBOR # QCBOR
add_library(QCBOR STATIC add_library(QCBOR STATIC

4
main.cpp
View File

@ -21,7 +21,11 @@
#include "lv_drivers/indev/mousewheel.h" #include "lv_drivers/indev/mousewheel.h"
// get PineTime header // get PineTime header
#if defined(INFINITIME_THEME_CPP)
#include "displayapp/InfiniTimeTheme.h"
#else
#include "displayapp/lv_pinetime_theme.h" #include "displayapp/lv_pinetime_theme.h"
#endif
#include <drivers/Hrs3300.h> #include <drivers/Hrs3300.h>
#include <drivers/Bma421.h> #include <drivers/Bma421.h>

4
sim/displayapp/LittleVgl.cpp
View File

@ -1,5 +1,9 @@
#include "displayapp/LittleVgl.h" #include "displayapp/LittleVgl.h"
#if defined(INFINITIME_THEME_CPP)
#include "displayapp/InfiniTimeTheme.h"
#else
#include "displayapp/lv_pinetime_theme.h" #include "displayapp/lv_pinetime_theme.h"
#endif
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include <task.h> #include <task.h>