From 0a93b9902123017d45fb8c1623b5a0cc7f2d1140 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Sat, 23 Mar 2024 11:08:33 +0700
Subject: [PATCH] display update

---
 display/cud_display_v3.HMI | Bin 10224076 -> 10224076 bytes
 src/display.hpp            |   4 ++--
 src/main.cpp               |   3 +++
 src/main.hpp               |   6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/display/cud_display_v3.HMI b/display/cud_display_v3.HMI
index 819e677134b3ed3492398a41fe10c8e712f5b887..1066b18b40f19c2a7a5c1bd030ffaba29a743200 100644
GIT binary patch
delta 1170
zcmd_m-ET`_90%~8_Ea}naCO9mOx!NmTp61&FEgcM)O5^NZ(G;eYN(fCs^9Z;6x|HR
zOI++m+%zFw@`MYE8;NWoz2C(XL{uco#V#Zg-)>g>2P6_F`Q+sHa-Q$WGak$7<Mbq8
zcjQv8bja>2DSbU*t5_cP+h#puWy1EZm5o;uw)BU2%B4T_R4j~TjCjV-$W9K@$w_l$
z#&E634k@E}r0DOQ9aBbJF<dcRF<dcRF<dcR8LlPSe_<i5j6e@op%SaH234rWTGU`2
z)}t01uo0WE8Fko#dTfOo+prxTG++mIq7l2W8(!=|6ZXP~X6(a$wBP_*(FQ*b;t&qw
z2#%s19SEQkL4<G&UFb#_$I*imIEhn;;55$QEY6`9=WziS(T7Wj;xb~uh?yPJC%eCd
z<l8cl(KSsDmy6L7zWvpru2|Eo=w~x%NuQ{-7Py5W=Qj(dCX=7cZyJ|4eCC*0TIQcw
zQXVmB|J{~t-%Ss9<e*nP&+jrID0yH*p&0mS{wa9MRH3~wy)vhZ_WasZk?atig`y!O
z9`O&RC+;rsxKPxGMX!?+|6=BpM?@pPk;99`X#UOSi^3UAQ4z>DUt)R~?H6<H@@tK?
zRMUT0A6L%4ld2-E+<N-n?2|2(!jZqI|NDaCsf3_7_0tu)N(s6~*Xaf&X@CalCJoUo
Tx=nY;qPujD?#oo-L22X{m`B%z

delta 1193
zcmdtfOH30{6b9f<J9RK=l+{gigK<mLu)_yF>JzI}MX1FGl!vrfu_6{}MTP!zi&ShC
zWqj<78;nWOyE1OvftuMEmRDnp-I&VG7^8=|65SgU<0M~l=A1eApUli=%K9vM9CLeK
zrd-9iJM61^k#g0nO+;M3T{G3(^{$l~<$zIqzf2l>sPgTKjLot((}<gRh)%p@iLjZm
zt~4Rp(&>u7b9P3utfX*B;gZ57g-Z&T6fT*us`M{BP?Rjzhgz)125iJ8)L}EWU@Nx4
zkL}ojo!Eul*n@iPMF9J-9}NiN01o018gUp+XhsM}5Jn4*;uwzO1X|IC2-?wsPITcU
zx)DVTJvfCpPNNrRkic2=;T-yL9!U(~0tS&n8W%ByOSp_H7{&-Pz_eMK(evL2M#SrC
zZtIh;%x3HP7n2EJ4Yv*Pb<WH<P4Tpj&sR9(!Y7kiBFz0(Wq>oWyoGx;k^g9Z)_#o(
z-%P)tvCp&66SUIlRMx_>Xqz`1)ZjxC?@|?os!GMv0YSClyv>>jSGS_9^KP|~kMbT>
z1>^jI6D|V1{GqDq6FjP>Mn8Y1dMlHQy}7}kyB77Bcr?Tt)x)7-9#a)F7mt54%AaT=
zQERQ%bT&4g{trJ@+UxwMKmS14sT?O+GD@zJF_I(K$T+!9@}xj+keg(J+#<KhB(caH
Na+ll_Q@Q(9$sfXl9V!3-

diff --git a/src/display.hpp b/src/display.hpp
index 0fc9f59..b4a5441 100644
--- a/src/display.hpp
+++ b/src/display.hpp
@@ -63,6 +63,8 @@ class CUDDisplay : public ESPMegaDisplay
         CUDDisplay(cud_display_conf_t *conf);
         void begin(cud_display_cards_t cards);
         void display_init();
+        void set_ac_lock(bool state);
+        bool get_ac_lock();
     private:
         // States Calculation
         bool get_lights_state();
@@ -87,8 +89,6 @@ class CUDDisplay : public ESPMegaDisplay
         // Helper Functions
         void system_toggle();
         // AC Functions and Variables
-        void set_ac_lock(bool state);
-        bool get_ac_lock();
         bool ac_locked;
         uint8_t previous_mode; // Used to store mode prior to turning off
         // Local Variables
diff --git a/src/main.cpp b/src/main.cpp
index 5b7c1a6..3215d72 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,6 +81,9 @@ void setup()
   ESP_LOGV("CUD IoT OS", "Initializing Air Conditioner");
   espmega.installCard(2, &ac);
   ac.bindFRAM(&espmega.fram, AC_FRAM_ADDR);
+  ac.loadStateFromFRAM();
+  ac.setFRAMAutoSave(true);
+  ESP_LOGD("CUD IoT OS", "Loaded Air Conditioner State from FRAM, Temperature: %d, Mode: %d, Fan Speed: %d", ac.getTemperature(), ac.getMode(), ac.getFanSpeed());
   espmega.display->bindClimateCard(&ac); // Show our climate card on the display
   // Register all cards with iot
   ESP_LOGV("CUD IoT OS", "Registering Cards with IoT");
diff --git a/src/main.hpp b/src/main.hpp
index 9887a32..859c4b5 100644
--- a/src/main.hpp
+++ b/src/main.hpp
@@ -64,9 +64,9 @@
 /***********************************************
  *      Persistent Storage Configuration       *
  ***********************************************/
-#define AC_FRAM_ADDR 5000 // 2 bytes
-#define AC_LOCK_FRAM_ADDR 5002 // 1 byte
-#define AC_DISPLAY_MODE_FRAM_ADDR 5003 // 1 byte
+#define AC_FRAM_ADDR 10000 // 3 bytes
+#define AC_LOCK_FRAM_ADDR 10005 // 1 byte
+#define AC_DISPLAY_MODE_FRAM_ADDR 10010 // 1 byte
 
 /***********************************************
  *               Remote Variables              *