From 8c64463b46319f3b0a26e845dc71cc6268f7d1a1 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 11 Jan 2024 22:56:59 +0700
Subject: [PATCH] fix mapping bug

---
 platformio.ini      |  2 +-
 src/cud_display.cpp | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1e2820e..55ed475 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,5 +12,5 @@
 platform = espressif32
 board = wt32-eth01
 framework = arduino
-lib_deps = siwats/ESPMegaProR3@^2.0.2
+lib_deps = siwats/ESPMegaProR3@^2.0.4
 monitor_speed = 115200
\ No newline at end of file
diff --git a/src/cud_display.cpp b/src/cud_display.cpp
index c376e1b..a0b862f 100644
--- a/src/cud_display.cpp
+++ b/src/cud_display.cpp
@@ -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)
 {
-    Serial.printf("Touch Event on Page %d, Component %d, Event %d\n", page, component, event);
     if (page != PAGE_DASHBOARD)
         return;
     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)
 {
-    Serial.printf("PWM Change on Pin %d, Value %d\n", pin, value);
     // Is the pin a light, fan, or air purifier?
     if (pin >= 0 && pin <= 3)
     {
@@ -154,25 +152,25 @@ void CUDDisplay::sendClock()
 
 bool CUDDisplay::calculateLightGroupState() {
     // Check if all lights are on
-    bool allLightsOn = true;
+    bool lightOn = false;
     for (uint8_t i = 0; i < 4; i++) {
-        if (this->outputCard->getState(i) == 0) {
-            allLightsOn = false;
+        if (this->outputCard->getState(i)) {
+            lightOn = true;
             break;
         }
     }
-    return allLightsOn;
+    return lightOn;
 }
 bool CUDDisplay::calculateFanGroupState() {
     // Check if all fans are on
-    bool allFansOn = true;
+    bool fanOn = false;
     for (uint8_t i = 4; i < 7; i++) {
         if (this->outputCard->getState(i) == 0) {
-            allFansOn = false;
+            fanOn = true;
             break;
         }
     }
-    return allFansOn;
+    return fanOn;
 }
 void CUDDisplay::setLightGrouptState(bool state) {
     // Set all lights to state