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/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -34,7 +34,8 @@ namespace Pinetime {
      SettingSteps,
      SettingPineTimeStyle,
      SettingSetDate,
-      SettingSetTime
+      SettingSetTime,
+      Error,
    };
  }
 }