Merge branch 'develop'

# Conflicts:
#	doc/buildAndProgram.md

1 files changed, 3 insertions, 4 deletions

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 4254523..a87cab0 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -18,6 +18,7 @@
 #include "touchhandler/TouchHandler.h"
 
 #include "Messages.h"
+#include "BootErrors.h"
 
 namespace Pinetime {
 
@@ -61,7 +62,7 @@ namespace Pinetime {
                  Pinetime::Controllers::TimerController& timerController,
                  Pinetime::Controllers::AlarmController& alarmController,
                  Pinetime::Controllers::TouchHandler& touchHandler);
-      void Start();
+      void Start(System::BootErrors error);
       void PushMessage(Display::Messages msg);
 
       void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
@@ -107,8 +108,6 @@ namespace Pinetime {
       TouchEvents returnTouchEvent = TouchEvents::None;
 
       TouchEvents GetGesture();
-      void RunningState();
-      void IdleState();
       static void Process(void* instance);
       void InitHw();
       void Refresh();
@@ -118,7 +117,7 @@ namespace Pinetime {
 
       Apps nextApp = Apps::None;
       DisplayApp::FullRefreshDirections nextDirection;
-      TickType_t lastWakeTime;
+      System::BootErrors bootError;
     };
   }
 }