siwat/ESPMegaPRO-v3-SDK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor for integration of InternalDisplay

Browse source
This commit is contained in:
Siwat Sirichai 2023-12-30 15:56:05 +07:00
parent d0e4825c2d
commit c224aba193
5 changed files with 33 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.cpp
View file

@ -26,7 +26,7 @@ void ESPMegaPRO::loop() {
cards[i]->loop();
}
}
iot.loop();
iot->loop();
}
bool ESPMegaPRO::installCard(uint8_t slot, ExpansionCard* card) {
if (slot > 255) return false;
@ -88,11 +88,27 @@ void ESPMegaPRO::setTime(int hours, int minutes, int seconds, int day, int month
}
void ESPMegaPRO::enableIotModule() {
iot.intr_begin(cards);
if (iotEnabled) return;
this->iot = new ESPMegaIoT();
this->iot->intr_begin(cards);
iotEnabled = true;
}
ExpansionCard* ESPMegaPRO::getCard(uint8_t slot) {
if (slot > 255) return nullptr;
if (!cardInstalled[slot]) return nullptr;
return cards[slot];
}
void ESPMegaPRO::enableInternalDisplay(HardwareSerial *serial) {
if (internalDisplayEnabled) return;
if (!iotEnabled) {
Serial.println("Cannot Enable Internal Display without IoT Module being enabled!");
return;
}
display = new InternalDisplay(serial);
auto bindedGetTime = std::bind(&ESPMegaPRO::getTime, this);
display->begin(this->iot,bindedGetTime);
internalDisplayEnabled = true;
}