Merge branch 'develop' into update_touch_driver

2021-10-05 12:45:03 +03:00
parent e468acc99e 392c7ad2ac
commit f61e88b842
28 changed files with 110 additions and 107 deletions
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -108,8 +108,6 @@ namespace Pinetime {
      TouchEvents returnTouchEvent = TouchEvents::None;

      TouchEvents GetGesture();
-      void RunningState();
-      void IdleState();
      static void Process(void* instance);
      void InitHw();
      void Refresh();
@@ -119,8 +117,6 @@ namespace Pinetime {

      Apps nextApp = Apps::None;
      DisplayApp::FullRefreshDirections nextDirection;
-      TickType_t lastWakeTime;
-
      System::BootErrors bootError;
    };
  }