Merge branch 'develop'

# Conflicts:
#	doc/buildAndProgram.md

1 files changed, 21 insertions, 0 deletions

diff --git a/src/displayapp/screens/Error.h b/src/displayapp/screens/Error.h
new file mode 100644
index 0000000..20dde7e
--- /dev/null
+++ b/src/displayapp/screens/Error.h
@@ -0,0 +1,21 @@
+#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;
+
+        void ButtonEventHandler();
+      private:
+        lv_obj_t* btnOk;
+      };
+    }
+  }
+}