From cdf99b08f42c3826a8608d756bc7cda0a476ed98 Mon Sep 17 00:00:00 2001
From: Mark Russell <mruss660@gmail.com>
Date: Thu, 16 Sep 2021 16:12:20 -0400
Subject: Revert "Merge upstream"

This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
---
 src/displayapp/DisplayAppRecovery.h | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'src/displayapp/DisplayAppRecovery.h')

diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
index 4184ea49..8b2bc7f5 100644
--- a/src/displayapp/DisplayAppRecovery.h
+++ b/src/displayapp/DisplayAppRecovery.h
@@ -6,38 +6,32 @@
 #include <bits/unique_ptr.h>
 #include <queue.h>
 #include "components/gfx/Gfx.h"
+#include "components/battery/BatteryController.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/ble/BleController.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 #include "drivers/Cst816s.h"
 #include <date/date.h>
 #include <drivers/Watchdog.h>
+#include <components/heartrate/HeartRateController.h>
+#include <components/motion/MotionController.h>
 #include <components/motor/MotorController.h>
+#include <components/settings/Settings.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 #include "Messages.h"
 #include "DummyLittleVgl.h"
+#include "components/timer/TimerController.h"
 
 namespace Pinetime {
-  namespace Drivers {
-    class St7789;
-    class Cst816S;
-    class WatchdogView;
-  }
-  namespace Controllers {
-    class Settings;
-    class Battery;
-    class Ble;
-    class DateTime;
-    class NotificationManager;
-    class HeartRateController;
-    class MotionController;
-    class TouchHandler;
-    class MotorController;
-    class TimerController;
-  }
-
   namespace System {
     class SystemTask;
   };
-
+  namespace Controllers {
+    class TouchHandler;
+  }
   namespace Applications {
     class DisplayApp {
     public:
-- 
cgit v1.2.3-70-g09d2