From 9016c70fac852bbdc14c499399f16dd61e3a13d7 Mon Sep 17 00:00:00 2001
From: reaw <reaw@ad.siwatinc.com>
Date: Sat, 17 Feb 2024 01:19:16 +0700
Subject: [PATCH] adjust ac value, fix weather in standby, add mutex safeguard

---
 ise-display/ise-display-prod.HMI | Bin 37446253 -> 37446253 bytes
 src/ise_display.cpp              |   6 +++++-
 src/main.cpp                     |   8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ise-display/ise-display-prod.HMI b/ise-display/ise-display-prod.HMI
index 786086ce406c394e4460d4daebfc746f5bb953ae..16c95825fada42e6992684f4240d3aa55bd952a7 100644
GIT binary patch
delta 3448
zcmeIyc~F#P0LSs&WdRSogR~VZvC=#OQUTMvQacqq!aUcbG}AyWJK5ZLWLGf{G+*f?
z?;}w|d&vteyfPCi&7;!FqcTM8u-krLn5h|?X8NN)`lFrse)c_{=h=OqnccGDvN~mI
zR{w<L32CDy3>(*KqNDP4-j(iH?9%bUa);w=?{K%(Go<2Nm#olqM~2>=hsxKk%yNd5
zlsgJqyIQ&`4o14&VF~fA(uY;9Q|W;d8IIf-9T)$(TE)38rB(Gg_#kI-`JBvZ{Tetf
znY$*^S25RFaIRW{({t(VqF#Q-5WlAT9do)yZ1==nGJQZ&pyIy6?<k0=5nZ!=<4rq?
zE5B8xExNUJb&d{oIQH*zG&vMG{qOEsb$e%Lrg#D=9;b4t5am{(D$Gvtgq!1YtNg!}
z|H@XbKA!3I1iad7ulCxjz4mIaz1nN9_S)+S&-+gdDDZmL2Th_$GVRPwroHK4ZZ;iF
zC)3$<F<s3qrkm+*dYD_yZRU1!hq=?-WqO)kCfTHz-lmV~Yx<eHO{(c{?lA+*Kr_e;
zHbcx%<2A#~a5KV;H20eO%qTP3+;7I12h3PA&OB(+)}^0!+2cdf7dYK<ac$zQ$k6nQ
z0sSb|cr`&yR1c|#)g<+ZdQ?589#>DOCv7V<qvNsA$pf1d=2}NiWURJFM){UDw1&Ea
zd3MR{8S`A$>An7VD>uw{!5)*~JL(MR$Eu!ElkK#s{^aiNMyZ`@+e4B9dr~cDt}n_e
zi3o;SvvLB%U5Rb1xavWVwKdDv_>Yr|S-$R8azwECKN)Rn^rjFiZI!>hGtMfVAMnh}
z_G#f*t4?m9gEP@8nIDL@y!C?JtUdYu=6^rN)|ibI3&q+kb9^nFcFi2$Ha9EB+C_^3
zx{$XhP(LaVUFug)t4w9o6g#>!tHWq_k19F&JZIljXNcvW=4)3m*-DEDPW$8G{_>=@
zo^+er*2m<>1PV6<R8UP-(^R&auAWgd)J!!?%~m;Tj+(2URr8dk=Br%woO)ippk7oj
zsh3rrdPOZz3)LdESS?XY)iSkQtxzk~t7?_XSF6<;wN|~R3e-BaUcIhtRjA%j8`MU%
zNo`hJRFT@Mwy8JOTdG)XS3A^BwM*?*Z>v4(9ko}ztM;i9RjS@o@2d~gesw^7s1B+_
z>aaSZK2jg6Pt;L$Ons_8Q=hBj>V!I}PN^@{m+C8ZT79j`)EQN-&Z=|jy!u9ctG-j;
zs|)G}^`rVp{j7dbzpCHV#q7cj&Y22a5CU!pg)j(*Do_=wL3N0L8c-8zL2al5b)g<y
z29Xd2mqUGM09Swq8bUNQf-B)FxEdNm3^ajj;99s2nnE+U9-2c7XbG+028e|?h=&`Y
zHMD`YkN}C01nuA^Xb&CWX6Oi=pfhxVu5b%<gYM7+ZiU<6cDMuXgu9?8^nzqaf!@#u
z`a(ar8&aV^+yet(APj=RFa(Bz7ly%b7y%>UUbqiN!DzT2#=rwG7RJGYkOt{69wxv<
zcnBVbN$?0f3Xj3#@B};w8Q_DbU^4jOX~+ZvQy>ch5QM2P4YFZ6JOeXeCd`7_kOOmI
zE<6kKz=HXZ3(vvx@B+LDFTu-@2d}^aSO|+?F)V?lund;N3RnrR!Yasz)vyNE!fQ|f
z>tH>+4mK3R8?XU3!Y0@ZTc8NG!Zvsl-hyJ-4m)5c?1J6!Htd0SU@yE2`=A6$;XQaC
zK7jpj06v6+a0m{=5%>r`hEL!q9D`5cGx!{i!wEPEr{D|t625}d@HLdd87POda1PGH
zH}EZd2j9a5_yK-|pWtWs1%8F!;G$E1e=Z$3!381UhENEDaHs-Rp&C?&2&e%yp%&DJ
zI#3tt!DSE$QE)lbhX!y3c%UIfLnF8nu7azfF~mR<xCX9;>!2w#gX^I=w1Ae-3T}W{
ah=X{z5n4kVXbTCD2uZFY{r$PtFZ~^9qxO6N

delta 3275
zcmeIyXLOTQ9LMn_P0K12kZCAWK!uh9GRly>WEGhrs|d1bO4&*v^g_xG6dE=Ks-g%5
zi$+;xgCL_!*~lJN3J!1p{=T4Z@U`do!kqK{<mUN5=RW7$lO%IjX1+}2?b6<o^(gR?
zFD#&y)$;Up-{!Q0Xk|Th*J6ntFf_b*>lV)@x)$KHIGJUnTB3%<^cxmEBs}h~VXS5=
zZTfIBb^WZ#)_|<^z_cQ^Fx%5bbGtprVF`Ce|Gg9MC$EjOEGnbjcE=^g=j>Rt%5(E|
z1znZ}np@KD<*Z?KRDN!p-qvmD;nsLhQevav-T&CWYozDtT-&FW$sL-<zRUM`f4tk_
zaXYNarUH~*1*#yw+mUVj)kLqO?%eGEAIo#c67O|*ygE0p&dsZH^XlBZIybM*&FjeK
zy!v0bA<gT^J=N4Sk*1cZZR(i1=5<rg)He-GL(|AKHcd=Z)66tCEzBFHrD<han>MDc
zi8AfXo2I?#U^<#krnBi{-ZEXy+oqf8ZhDxWrk9B}z0EtOkLhdPHT_I~Gr$ZqgUnzv
z#0)ht8=UuTA$|JBjTkyOCb~~p1mEnrPN!eLqZL+LWOd(syYq>sK#)_#s$nWl4Ob)7
zNHt20R%6sy^`3g)Um$4Qj*EdK-K#b)@}0dlF4b1h=3Cy*UCW<b$Tg^#uctjB*?(mA
z%p{xd&Ovt---0051K*($u3o;ZVy;g9;x%0rte)5$E;U|F@W<wGw`ppRTD^CSzel8}
zLucQFsjk|-m^JPQe@t*fMXNt5IAOb;3w8XJrn^d7eFxUME3iy@dNslyHpivg^2~8P
zyDh?>p5oDk<P=YlLY~kJx0<Npl~I%Yp&66w_Wu_i>Cq!qf|{bHs%dJvnxST@S<0(s
zt2ruB%~kVMlJcqfYJpm)7OBN*iCU_bsbsZWtxzjfiuyo(s6JAw)W_-*wOW0u)~K~A
zRjpI&)n_VAZBU=9FO*+>slHMh)h4xBZBbiQy4t3;s~u{m+NE}@J!-Gor@mJE)dBU5
zI;ak*!|I62P)F4<bzGfLC)FwStvapFsI%&vI<GFMi|Ug4PF+@4)Kzs&T~{~MO?6A%
zR(I6*DpUQS?y4+xPu*8Ps-M))>KFAuJygG{-_-Bw5A{erR!^oSr&wnxut5OWArOKf
z8)SzZkP~u2Fyw|j5CVB2ALNG@pa2wvLQoirKv8%R98e5Gp*WO)l28gtLm7Ap%0f9P
z4==+j@G4Y*iVz0jPzfTSGE{-8@ETNu>QDn}LL}6J+E54T!s}2E>O%u)2#ugIG=Zkj
z44Oj=cmrBOD`*XEpe;l}J9rb?LkH*xouD&xfw!P5ybax;JM@5_&<moWH@pLVpf9`&
z{h&V#fPpXw2Ez~-3Nhe>SQrLzFdRm}NEij9VGN9g_uzdP2QC;76Tl4<As!4&g2~{4
z1egL-VH!+_888!Offr`O97u$@Fb|Tz2lHV8EQCd{7?!|NSO&?k99F<eNP!RFL-+_*
z!N>3ktcFiv4XlM!SO@FjGf0CC@Hu<|e)tl;f{m~VHp3R!3hA&7w!;qC3A<o7?18<o
z559)|Z~(r6gK!8A!x6}Uqi_t4!wEPEr{G&S4QJpioP+al0WQKN_zo_^6}Sr5;5yuZ
zn{W$m!yWh@GT{ff3t4av?!%Ap6Z{Onzyo*)zrt_uJNyBU;4wV0>hI5{g%xZN0Cot3
zAjk&UAqV7yTo4SoArFK=UdRXe;RPrF1)&fWh9XcDUIYgegHR|AC7>jfg3?e1UV^ev
s4$8yJ@Cv*N6`&%7K{!-`2&fEIpenou)u1}mfSM3#OV{6@?ckO_0VghqSO5S3

diff --git a/src/ise_display.cpp b/src/ise_display.cpp
index 59e9805..beefcca 100644
--- a/src/ise_display.cpp
+++ b/src/ise_display.cpp
@@ -945,11 +945,15 @@ void ISEDisplay::updateACState()
         this->displayAdapter->print("ac_sw.pic2=");
         this->displayAdapter->print(mode != 0 ? COMPONENT_AC_TOGGLE_PIC_ON_PRESSED : COMPONENT_AC_TOGGLE_PIC_OFF_PRESSED);
         this->sendStopBytes();
+        this->giveSerialMutex();
 
         updateuserACmode();
 
         updateACfanSpeed();
-
+        
+        if (!this->takeSerialMutex())
+            return;
+        
         this->displayAdapter->print("ac_temp.val=");
         this->displayAdapter->print(temperature);
         // this->displayAdapter->print("\"");
diff --git a/src/main.cpp b/src/main.cpp
index 5489623..198386b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,7 @@ RemoteVariable weather = RemoteVariable();
 RemoteVariable pm_switch = RemoteVariable();
 RemoteVariable pm_fan_speed = RemoteVariable();
 
-const char *mode_names[] = {"off", "cool", "fan_only"};
+const char *mode_names[] = {"off", "cool", "fan_only", "dry"};
 const char *fan_speed_names[] = {"auto", "high", "medium", "low"};
 uint8_t row = 4;
 uint8_t column = 2;
@@ -19,9 +19,9 @@ const uint8_t light_array[4][2] = {
 
 
 AirConditioner ac = {
-    .max_temperature = 30,
-    .min_temperature = 15,
-    .modes = 3,
+    .max_temperature = 32,
+    .min_temperature = 16,
+    .modes = 4,
     .mode_names = mode_names,
     .fan_speeds = 4,
     .fan_speed_names = fan_speed_names,