From 2dee25276c54b15777613de007481ceaf00db617 Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Fri, 29 Dec 2023 21:41:19 +0700 Subject: [PATCH] implement internal display --- Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp | 1 - .../lib/ESPMegaPRO/InternalDisplay.cpp | 14 ++++++++++++++ .../lib/ESPMegaPRO/InternalDisplay.hpp | 1 + Template Project/src/iot_framdemo.cpp | 4 ++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp b/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp index ee2dbad..fb65de2 100644 --- a/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp +++ b/Template Project/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp @@ -10,7 +10,6 @@ #include #include - struct rtctime_t { uint8_t hours; uint8_t minutes; diff --git a/Template Project/lib/ESPMegaPRO/InternalDisplay.cpp b/Template Project/lib/ESPMegaPRO/InternalDisplay.cpp index 96894d7..3f75678 100644 --- a/Template Project/lib/ESPMegaPRO/InternalDisplay.cpp +++ b/Template Project/lib/ESPMegaPRO/InternalDisplay.cpp @@ -99,3 +99,17 @@ void InternalDisplay::setPWMAdjustmentPin(uint8_t pin) { void InternalDisplay::setPWMAdjustmentButton(bool state) { // TODO: implementation } + +void InternalDisplay::setOutputStateColor(uint8_t pin, bool state) { + // TODO: implementation +} + +void InternalDisplay::setInputMarker(uint8_t pin, bool state) { + // TODO: implementation +} + +InternalDisplay::InternalDisplay(HardwareSerial *displayAdapter) : ESPMegaDisplay(displayAdapter) { + this->currentPage = INTERNAL_DISPLAY_DASHBOARD_PAGE; + this->bindedInputCard = 0; + this->bindedOutputCard = 0; +} \ No newline at end of file diff --git a/Template Project/lib/ESPMegaPRO/InternalDisplay.hpp b/Template Project/lib/ESPMegaPRO/InternalDisplay.hpp index 1793648..e2e28a7 100644 --- a/Template Project/lib/ESPMegaPRO/InternalDisplay.hpp +++ b/Template Project/lib/ESPMegaPRO/InternalDisplay.hpp @@ -8,6 +8,7 @@ class InternalDisplay : public ESPMegaDisplay { public: + InternalDisplay(HardwareSerial *displayAdapter); void begin(ESPMegaPRO *espmega); void loop(); void bindInputCard(uint8_t card_id); diff --git a/Template Project/src/iot_framdemo.cpp b/Template Project/src/iot_framdemo.cpp index 74e334e..8544cc0 100644 --- a/Template Project/src/iot_framdemo.cpp +++ b/Template Project/src/iot_framdemo.cpp @@ -1,7 +1,9 @@ #include +#include #include ESPMegaPRO espmega = ESPMegaPRO(); +InternalDisplay display = InternalDisplay(&Serial); void input_change_callback(uint8_t pin, uint8_t value) { Serial.print("Input change callback: "); @@ -50,6 +52,8 @@ void setup() { Serial.println("Initialization Routine Complete"); ((DigitalInputIoT*)espmega.iot.getComponent(0)) -> registerChangeCallback(input_change_callback); + + } void loop() {