From b182f0b75dda2743823c710a8ac330114366bb8d Mon Sep 17 00:00:00 2001
From: Matthew Colvin <Matthew.Colvin@garmin.com>
Date: Mon, 14 Aug 2023 12:57:09 -0500
Subject: [PATCH] move display abstract to first parameter of hardware abstract
 and no longer provide a default for it.

---
 Platformio/HAL/HardwareAbstract.cpp           |  4 ++--
 Platformio/HAL/HardwareAbstract.hpp           | 20 +++++++++----------
 Platformio/HAL/Targets/ESP32/HardwareRevX.cpp |  4 ++--
 .../Targets/Simulator/HardwareSimulator.hpp   |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Platformio/HAL/HardwareAbstract.cpp b/Platformio/HAL/HardwareAbstract.cpp
index b6d70a8..0de7a1b 100644
--- a/Platformio/HAL/HardwareAbstract.cpp
+++ b/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)),
diff --git a/Platformio/HAL/HardwareAbstract.hpp b/Platformio/HAL/HardwareAbstract.hpp
index 0c48b9e..32a32e4 100644
--- a/Platformio/HAL/HardwareAbstract.hpp
+++ b/Platformio/HAL/HardwareAbstract.hpp
@@ -15,11 +15,12 @@
 
 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 {
       /// @brief Percent of battery remaining (0-100]
       int percentage;
@@ -29,25 +30,24 @@ public:
   };
   virtual std::optional<batteryStatus> getBatteryStatus();
 
-  /// @brief Register function to be ran when hardware notifies battery 
-  ///        status has changed. 
+  /// @brief Register function to be ran when hardware notifies battery
+  ///        status has changed.
   /// @param onBatteryStatusChangeHandler - Callable to be ran when batter status changes
   void onBatteryChange(std::function<void(batteryStatus)> onBatteryStatusChangeHandler);
-  
+
   /// @brief Override in order to do setup of hardware devices
   virtual void init() = 0;
-  
+
   /// @brief Override to allow printing of a message for debugging
   /// @param message - Debug message
   virtual void debugPrint(std::string message) = 0;
 
   protected:
     Notification<batteryStatus> mBatteryNotification;
-    
+
   private:
     std::shared_ptr<BatteryInterface> mBattery;
     std::shared_ptr<wifiHandlerInterface> mWifiHandler;
     std::shared_ptr<DisplayAbstract> mDisplay;
-    
 
 };
diff --git a/Platformio/HAL/Targets/ESP32/HardwareRevX.cpp b/Platformio/HAL/Targets/ESP32/HardwareRevX.cpp
index 8351908..6023625 100644
--- a/Platformio/HAL/Targets/ESP32/HardwareRevX.cpp
+++ b/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() {
diff --git a/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp b/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp
index 979dc06..6fc67d5 100644
--- a/Platformio/HAL/Targets/Simulator/HardwareSimulator.hpp
+++ b/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;