From 17283175448c58530a4648c3d576c1bf65e65a06 Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Sun, 20 Feb 2022 15:51:54 +0100 Subject: [PATCH 1/2] cmake: add SystemMonitor.cpp https://github.com/InfiniTimeOrg/InfiniTime/pull/967 splits SystemMonitor.h into a h and cpp file. Add the cpp file to the infinisim target. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c60546..7927d3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,6 +183,8 @@ target_sources(infinisim PUBLIC ${InfiniTime_DIR}/src/touchhandler/TouchHandler.cpp ${InfiniTime_DIR}/src/systemtask/SystemTask.h ${InfiniTime_DIR}/src/systemtask/SystemTask.cpp + ${InfiniTime_DIR}/src/systemtask/SystemMonitor.h + ${InfiniTime_DIR}/src/systemtask/SystemMonitor.cpp ) From e5ce07cb75c2e51125c1c13d4f9defe6532a5a11 Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Tue, 8 Mar 2022 20:47:46 +0100 Subject: [PATCH 2/2] Use official InfiniTime project with latest `develop` branch --- .gitmodules | 2 +- InfiniTime | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bb548ac..d98fed9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "InfiniTime"] path = InfiniTime - url = ../../NeroBurner/InfiniTime.git + url = ../../InfiniTimeOrg/InfiniTime.git [submodule "lv_drivers"] path = lv_drivers url = ../../lvgl/lv_drivers.git diff --git a/InfiniTime b/InfiniTime index 7142de2..187d99c 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit 7142de2aa65bddbde7fda341bde2124952beda2c +Subproject commit 187d99c0f710cf4827a026f02e41ebbd2b1271e2