morgan/OMOTE
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

add display interface to HardwareAbstract

Browse source
This commit is contained in:
Matthew Colvin 2023-08-11 23:33:41 -05:00 • committed by MatthewColvin
parent 03c4441bb0
commit 35de08d2e3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Platformio/HAL/HardwareAbstract.cpp
View file

@ -2,10 +2,12 @@
HardwareAbstract::HardwareAbstract( HardwareAbstract::HardwareAbstract(
std::shared_ptr<BatteryInterface> aBattery, std::shared_ptr<BatteryInterface> aBattery,
std::shared_ptr<wifiHandlerInterface> aWifiHandler std::shared_ptr<wifiHandlerInterface> aWifiHandler,
std::shared_ptr<DisplayInterface> aDisplay
) )
: mBattery(std::move(aBattery)), : mBattery(std::move(aBattery)),
mWifiHandler(std::move(aWifiHandler)) mWifiHandler(std::move(aWifiHandler)),
mDisplay(std::move(aDisplay))
{} {}
std::optional<HardwareAbstract::batteryStatus> HardwareAbstract::getBatteryStatus(){ std::optional<HardwareAbstract::batteryStatus> HardwareAbstract::getBatteryStatus(){

5
Platformio/HAL/HardwareAbstract.hpp
View file

@ -7,6 +7,7 @@
#include <optional> #include <optional>
#include <string> #include <string>
#include "BatteryInterface.h" #include "BatteryInterface.h"
#include "DisplayInterface.h"
#include "wifiHandlerInterface.h" #include "wifiHandlerInterface.h"
class HardwareAbstract { class HardwareAbstract {
@ -22,7 +23,8 @@ public:
virtual std::optional<batteryStatus> getBatteryStatus(); virtual std::optional<batteryStatus> getBatteryStatus();
HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery = nullptr, HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery = nullptr,
std::shared_ptr<wifiHandlerInterface> aWifiHandler = nullptr std::shared_ptr<wifiHandlerInterface> aWifiHandler = nullptr,
std::shared_ptr<DisplayInterface> aDisplay = nullptr
); );
/// @brief Override in order to do setup of hardware devices /// @brief Override in order to do setup of hardware devices
@ -35,4 +37,5 @@ public:
private: private:
std::shared_ptr<BatteryInterface> mBattery; std::shared_ptr<BatteryInterface> mBattery;
std::shared_ptr<wifiHandlerInterface> mWifiHandler; std::shared_ptr<wifiHandlerInterface> mWifiHandler;
std::shared_ptr<DisplayInterface> mDisplay;
}; };