ise-senior-iot/ise-iot-oop-v2
2
0
Fork 0
Code Pull requests Activity

fix mapping bug

Browse source
This commit is contained in:
Siwat Sirichai 2024-01-11 22:56:59 +07:00
parent 1b175d0b27
commit 8c64463b46
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platformio.ini
View file

@ -12,5 +12,5 @@
platform = espressif32 platform = espressif32
board = wt32-eth01 board = wt32-eth01
framework = arduino framework = arduino
lib_deps = siwats/ESPMegaProR3@^2.0.2 lib_deps = siwats/ESPMegaProR3@^2.0.4
monitor_speed = 115200 monitor_speed = 115200

16
src/cud_display.cpp
View file

@ -32,7 +32,6 @@ void CUDDisplay::begin(std::function<rtctime_t()> getTime, DigitalInputCard *inp
void CUDDisplay::handleTouch(uint8_t page, uint8_t component, uint8_t event) void CUDDisplay::handleTouch(uint8_t page, uint8_t component, uint8_t event)
{ {
Serial.printf("Touch Event on Page %d, Component %d, Event %d\n", page, component, event);
if (page != PAGE_DASHBOARD) if (page != PAGE_DASHBOARD)
return; return;
switch (component) switch (component)
@ -113,7 +112,6 @@ void CUDDisplay::handleTouch(uint8_t page, uint8_t component, uint8_t event)
void CUDDisplay::handlePWMChange(uint8_t pin, uint8_t value) void CUDDisplay::handlePWMChange(uint8_t pin, uint8_t value)
{ {
Serial.printf("PWM Change on Pin %d, Value %d\n", pin, value);
// Is the pin a light, fan, or air purifier? // Is the pin a light, fan, or air purifier?
if (pin >= 0 && pin <= 3) if (pin >= 0 && pin <= 3)
{ {
@ -154,25 +152,25 @@ void CUDDisplay::sendClock()
bool CUDDisplay::calculateLightGroupState() { bool CUDDisplay::calculateLightGroupState() {
// Check if all lights are on // Check if all lights are on
bool allLightsOn = true; bool lightOn = false;
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 4; i++) {
if (this->outputCard->getState(i) == 0) { if (this->outputCard->getState(i)) {
allLightsOn = false; lightOn = true;
break; break;
} }
} }
return allLightsOn; return lightOn;
} }
bool CUDDisplay::calculateFanGroupState() { bool CUDDisplay::calculateFanGroupState() {
// Check if all fans are on // Check if all fans are on
bool allFansOn = true; bool fanOn = false;
for (uint8_t i = 4; i < 7; i++) { for (uint8_t i = 4; i < 7; i++) {
if (this->outputCard->getState(i) == 0) { if (this->outputCard->getState(i) == 0) {
allFansOn = false; fanOn = true;
break; break;
} }
} }
return allFansOn; return fanOn;
} }
void CUDDisplay::setLightGrouptState(bool state) { void CUDDisplay::setLightGrouptState(bool state) {
// Set all lights to state // Set all lights to state