Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver

# Conflicts: # src/displayapp/Apps.h
2021-10-10 16:48:45 +02:00
parent 92aeae73de f61e88b842
commit 6d0e68d626
12 changed files with 161 additions and 24 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -421,6 +421,7 @@ list(APPEND SOURCE_FILES
        displayapp/screens/BatteryInfo.cpp
        displayapp/screens/Steps.cpp
        displayapp/screens/Timer.cpp
+        displayapp/screens/Error.cpp
        displayapp/screens/Alarm.cpp
        displayapp/Colors.cpp