From c72a0d48dfbca52e655bf62df4fc0d26fadd6721 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Sat, 23 Mar 2024 00:03:30 +0700
Subject: [PATCH] UI working without locking

---
 platformio.ini       |  4 +++-
 src/display.cpp      |  6 +++---
 src/lcd_elements.hpp | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 09540d7..c99100c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,4 +14,6 @@ board = wt32-eth01
 framework = arduino
 lib_deps = siwats/ESPMegaPROR3@^2.3.8
 monitor_speed = 115200
-build_flags = -DCORE_DEBUG_LEVEL=5
\ No newline at end of file
+build_flags = -DCORE_DEBUG_LEVEL=5
+monitor_port = COM36
+upload_port = COM36
\ No newline at end of file
diff --git a/src/display.cpp b/src/display.cpp
index 7dd9adc..e5d8249 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -462,11 +462,11 @@ void CUDDisplay::refresh_display_ac()
     uint8_t mode = this->cards.ac->getMode();
     bool state = mode != 0;
     previous_mode = previous_mode == 0 ? 2 : previous_mode;
-    bool drawn_mode = mode == 0? previous_mode : mode;
+    uint8_t drawn_mode = mode == 0? previous_mode : mode;
     uint8_t fan_speed = this->cards.ac->getFanSpeed();
     uint8_t temperature = this->cards.ac->getTemperature();
     ESP_LOGV("CUD Display", "Mode: %d, Fan Speed: %d, Temperature: %d", mode, fan_speed, temperature);
-    ESP_LOGV("CUD Display", "Previous Mode: %d", previous_mode);
+    ESP_LOGV("CUD Display", "Previous Mode: %d, Drawn Mode: %d", previous_mode, drawn_mode);
     // Draw the state picture set
     // Is the AC locked?
     if (this->ac_locked)
@@ -531,7 +531,7 @@ void CUDDisplay::refresh_display_ac()
     this->giveSerialMutex();
     // Draw the temperature
     this->takeSerialMutex();
-    this->displayAdapter->printf("%s.txt=%d", LCD_DASHBOARD_ELEMENT_NAME_AC_TEMPERATURE, temperature);
+    this->displayAdapter->printf("%s.txt=\"%d\"", LCD_DASHBOARD_ELEMENT_NAME_AC_TEMPERATURE, temperature);
     this->sendStopBytes();
     this->giveSerialMutex();
     
diff --git a/src/lcd_elements.hpp b/src/lcd_elements.hpp
index beceee9..a9d5a90 100644
--- a/src/lcd_elements.hpp
+++ b/src/lcd_elements.hpp
@@ -139,10 +139,10 @@
 
 #define LCD_DASHBOARD_ELEMENT_AC_MODE_COOL 22
 #define LCD_DASHBOARD_ELEMENT_NAME_AC_MODE_COOL "btn_acm_cool"
-#define LCD_DASHBOARD_PIC_AC_MODE_COOL_ACTIVE 70
-#define LCD_DASHBOARD_PIC_AC_MODE_COOL_ACTIVE_PRESS 69
-#define LCD_DASHBOARD_PIC_AC_MODE_COOL_INACTIVE 68
-#define LCD_DASHBOARD_PIC_AC_MODE_COOL_INACTIVE_PRESS 67
+#define LCD_DASHBOARD_PIC_AC_MODE_COOL_ACTIVE 66
+#define LCD_DASHBOARD_PIC_AC_MODE_COOL_ACTIVE_PRESS 65
+#define LCD_DASHBOARD_PIC_AC_MODE_COOL_INACTIVE 64
+#define LCD_DASHBOARD_PIC_AC_MODE_COOL_INACTIVE_PRESS 63
 
 #define LCD_DASHBOARD_ELEMENT_AC_FAN_SPEED_AUTO 24
 #define LCD_DASHBOARD_ELEMENT_NAME_AC_FAN_SPEED_AUTO "btn_acfs_auto"
@@ -159,7 +159,7 @@
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_LOW_INACTIVE_PRESS 79
 
 #define LCD_DASHBOARD_ELEMENT_AC_FAN_SPEED_MEDIUM 26
-#define LCD_DASHBOARD_ELEMENT_NAME_AC_FAN_SPEED_MEDIUM "btn_acfs_medium"
+#define LCD_DASHBOARD_ELEMENT_NAME_AC_FAN_SPEED_MEDIUM "btn_acfs_mid"
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_MEDIUM_ACTIVE 86
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_MEDIUM_ACTIVE_PRESS 85
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_MEDIUM_INACTIVE 84
@@ -167,8 +167,8 @@
 
 #define LCD_DASHBOARD_ELEMENT_AC_FAN_SPEED_HIGH 27
 #define LCD_DASHBOARD_ELEMENT_NAME_AC_FAN_SPEED_HIGH "btn_acfs_high"
-#define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_ACTIVE
-#define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_ACTIVE_PRESS
+#define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_ACTIVE 78
+#define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_ACTIVE_PRESS 77
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_INACTIVE 76
 #define LCD_DASHBOARD_PIC_AC_FAN_SPEED_HIGH_INACTIVE_PRESS 75