rename HardwareInterface to HardwareAbstract in file

This commit is contained in:
Matthew Colvin 2023-08-11 12:13:14 -05:00 committed by MatthewColvin
parent 85343d9bd4
commit 44b5d8cf14
6 changed files with 15 additions and 15 deletions

View file

@ -1,13 +1,13 @@
#include "HardwareInterface.h"
HardwareInterface::HardwareInterface(std::shared_ptr<BatteryInterface> aBattery)
HardwareAbstract::HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery)
: mBattery(std::move(aBattery)){
}
std::optional<HardwareInterface::batteryStatus> HardwareInterface::getBatteryStatus(){
std::optional<HardwareAbstract::batteryStatus> HardwareAbstract::getBatteryStatus(){
if(mBattery){
HardwareInterface::batteryStatus currentStatus;
HardwareAbstract::batteryStatus currentStatus;
currentStatus.percentage = mBattery->getPercentage();
currentStatus.isCharging = mBattery->isCharging();
return currentStatus;

View file

@ -8,7 +8,7 @@
#include <string>
#include "BatteryInterface.h"
class HardwareInterface {
class HardwareAbstract {
public:
struct batteryStatus {
@ -20,7 +20,7 @@ public:
};
virtual std::optional<batteryStatus> getBatteryStatus();
HardwareInterface(std::shared_ptr<BatteryInterface> aBattery = nullptr);
HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery = nullptr);
virtual void init() = 0;
virtual void sendIR() = 0;

View file

@ -49,7 +49,7 @@ void HardwareRevX::initIO() {
gpio_deep_sleep_hold_dis();
}
HardwareRevX::HardwareRevX():HardwareInterface(std::make_shared<Battery>(ADC_BAT,CRG_STAT)){
HardwareRevX::HardwareRevX():HardwareAbstract(std::make_shared<Battery>(ADC_BAT,CRG_STAT)){
}

View file

@ -21,7 +21,7 @@
#include "omoteconfig.h"
class HardwareRevX : public HardwareInterface {
class HardwareRevX : public HardwareAbstract {
public:
enum class WakeReason { RESET, IMU, KEYPAD };
@ -33,7 +33,7 @@ public:
}
static std::weak_ptr<HardwareRevX> getRefrence() { return getInstance(); }
// HardwareInterface
// HardwareAbstract
virtual void init() override;
virtual void sendIR() override;
virtual void MQTTPublish(const char *topic, const char *payload) override;

View file

@ -3,9 +3,9 @@
#include <iostream>
#include <string>
class HardwareSimulator : public HardwareInterface {
class HardwareSimulator : public HardwareAbstract {
public:
HardwareSimulator() : HardwareInterface(nullptr){};
HardwareSimulator() : HardwareAbstract(nullptr){};
virtual void debugPrint(std::string message) override {
std::cout << message;
@ -19,8 +19,8 @@ public:
virtual void init() override;
virtual std::optional<HardwareInterface::batteryStatus> getBatteryStatus() override {
HardwareInterface::batteryStatus fakeStatus;
virtual std::optional<HardwareAbstract::batteryStatus> getBatteryStatus() override {
HardwareAbstract::batteryStatus fakeStatus;
fakeStatus.isCharging = false;
fakeStatus.percentage = 100;
return fakeStatus;

View file

@ -15,12 +15,12 @@
/// of resources.
class OmoteUI {
public:
OmoteUI(std::shared_ptr<HardwareInterface> aHardware)
OmoteUI(std::shared_ptr<HardwareAbstract> aHardware)
: mHardware(aHardware){};
static std::weak_ptr<OmoteUI> getRefrence() { return getInstance(); };
static std::shared_ptr<OmoteUI>
getInstance(std::shared_ptr<HardwareInterface> aHardware = nullptr) {
getInstance(std::shared_ptr<HardwareAbstract> aHardware = nullptr) {
if (mInstance) {
return mInstance;
} else if (aHardware) {
@ -54,7 +54,7 @@ public:
private:
static std::shared_ptr<OmoteUI> mInstance;
std::shared_ptr<HardwareInterface> mHardware;
std::shared_ptr<HardwareAbstract> mHardware;
lv_obj_t *panel = nullptr;
Images imgs = Images();