move display abstract to first parameter of hardware

abstract and no longer provide a default for it.

Platformio/HAL/HardwareAbstract.cpp

@@ -1,9 +1,9 @@
 #include "HardwareAbstract.hpp"
 
 HardwareAbstract::HardwareAbstract(
+    std::shared_ptr<DisplayAbstract> aDisplay,
     std::shared_ptr<BatteryInterface> aBattery,
-    std::shared_ptr<wifiHandlerInterface> aWifiHandler,
-    std::shared_ptr<DisplayAbstract> aDisplay
+    std::shared_ptr<wifiHandlerInterface> aWifiHandler
 )
 : mBattery(std::move(aBattery)),
   mWifiHandler(std::move(aWifiHandler)),

Platformio/HAL/HardwareAbstract.hpp

@@ -15,9 +15,10 @@
 
 class HardwareAbstract {
 public:
-  HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery = nullptr,
-                   std::shared_ptr<wifiHandlerInterface> aWifiHandler = nullptr,
-                   std::shared_ptr<DisplayAbstract> aDisplay = nullptr
+  HardwareAbstract(
+    std::shared_ptr<DisplayAbstract> aDisplay,
+    std::shared_ptr<BatteryInterface> aBattery = nullptr,
+    std::shared_ptr<wifiHandlerInterface> aWifiHandler = nullptr
   );
 
   struct batteryStatus {
@@ -49,5 +50,4 @@ public:
     std::shared_ptr<wifiHandlerInterface> mWifiHandler;
     std::shared_ptr<DisplayAbstract> mDisplay;
 
-
 };

Platformio/HAL/Targets/ESP32/HardwareRevX.cpp

@@ -53,9 +53,9 @@ void HardwareRevX::initIO() {
 
 HardwareRevX::HardwareRevX():
   HardwareAbstract(
+    Display::getInstance(standbyTimer),
     std::make_shared<Battery>(ADC_BAT,CRG_STAT),
-    wifiHandler::getInstance(),
-    Display::getInstance(standbyTimer)
+    wifiHandler::getInstance()
   ){}
 
 HardwareRevX::WakeReason getWakeReason() {

Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp

@@ -5,7 +5,7 @@
 
 class HardwareSimulator : public HardwareAbstract {
 public:
-  HardwareSimulator() : HardwareAbstract(nullptr){};
+  HardwareSimulator() : HardwareAbstract(){};
 
   virtual void debugPrint(std::string message) override {
     std::cout << message;