From 02b14d2187644b244127d8183fa283ad17b61e2c Mon Sep 17 00:00:00 2001
From: reaw55 <58457329+reaw55@users.noreply.github.com>
Date: Sat, 9 Mar 2024 19:28:44 +0700
Subject: [PATCH] revert

---
 platformio.ini      | 4 ++--
 src/ise_display.cpp | 2 +-
 src/ise_display.hpp | 3 ++-
 src/main.cpp        | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index b8ee1dc..b44d0f5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -15,5 +15,5 @@ framework = arduino
 lib_deps = siwats/ESPMegaPROR3@^2.3.6
 monitor_speed = 115200
 build_flags = -DCORE_DEBUG_LEVEL=0
-upload_port = COM32
-monitor_port = COM32
\ No newline at end of file
+upload_port = COM4
+monitor_port = COM4
\ No newline at end of file
diff --git a/src/ise_display.cpp b/src/ise_display.cpp
index 40a2c6a..885a102 100644
--- a/src/ise_display.cpp
+++ b/src/ise_display.cpp
@@ -530,7 +530,7 @@ void ISEDisplay::toggleAC()
         ESP_LOGI("ISEDisplay", "User mode AFTER: %d", user_mode);
         setACstate(fan_speed, 0, temperature);
     }
-}
+} 
 void ISEDisplay::changeUserACmode()
 {
     // Get the current group state
diff --git a/src/ise_display.hpp b/src/ise_display.hpp
index 3074d30..98ab27e 100644
--- a/src/ise_display.hpp
+++ b/src/ise_display.hpp
@@ -34,6 +34,7 @@ class ISEDisplay : public ESPMegaDisplay {
         void updateTempOutside(float temp_outside);
         void updatePMoutside(u_int16_t pm25_outside);
         void updatePMinside(u_int16_t pm25_inside);
+        void updateACState();
         void loop();
 
         
@@ -72,7 +73,7 @@ class ISEDisplay : public ESPMegaDisplay {
         u_int8_t lightLevelRow3;
         u_int8_t lightLevelRow4;
         
-        void updateACState();
+        
         void updateuserACmode();
         void updateACfanSpeed();
         bool calculateLightGroupState();
diff --git a/src/main.cpp b/src/main.cpp
index ef6dbe4..38aa4fa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,7 +35,6 @@ AirConditioner ac = {
     .fan_speeds = 4,
     .fan_speed_names = fan_speed_names,
     .getInfraredCode = &getInfraredCode};
-
 /***********************************************
  *            End Configuration                *
  ***********************************************/
@@ -47,7 +46,7 @@ ClimateCard climateCard = ClimateCard(AIR_CONDITIONER_IR_PIN, ac,
                                       AIR_CONDITIONER_SENSOR_TYPE, AIR_CONDITIONER_SENSOR_PIN,
                                       AIR_CONDITIONER_RMT_CHANNEL);
 
-void adc2current(uint16_t adc_value)
+float adcToCurrent(uint16_t adc_value)
 {
   // 16 bit ADC value to current in amps
   // ADC Range is 0-65535, It have an input range of 0-3.3V
@@ -129,11 +128,11 @@ void setup()
   }
   espmega.outputs.setState(12, true);
   espmega.outputs.setValue(12,4095);
-  espmega.installCard(2, &climateCard_daikin);
+  espmega.installCard(2, &climateCard);
   climateCard.bindFRAM(&espmega.fram, 5000);
   climateCard.loadStateFromFRAM();
   climateCard.setFRAMAutoSave(true);
-  espmega.display->bindclimateCard(&climateCard);
+  espmega.display->bindClimateCard(&climateCard);
   espmega.installCard(4, &ct_light_phase1);
   espmega.installCard(5, &ct_light_phase2);
   espmega.installCard(6, &ct_socket);
@@ -448,6 +447,7 @@ void handlePageChange(uint8_t page)
   iseDisplay.updatePMinside(get_pm25_in());
   iseDisplay.updateWeather(weather.getValue());
   iseDisplay.updateTempOutside(get_temp_out());
+  iseDisplay.updateACState();
 
   /* iseDisplay.updateACState();
   iseDisplay.updateAirPurifierState();