5 files changed, 96 insertions, 5 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 684e3a46..0b102100 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -30,7 +30,8 @@ namespace Pinetime {
       SettingTimeFormat,
       SettingDisplay,
       SettingWakeUp,
-      SettingSteps
+      SettingSteps,
+      Error,
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 7fe69397..41fa7d80 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -28,6 +28,7 @@
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
 #include "displayapp/screens/Steps.h"
+#include "displayapp/screens/Error.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
@@ -107,11 +108,16 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     timerController {timerController} {
 }
 
-void DisplayApp::Start() {
+void DisplayApp::Start(System::BootErrors error) {
   msgQueue = xQueueCreate(queueSize, itemSize);
 
-  // Start clock when smartwatch boots
-  LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::None);
+  bootError = error;
+
+  if (error == System::BootErrors::TouchController) {
+    LoadApp(Apps::Error, DisplayApp::FullRefreshDirections::None);
+  } else {
+    LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::None);
+  }
 
   if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
@@ -325,6 +331,11 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
                                                        motionController);
       break;
 
+    case Apps::Error:
+      currentScreen = std::make_unique<Screens::Error>(this, bootError);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
+      break;
+
     case Apps::FirmwareValidation:
       currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 574be63f..ba119133 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -15,6 +15,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/timer/TimerController.h"
 #include "Messages.h"
+#include "BootErrors.h"
 
 namespace Pinetime {
 
@@ -56,7 +57,7 @@ namespace Pinetime {
                  Pinetime::Controllers::MotorController& motorController,
                  Pinetime::Controllers::MotionController& motionController,
                  Pinetime::Controllers::TimerController& timerController);
-      void Start();
+      void Start(System::BootErrors error);
       void PushMessage(Display::Messages msg);
 
       void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
@@ -114,6 +115,8 @@ namespace Pinetime {
       Apps nextApp = Apps::None;
       DisplayApp::FullRefreshDirections nextDirection;
       TickType_t lastWakeTime;
+
+      System::BootErrors bootError;
     };
   }
 }
diff --git a/src/displayapp/screens/Error.cpp b/src/displayapp/screens/Error.cpp
new file mode 100644
index 00000000..7ad52ade
--- /dev/null
+++ b/src/displayapp/screens/Error.cpp
@@ -0,0 +1,54 @@
+#include "Error.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  void ButtonEventCallback(lv_obj_t* obj, lv_event_t /*event*/) {
+    auto* errorScreen = static_cast<Error*>(obj->user_data);
+    errorScreen->ButtonEventHandler();
+  }
+}
+
+Error::Error(Pinetime::Applications::DisplayApp* app, System::BootErrors error)
+  : Screen(app) {
+
+  lv_obj_t* warningLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(warningLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  lv_label_set_text_static(warningLabel, "Warning");
+  lv_obj_align(warningLabel, nullptr, LV_ALIGN_IN_TOP_MID, 0, 0);
+
+  lv_obj_t* causeLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_long_mode(causeLabel, LV_LABEL_LONG_BREAK);
+  lv_obj_set_width(causeLabel, LV_HOR_RES);
+  lv_obj_align(causeLabel, warningLabel, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+
+  if (error == System::BootErrors::TouchController) {
+    lv_label_set_text_static(causeLabel, "Touch controller error detected.");
+  }
+
+  lv_obj_t* tipLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_long_mode(tipLabel, LV_LABEL_LONG_BREAK);
+  lv_obj_set_width(tipLabel, LV_HOR_RES);
+  lv_label_set_text_static(tipLabel, "If you encounter problems and your device is under warranty, contact the devices seller.");
+  lv_obj_align(tipLabel, causeLabel, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+
+  btnOk = lv_btn_create(lv_scr_act(), nullptr);
+  btnOk->user_data = this;
+  lv_obj_set_event_cb(btnOk, ButtonEventCallback);
+  lv_obj_set_size(btnOk, LV_HOR_RES, 50);
+  lv_obj_align(btnOk, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_obj_set_style_local_value_str(btnOk, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Proceed");
+  lv_obj_set_style_local_bg_color(btnOk, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+}
+
+void Error::ButtonEventHandler() {
+  running = false;
+}
+
+Error::~Error() {
+  lv_obj_clean(lv_scr_act());
+}
+
+bool Error::Refresh() {
+  return running;
+}
diff --git a/src/displayapp/screens/Error.h b/src/displayapp/screens/Error.h
new file mode 100644
index 00000000..58016d82
--- /dev/null
+++ b/src/displayapp/screens/Error.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "Screen.h"
+#include "BootErrors.h"
+#include <lvgl/lvgl.h>
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
+      class Error : public Screen {
+      public:
+        Error(DisplayApp* app, System::BootErrors error);
+        ~Error() override;
+
+        bool Refresh() override;
+        void ButtonEventHandler();
+      private:
+        lv_obj_t* btnOk;
+      };
+    }
+  }
+}