remove IR and
mqtt functions from hardwareAbstraction
This commit is contained in:
parent
6bbc0e5e5d
commit
a4e35a2219
6 changed files with 24 additions and 28 deletions
5
Platformio/.vscode/settings.json
vendored
5
Platformio/.vscode/settings.json
vendored
|
@ -52,7 +52,10 @@
|
|||
"streambuf": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"bit": "cpp"
|
||||
"bit": "cpp",
|
||||
"compare": "cpp",
|
||||
"concepts": "cpp",
|
||||
"numbers": "cpp"
|
||||
},
|
||||
"cmake.sourceDirectory": "${workspaceFolder}/.pio/libdeps/esp32/Adafruit BusIO",
|
||||
"editor.formatOnSave": false,
|
||||
|
|
|
@ -22,9 +22,11 @@ public:
|
|||
|
||||
HardwareAbstract(std::shared_ptr<BatteryInterface> aBattery = nullptr);
|
||||
|
||||
/// @brief Override in order to do setup of hardware devices
|
||||
virtual void init() = 0;
|
||||
virtual void sendIR() = 0;
|
||||
virtual void MQTTPublish(const char *topic, const char *payload) = 0;
|
||||
|
||||
/// @brief Override to allow printing of a message for debugging
|
||||
/// @param message - Debug message
|
||||
virtual void debugPrint(std::string message) = 0;
|
||||
|
||||
private:
|
||||
|
|
|
@ -89,18 +89,23 @@ void HardwareRevX::debugPrint(std::string aDebugMessage) {
|
|||
Serial.print(aDebugMessage.c_str());
|
||||
}
|
||||
|
||||
void HardwareRevX::sendIR() {}
|
||||
// void HardwareRevX::MQTTPublish(const char *topic, const char *payload) {
|
||||
// #ifdef ENABLE_WIFI
|
||||
// if (client.connected()) {
|
||||
// client.publish(topic, payload);
|
||||
// } else {
|
||||
// debugPrint("MQTT Client Not Connected When Attempting Publish.");
|
||||
// }
|
||||
// #else
|
||||
// debugPrint("Attempting To Publish MQTT with wifi Disabled!");
|
||||
// #endif
|
||||
// }
|
||||
|
||||
void HardwareRevX::MQTTPublish(const char *topic, const char *payload) {
|
||||
#ifdef ENABLE_WIFI
|
||||
if (client.connected()) {
|
||||
client.publish(topic, payload);
|
||||
} else {
|
||||
debugPrint("MQTT Client Not Connected When Attempting Publish.");
|
||||
std::shared_ptr<HardwareRevX> HardwareRevX::getInstance(){
|
||||
if (!mInstance) {
|
||||
mInstance = std::shared_ptr<HardwareRevX>(new HardwareRevX());
|
||||
}
|
||||
#else
|
||||
debugPrint("Attempting To Publish MQTT with wifi Disabled!");
|
||||
#endif
|
||||
return mInstance;
|
||||
}
|
||||
|
||||
void HardwareRevX::initLVGL() {
|
||||
|
|
|
@ -25,18 +25,11 @@ class HardwareRevX : public HardwareAbstract {
|
|||
public:
|
||||
enum class WakeReason { RESET, IMU, KEYPAD };
|
||||
|
||||
static std::shared_ptr<HardwareRevX> getInstance() {
|
||||
if (!mInstance) {
|
||||
mInstance = std::shared_ptr<HardwareRevX>(new HardwareRevX());
|
||||
}
|
||||
return mInstance;
|
||||
}
|
||||
static std::shared_ptr<HardwareRevX> getInstance();
|
||||
static std::weak_ptr<HardwareRevX> getRefrence() { return getInstance(); }
|
||||
|
||||
// HardwareAbstract
|
||||
virtual void init() override;
|
||||
virtual void sendIR() override;
|
||||
virtual void MQTTPublish(const char *topic, const char *payload) override;
|
||||
virtual void debugPrint(std::string aDebugMessage) override;
|
||||
|
||||
void loopHandler();
|
||||
|
|
|
@ -11,12 +11,6 @@ public:
|
|||
std::cout << message;
|
||||
}
|
||||
|
||||
virtual void sendIR() override {}
|
||||
|
||||
virtual void MQTTPublish(const char *topic, const char *payload) override{
|
||||
|
||||
};
|
||||
|
||||
virtual void init() override;
|
||||
|
||||
virtual std::optional<HardwareAbstract::batteryStatus> getBatteryStatus() override {
|
||||
|
|
|
@ -33,7 +33,6 @@ void OmoteUI::bl_slider_event_cb(lv_event_t *e) {
|
|||
// Apple Key Event handler
|
||||
void OmoteUI::appleKey_event_cb(lv_event_t *e) {
|
||||
// Send IR command based on the event user data
|
||||
mHardware->sendIR();
|
||||
//mHardware->debugPrint(std::to_string(50 + (int)e->user_data));
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue