From d056e6fa7bab5890cac4711881879c83aa7d29e5 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Mon, 13 Nov 2023 15:31:50 +0700
Subject: [PATCH 1/9] lcd upload endpoint

---
 .vscode/settings.json    |  3 ++-
 src/espmega_iot_core.cpp | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 69aa100..6c7e3e2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,6 +15,7 @@
         "*.d": "cpp",
         "*.html": "cpp",
         "*.tcc": "cpp",
-        "regex": "cpp"
+        "regex": "cpp",
+        "cstdlib": "cpp"
     }
 }
\ No newline at end of file
diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp
index 0ff5efc..e613732 100644
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@@ -423,6 +423,19 @@ void ota_begin()
           }
         }
       });
+  otaserver.on("/lcd_update",HTTP_POST,[]() {
+    otaserver.sendHeader("Connection","close");
+  },[](){
+    HTTPUpload &upload = otaserver.upload();
+    if(upload.status == UPLOAD_FILE_START) {
+      Serial.println(upload.totalSize);
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      for(int i = 0; i<upload.currentSize;i++)
+        Serial.print(upload.buf[i],HEX);
+    } else if (upload.status == UPLOAD_FILE_END) {
+        Serial.println("Upload End");
+    }
+  });
   otaserver.begin();
 }
 #endif

From 0c3106003536698e7b5008a35fe2071c121ac321 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 7 Dec 2023 12:27:46 +0700
Subject: [PATCH 2/9] temp change upload endpoint to lcd

---
 .gitignore                  |  3 +-
 .vscode/settings.json       | 78 -------------------------------------
 src/ota_html/ota-part3.html |  2 +-
 3 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index a4a37ad..8b617f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
 .vscode/
 .vscode/settings.json
 firmware/
-release/
\ No newline at end of file
+release/
+.vscode/extensions.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index ee32b37..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "C_Cpp.errorSquiggles": "enabled",
-  "files.associations": {
-    "*.cps": "javascript",
-    "string": "cpp",
-    "optional": "cpp",
-    "istream": "cpp",
-    "ostream": "cpp",
-    "system_error": "cpp",
-    "array": "cpp",
-    "functional": "cpp",
-    "tuple": "cpp",
-    "type_traits": "cpp",
-    "utility": "cpp",
-    "*.d": "cpp",
-    "*.html": "cpp",
-    "*.tcc": "cpp",
-    "regex": "cpp"
-  },
-  "C_Cpp_Runner.msvcBatchPath": "",
-  "C_Cpp_Runner.cCompilerPath": "gcc",
-  "C_Cpp_Runner.cppCompilerPath": "g++",
-  "C_Cpp_Runner.debuggerPath": "gdb",
-  "C_Cpp_Runner.cStandard": "",
-  "C_Cpp_Runner.cppStandard": "",
-  "C_Cpp_Runner.useMsvc": false,
-  "C_Cpp_Runner.warnings": [
-    "-Wall",
-    "-Wextra",
-    "-Wpedantic",
-    "-Wshadow",
-    "-Wformat=2",
-    "-Wcast-align",
-    "-Wconversion",
-    "-Wsign-conversion",
-    "-Wnull-dereference"
-  ],
-  "C_Cpp_Runner.msvcWarnings": [
-    "/W4",
-    "/permissive-",
-    "/w14242",
-    "/w14287",
-    "/w14296",
-    "/w14311",
-    "/w14826",
-    "/w44062",
-    "/w44242",
-    "/w14905",
-    "/w14906",
-    "/w14263",
-    "/w44265",
-    "/w14928"
-  ],
-  "C_Cpp_Runner.enableWarnings": true,
-  "C_Cpp_Runner.warningsAsError": false,
-  "C_Cpp_Runner.compilerArgs": [],
-  "C_Cpp_Runner.linkerArgs": [],
-  "C_Cpp_Runner.includePaths": [],
-  "C_Cpp_Runner.includeSearch": [
-    "*",
-    "**/*"
-  ],
-  "C_Cpp_Runner.excludeSearch": [
-    "**/build",
-    "**/build/**",
-    "**/.*",
-    "**/.*/**",
-    "**/.vscode",
-    "**/.vscode/**"
-  ],
-  "C_Cpp_Runner.useAddressSanitizer": false,
-  "C_Cpp_Runner.useUndefinedSanitizer": false,
-  "C_Cpp_Runner.useLeakSanitizer": false,
-  "C_Cpp_Runner.showCompilationTime": false,
-  "C_Cpp_Runner.useLinkTimeOptimization": false,
-  "C_Cpp_Runner.msvcSecureNoWarnings": false,
-  "cmake.sourceDirectory": "D:/Git/iot-firmware/.pio/libdeps/full/Adafruit BusIO"
-}
\ No newline at end of file
diff --git a/src/ota_html/ota-part3.html b/src/ota_html/ota-part3.html
index 4826dbf..b9b4dd4 100644
--- a/src/ota_html/ota-part3.html
+++ b/src/ota_html/ota-part3.html
@@ -23,7 +23,7 @@ R"=====(<button type="button" class="conf" onclick="window.location.href='config
     var form = $("#upload_form")[0];
     var data = new FormData(form);
     $.ajax({
-      url: "/update",
+      url: "/lcd_update",
       type: "POST",
       data: data,
       contentType: false,

From e2bf2610b3a72ba06d53cc441e4a96e34f94f0cc Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 7 Dec 2023 13:40:29 +0700
Subject: [PATCH 3/9] initial upload implementation draft

---
 src/espmega_iot_core.cpp    | 16 +++++++++++----
 src/espmega_iot_lcd.cpp     | 39 ++++++++++++++++++++++++-------------
 src/ota_html/ota-part3.html |  3 +++
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp
index 713bfbb..7b92f4b 100644
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@@ -546,13 +546,21 @@ void ota_begin()
     otaserver.sendHeader("Connection","close");
   },[](){
     HTTPUpload &upload = otaserver.upload();
+    size_t file_size = 0;
     if(upload.status == UPLOAD_FILE_START) {
-      Serial.println(upload.totalSize);
+      for(int i=0;i<otaserver.headers();i++) {
+        if(!otaserver.headerName(i).compareTo("Content-Length")) {
+          Serial.printf("Content-Length: %s\n",otaserver.header(i).c_str());
+          file_size = otaserver.header(i).toInt();
+        }
+      }
+      
+      Serial.println(file_size);
+      lcd_upload_start(file_size);
     } else if (upload.status == UPLOAD_FILE_WRITE) {
-      for(int i = 0; i<upload.currentSize;i++)
-        Serial.print(upload.buf[i],HEX);
+      lcd_upload_write(upload.buf, upload.currentSize);
     } else if (upload.status == UPLOAD_FILE_END) {
-        Serial.println("Upload End");
+      Serial.println("Upload END.");
     }
   });
   otaserver.begin();
diff --git a/src/espmega_iot_lcd.cpp b/src/espmega_iot_lcd.cpp
index 1f03338..0628433 100644
--- a/src/espmega_iot_lcd.cpp
+++ b/src/espmega_iot_lcd.cpp
@@ -1,9 +1,11 @@
 #include <user_code.hpp>
 #include <espmega_iot_lcd.hpp>
 
+int lcd_byte_counter = 0;
+
 /**
  * @brief Sends stop bit to LCD.
- * 
+ *
  * This function sends a stop bit to the LCD. It is only enabled if the ENABLE_INTERNAL_LCD macro is defined.
  */
 void lcd_send_stop_bit()
@@ -17,7 +19,7 @@ void lcd_send_stop_bit()
 
 /**
  * Sends a command to the LCD display.
- * 
+ *
  * @param command The command to send to the LCD display.
  */
 void lcd_send_command(String command)
@@ -31,9 +33,9 @@ void lcd_send_command(String command)
 
 /**
  * @brief Resets the LCD display.
- * 
+ *
  * If ENABLE_INTERNAL_LCD is defined, sends a reset command to the LCD display.
- * 
+ *
  */
 void lcd_reset()
 {
@@ -57,7 +59,7 @@ void lcd_init()
 
 /**
  * @brief Starts the upload process to the LCD.
- * 
+ *
  * @param size The size of the data to be uploaded.
  * @return true if the upload process started successfully, false otherwise.
  */
@@ -70,14 +72,16 @@ bool lcd_upload_start(size_t size)
     Serial.print("connect");
     lcd_send_stop_bit();
     delay(1000);
-    Serial.print("whmi-wri 1024,115200,res0");
+    Serial.print("whmi-wri ");
+    Serial.print(size);
+    Serial.print(",115200,res0");
     lcd_send_stop_bit();
-    lcd_wait_ack();
+    return lcd_wait_ack();
 }
 
 /**
  * Writes data to the LCD upload buffer.
- * 
+ *
  * @param data Pointer to the data to be written.
  * @param size Size of the data to be written.
  * @return True if the write was successful, false otherwise.
@@ -87,9 +91,15 @@ bool lcd_upload_write(uint8_t *data, size_t size)
     for (int i = 0; i < size; i++)
     {
         Serial.write(data[i]);
+        lcd_byte_counter++;
+        if (lcd_byte_counter == 4096)
+        {
+            lcd_wait_ack();
+            lcd_byte_counter = 0;
+        }
     }
+    return true;
 }
-
 /**
  * Waits for an acknowledgement signal from the LCD.
  * @return true if acknowledgement signal is received, false otherwise.
@@ -97,12 +107,15 @@ bool lcd_upload_write(uint8_t *data, size_t size)
 bool lcd_wait_ack()
 {
     bool data_ok = false;
-    for (int i; i < 50; i++)
+    for (int i = 0; i < 50; i++)
     {
-        if (Serial.read() == 0x05)
+        if (Serial.available())
         {
-            data_ok = true;
-            break;
+            if (Serial.read() == 0x05)
+            {
+                data_ok = true;
+                break;
+            }
         }
         delay(100);
     }
diff --git a/src/ota_html/ota-part3.html b/src/ota_html/ota-part3.html
index b9b4dd4..4c7daee 100644
--- a/src/ota_html/ota-part3.html
+++ b/src/ota_html/ota-part3.html
@@ -28,6 +28,9 @@ R"=====(<button type="button" class="conf" onclick="window.location.href='config
       data: data,
       contentType: false,
       processData: false,
+      headers: {
+        "Content-Length": data.length
+      },
       xhr: function () {
         var xhr = new window.XMLHttpRequest();
         xhr.upload.addEventListener(

From 4c54da6e34fa632a76963ed015e069ea8e032fb1 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 7 Dec 2023 13:59:23 +0700
Subject: [PATCH 4/9] Update espmega_iot_core.cpp

---
 src/espmega_iot_core.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp
index 7b92f4b..3a43d4e 100644
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@@ -545,16 +545,13 @@ void ota_begin()
   otaserver.on("/lcd_update",HTTP_POST,[]() {
     otaserver.sendHeader("Connection","close");
   },[](){
+    for(int i=0;i<otaserver.headers();i++) {
+        // Print all headers
+        Serial.printf("HEADER[%s]:[%s]\n", otaserver.headerName(i).c_str(), otaserver.header(i).c_str());
+    }
     HTTPUpload &upload = otaserver.upload();
     size_t file_size = 0;
     if(upload.status == UPLOAD_FILE_START) {
-      for(int i=0;i<otaserver.headers();i++) {
-        if(!otaserver.headerName(i).compareTo("Content-Length")) {
-          Serial.printf("Content-Length: %s\n",otaserver.header(i).c_str());
-          file_size = otaserver.header(i).toInt();
-        }
-      }
-      
       Serial.println(file_size);
       lcd_upload_start(file_size);
     } else if (upload.status == UPLOAD_FILE_WRITE) {

From 88c2003116f9b4f4ad09cc8677ab466af798f451 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Thu, 7 Dec 2023 16:44:03 +0700
Subject: [PATCH 5/9] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dcf9353..af7a9cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                git branch: 'main', url: 'https://git.siwatsystem.com/ise-senior-iot/iot-firmware.git'
+                git branch: 'lcd_upload', url: 'https://git.siwatsystem.com/ise-senior-iot/iot-firmware.git'
                 sh 'export PLATFORMIO_PATH=/root/.platformio/penv/bin/platformio'
                 sh '/usr/bin/python3 gen_release.py'
                 stash includes: 'release/**/*', name: 'release_binaries'

From 3736f531128da2aac734e29277f1206fd965e76e Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Fri, 8 Dec 2023 17:58:10 +0700
Subject: [PATCH 6/9] light show optimization

---
 src/espmega_iot_core.cpp | 99 ++++++++++++++++++++++++++--------------
 src/espmega_iot_core.hpp |  5 +-
 2 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp
index 845de70..9146fb1 100644
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@@ -47,6 +47,7 @@ uint8_t utc_offset = 7;
 float current_room_temp = 0;
 float current_room_humid = 0;
 #endif
+bool pwm_report_enable = true;
 
 // Inputs
 #define VINT_COUNT 16
@@ -69,6 +70,7 @@ const float pwm_linear_scaling_c[PWM_COUNT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 const int PWM_CYCLE_VALUES[PWM_CYCLE_VALUES_COUNT] = {50, 125, 255};
 char PWM_SET_STATE_TOPIC[70];
 char PWM_SET_VALUE_TOPIC[70];
+char PWM_REPORT_ENABLE_TOPIC[70];
 
 #ifdef ENABLE_INTERNAL_LCD
 // LCD
@@ -249,18 +251,20 @@ void loop()
  */
 void fram_retrieve_init()
 {
-  #ifdef ENABLE_WEBUI
+#ifdef ENABLE_WEBUI
   ESPMega_FRAM.read(FRAM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32);
   ESPMega_FRAM.read(FRAM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32);
-  if(strlen(WEBUI_USERNAME)==0) {
-    strcpy(WEBUI_USERNAME,"admin");
+  if (strlen(WEBUI_USERNAME) == 0)
+  {
+    strcpy(WEBUI_USERNAME, "admin");
     ESPMega_FRAM.write(FRAM_ADDRESS_WEBUI_USERNAME, (uint8_t *)WEBUI_USERNAME, 32);
   }
-  if(strlen(WEBUI_PASSWORD)==0) {
-    strcpy(WEBUI_PASSWORD,"admin");
+  if (strlen(WEBUI_PASSWORD) == 0)
+  {
+    strcpy(WEBUI_PASSWORD, "admin");
     ESPMega_FRAM.write(FRAM_ADDRESS_WEBUI_PASSWORD, (uint8_t *)WEBUI_PASSWORD, 32);
   }
-  #endif
+#endif
 // FRAM Data Retrival
 #ifdef ENABLE_CLIMATE_MODULE
   ac_mode = ESPMega_FRAM.read8(FRAM_ADDRESS_AC_MODE);
@@ -320,6 +324,8 @@ void fram_retrieve_init()
   strcat(PWM_SET_STATE_TOPIC, "/pwm/00/set/state");
   memcpy(PWM_SET_VALUE_TOPIC, MQTT_BASE_TOPIC, 20);
   strcat(PWM_SET_VALUE_TOPIC, "/pwm/00/set/value");
+  memcpy(PWM_REPORT_ENABLE_TOPIC, MQTT_BASE_TOPIC, 20);
+  strcat(PWM_REPORT_ENABLE_TOPIC, "/pwm/report_enable");
 #ifdef ENABLE_CLIMATE_MODULE
   memcpy(AC_SET_MODE_TOPIC, MQTT_BASE_TOPIC, 20);
   strcat(AC_SET_MODE_TOPIC, "/ac/set/mode");
@@ -395,11 +401,11 @@ void ota_begin()
     otabuffer+=ota_part2_1+"IP Address"+ota_part2_2+IP.toString()+ota_part2_3;
     otabuffer+=ota_part2_1+"MAC Address"+ota_part2_2+ETH.macAddress()+ota_part2_3;
     otabuffer+=ota_part2_1+"Device"+ota_part2_2+ESPMEGA_REV+ota_part2_3;
-    #ifdef FW_VERSION
+#ifdef FW_VERSION
     otabuffer+=ota_part2_1+"Firmware"+ota_part2_2+FW_VERSION+ota_part2_3;
-    #else
+#else
     otabuffer+=ota_part2_1+"Firmware"+ota_part2_2+"Out of Tree"+ota_part2_3;
-    #endif
+#endif
     otabuffer+=ota_part2_1+"BMS Server"+ota_part2_2+MQTT_SERVER.toString()+ota_part2_3;
     otabuffer+=ota_part2_1+"BMS Endpoint"+ota_part2_2+String(MQTT_BASE_TOPIC)+ota_part2_3;
     otabuffer+=ota_part2_1+"Centrally Managed"+ota_part2_2;
@@ -665,6 +671,7 @@ void mqtt_subscribe()
     mqtt.subscribe(PWM_SET_STATE_TOPIC);
     mqtt.subscribe(PWM_SET_VALUE_TOPIC);
   }
+  mqtt.subscribe(PWM_REPORT_ENABLE_TOPIC);
 #ifdef ENABLE_CLIMATE_MODULE
   mqtt.subscribe(AC_SET_FAN_TOPIC);
   mqtt.subscribe(AC_SET_TEMPERATURE_TOPIC);
@@ -713,6 +720,10 @@ void mqtt_callback(char *topic, byte *payload, unsigned int length)
   {
     pwm_value_callback(topic_trim, topic_length, payload_nt, length);
   }
+  else if (!strcmp(topic_trim, "/pwm/report_enable"))
+  {
+    pwm_set_publish_callback(topic_trim, topic_length, payload_nt, length);
+  }
 #ifdef ENABLE_ANALOG_MODULE
   else if ((!strncmp(topic_trim, "/adc/", 5)) && !strncmp(topic_trim + 7, "/set/state", 10))
   {
@@ -730,13 +741,14 @@ void mqtt_callback(char *topic, byte *payload, unsigned int length)
 #ifdef ENABLE_IR_MODULE
   else if (!strcmp(topic_trim, "/ir/send"))
   {
-    const char* delimiter = ",";
-    char* token = strtok(const_cast<char*>(payload_nt), delimiter);
-    while (token != nullptr && ir_buffer_length < IR_RAW_BUFFER_LENGTH) {
-        ir_buffer[ir_buffer_length++] = atoi(token);
-        token = strtok(nullptr, delimiter);
+    const char *delimiter = ",";
+    char *token = strtok(const_cast<char *>(payload_nt), delimiter);
+    while (token != nullptr && ir_buffer_length < IR_RAW_BUFFER_LENGTH)
+    {
+      ir_buffer[ir_buffer_length++] = atoi(token);
+      token = strtok(nullptr, delimiter);
     }
-    IrSender.sendRaw(ir_buffer,ir_buffer_length ,NEC_KHZ);
+    IrSender.sendRaw(ir_buffer, ir_buffer_length, NEC_KHZ);
   }
 #endif
   else if (!strcmp(topic, STATE_REQUEST_TOPIC))
@@ -869,6 +881,7 @@ void publish_pwm_states()
   for (int i = 0; i < PWM_COUNT; i++)
   {
     publish_pwm_state(i);
+    publish_pwm_value(i);
   }
 }
 
@@ -879,12 +892,11 @@ void publish_pwm_states()
  */
 void publish_pwm_state(int id)
 {
+  if (!pwm_report_enable)
+    return;
   int state = pwm_states[id];
-  int value = pwm_values[id];
   PWM_STATE_TOPIC[base_topic_length + 4] = ((id - id % 10) / 10) + '0';
   PWM_STATE_TOPIC[base_topic_length + 5] = (id % 10) + '0';
-  PWM_VALUE_TOPIC[base_topic_length + 4] = ((id - id % 10) / 10) + '0';
-  PWM_VALUE_TOPIC[base_topic_length + 5] = (id % 10) + '0';
   if (state == 1)
   {
     mqtt.publish(PWM_STATE_TOPIC, "on");
@@ -893,6 +905,15 @@ void publish_pwm_state(int id)
   {
     mqtt.publish(PWM_STATE_TOPIC, "off");
   }
+}
+
+void publish_pwm_value(int id)
+{
+  if (!pwm_report_enable)
+    return;
+  int value = pwm_values[id];
+  PWM_VALUE_TOPIC[base_topic_length + 4] = ((id - id % 10) / 10) + '0';
+  PWM_VALUE_TOPIC[base_topic_length + 5] = (id % 10) + '0';
   char temp[6];
   itoa(value, temp, DEC);
   mqtt.publish(PWM_VALUE_TOPIC, temp);
@@ -939,7 +960,7 @@ void pwm_set_value(int id, int value)
   else if (lcd_current_page == 5 && id == lcd_pwmAdj_id)
     panel.writeNum("pwm_value.val", pwm_values[lcd_pwmAdj_id]);
 #endif
-  publish_pwm_state(id);
+  publish_pwm_value(id);
   pwm_changed_user_callback(id);
 }
 
@@ -1055,6 +1076,11 @@ void publish_input_state(int id, int state)
   mqtt.publish(INPUTS_TOPIC, state ? "1" : "0");
 }
 
+void pwm_set_publish_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
+{
+  pwm_report_enable = !strcmp(payload, "on");
+}
+
 /**
  * @brief Callback function to request the current state of the device.
  *
@@ -1065,6 +1091,7 @@ void state_request_callback()
 {
   publish_input_states();
   publish_pwm_states();
+  pwm_report_enable = true;
 #ifdef ENABLE_CLIMATE_MODULE
   publish_ac_state();
   publish_env_state();
@@ -1891,10 +1918,10 @@ void factory_reset()
   set_ip("192.168.0.10");
   set_gw("192.168.0.1");
   set_netmask("255.255.255.0");
-  #ifdef ENABLE_WEBUI
+#ifdef ENABLE_WEBUI
   set_webui_username("admin");
   set_webui_password("admin");
-  #endif
+#endif
 
   // Reboot
 #ifdef ENABLE_INTERNAL_LCD
@@ -1948,7 +1975,7 @@ void disable_adc(int id)
 
 /**
  * Publishes the state of an ADC (Analog-to-Digital Converter) to the MQTT broker.
- * 
+ *
  * @param id The ID of the ADC.
  */
 void publish_adc_state(int id)
@@ -1960,7 +1987,7 @@ void publish_adc_state(int id)
 
 /**
  * @brief Publishes the ADC states.
- * 
+ *
  * This function iterates over the ADC channels and publishes the state of each channel.
  */
 void publish_adc_states()
@@ -2050,7 +2077,7 @@ void publish_adc_values()
 
 /**
  * Publishes the state of a DAC (Digital-to-Analog Converter) to the MQTT broker.
- * 
+ *
  * @param id The ID of the DAC.
  */
 void publish_dac_state(int id)
@@ -2062,7 +2089,7 @@ void publish_dac_state(int id)
 
 /**
  * Publishes the DAC value for a given ID.
- * 
+ *
  * @param id The ID of the DAC value to publish.
  */
 void publish_dac_value(int id)
@@ -2154,9 +2181,9 @@ void dac_set_state(int id, bool state)
 
 /**
  * @brief Publishes the states of all DACs.
- * 
+ *
  * This function iterates through all DACs and publishes their states.
- * 
+ *
  * @return void
  */
 void publish_dac_states()
@@ -2169,9 +2196,9 @@ void publish_dac_states()
 
 /**
  * @brief Publishes the DAC values.
- * 
+ *
  * This function iterates through all the DAC channels and publishes their values.
- * 
+ *
  * @return void
  */
 void publish_dac_values()
@@ -2226,7 +2253,7 @@ void dac_set_state_callback(char *topic, uint8_t topic_length, char *payload, un
 
 /**
  * @brief Get the ADC value for the specified ID.
- * 
+ *
  * @param id The ID of the ADC channel.
  * @return The ADC value.
  */
@@ -2236,7 +2263,7 @@ uint16_t adc_get_value(int id)
 }
 /**
  * @brief Get the state of the ADC with the specified ID.
- * 
+ *
  * @param id The ID of the ADC.
  * @return true if the ADC is enabled, false otherwise.
  */
@@ -2246,7 +2273,7 @@ bool adc_get_state(int id)
 }
 /**
  * @brief Get the value of a DAC channel.
- * 
+ *
  * @param id The ID of the DAC channel.
  * @return The value of the DAC channel.
  */
@@ -2256,7 +2283,7 @@ uint16_t dac_get_value(int id)
 }
 /**
  * @brief Get the state of the DAC with the specified ID.
- * 
+ *
  * @param id The ID of the DAC.
  * @return The state of the DAC.
  */
@@ -2267,8 +2294,10 @@ bool dac_get_state(int id)
 
 #endif
 
-void virtual_interrupt_preload() {
-  for (int i = 0; i < 16; i++) {
+void virtual_interrupt_preload()
+{
+  for (int i = 0; i < 16; i++)
+  {
     virtual_interupt_state[i] = ESPMega_digitalRead(virtual_interrupt_pins[i]);
   }
 }
\ No newline at end of file
diff --git a/src/espmega_iot_core.hpp b/src/espmega_iot_core.hpp
index f7cd015..51777c3 100644
--- a/src/espmega_iot_core.hpp
+++ b/src/espmega_iot_core.hpp
@@ -61,6 +61,7 @@ void ota_begin();
 
 void publish_pwm_states();
 void publish_pwm_state(int id);
+void publish_pwm_value(int id);
 void pwm_set_state(int id, int state);
 void pwm_set_value(int id, int value);
 void pwm_toggle(int id);
@@ -157,4 +158,6 @@ void publish_adc_states();
 uint16_t adc_get_value(int id);
 bool adc_get_state(int id);
 uint16_t dac_get_value(int id);
-bool dac_get_state(int id);
\ No newline at end of file
+bool dac_get_state(int id);
+
+void pwm_set_publish_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length);
\ No newline at end of file

From c1f4f5c1cdb04a0a0344798cd8686c3f73087d88 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Fri, 8 Dec 2023 18:33:33 +0700
Subject: [PATCH 7/9] code space optimization

---
 src/espmega_iot_core.cpp | 12 +++++++-----
 src/espmega_iot_core.hpp | 10 +++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp
index 9146fb1..0472888 100644
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@@ -704,7 +704,7 @@ void mqtt_subscribe()
  * @param payload The payload of the received message.
  * @param length The length of the payload.
  */
-void mqtt_callback(char *topic, byte *payload, unsigned int length)
+IRAM_ATTR void mqtt_callback(char *topic, byte *payload, unsigned int length)
 {
   uint8_t topic_length = strlen(topic);
   char topic_trim[50];
@@ -796,7 +796,7 @@ void thread_initialization()
  * @param payload The message payload.
  * @param payload_length The length of the message payload.
  */
-void pwm_state_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
+IRAM_ATTR void pwm_state_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
 {
   int a = topic[5] - '0';
   int b = topic[6] - '0';
@@ -822,7 +822,7 @@ void pwm_state_callback(char *topic, uint8_t topic_length, char *payload, unsign
  * @param payload The message payload.
  * @param payload_length The length of the message payload.
  */
-void pwm_value_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
+IRAM_ATTR void pwm_value_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
 {
   int a = topic[5] - '0';
   int b = topic[6] - '0';
@@ -925,7 +925,7 @@ void publish_pwm_value(int id)
  * @param id The ID of the PWM pin.
  * @param state The new state of the PWM pin.
  */
-void pwm_set_state(int id, int state)
+IRAM_ATTR void pwm_set_state(int id, int state)
 {
   if (state != pwm_states[id])
   {
@@ -949,7 +949,7 @@ void pwm_set_state(int id, int state)
  * @param id The id of the PWM pin.
  * @param value The value to set the PWM pin to.
  */
-void pwm_set_value(int id, int value)
+IRAM_ATTR void pwm_set_value(int id, int value)
 {
   pwm_values[id] = value;
   int pwm_state = pwm_states[id];
@@ -1268,6 +1268,8 @@ void ac_set_state(int mode, int temperature, int fan_speed)
  */
 void publish_env_state()
 {
+  if(!pwm_report_enable)
+    return;
   int errorCode = env_sensor.read();
   yield();
   switch (errorCode)
diff --git a/src/espmega_iot_core.hpp b/src/espmega_iot_core.hpp
index 51777c3..fb6afc7 100644
--- a/src/espmega_iot_core.hpp
+++ b/src/espmega_iot_core.hpp
@@ -43,7 +43,7 @@
 #endif
 #include "espmega_iot_timer.hpp"
 
-void mqtt_callback(char* topic, byte* payload, unsigned int length);
+IRAM_ATTR void mqtt_callback(char* topic, byte* payload, unsigned int length);
 void virtual_interrupt_loop();
 void virtual_interrupt_callback(int pin, int state);
 void virtual_interrupt_preload();
@@ -51,8 +51,8 @@ void network_begin();
 void mqtt_connect();
 void mqtt_subscribe();
 void thread_initialization();
-void pwm_state_callback(char* topic, uint8_t topic_length, char* payload, unsigned int payload_length);
-void pwm_value_callback(char* topic, uint8_t topic_length, char* payload, unsigned int payload_length);
+IRAM_ATTR void pwm_state_callback(char* topic, uint8_t topic_length, char* payload, unsigned int payload_length);
+IRAM_ATTR void pwm_value_callback(char* topic, uint8_t topic_length, char* payload, unsigned int payload_length);
 void state_request_callback();
 void io_begin();
 void ir_loop();
@@ -62,8 +62,8 @@ void ota_begin();
 void publish_pwm_states();
 void publish_pwm_state(int id);
 void publish_pwm_value(int id);
-void pwm_set_state(int id, int state);
-void pwm_set_value(int id, int value);
+IRAM_ATTR void pwm_set_state(int id, int state);
+IRAM_ATTR void pwm_set_value(int id, int value);
 void pwm_toggle(int id);
 void pwm_toggle(int id1, int id2);
 void pwm_cycle_value(int id);

From 0a93b41845248a61cf2c52ef7de7b10779f3a950 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Mon, 11 Dec 2023 11:31:52 +0700
Subject: [PATCH 8/9] add version number

---
 gen_release.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gen_release.py b/gen_release.py
index 24fa03b..2c07d5e 100644
--- a/gen_release.py
+++ b/gen_release.py
@@ -89,6 +89,10 @@ for environment in environments:
     else:
         config[f'env:{environment}']['build_flags'] = config[f'env:{environment}']['build_flags'] + f' -DFW_VERSION=\\"{git_branch}_{environment}_{commit_hash}\\"'
 
+# Write the platformio.ini file
+with open(os.path.join(firmware_folder, 'platformio.ini'), 'w') as configfile:
+    config.write(configfile)
+
 # if argument is not supplied, build all environments listed in platformio.ini
 if len(sys.argv) == 1:
     subprocess.run([f'{platformio_path}', 'run','-c',f'{firmware_folder}/platformio.ini'], cwd=current_dir)

From 5c55023829bbab3c91aa694d771f3b8abc1b4799 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Tue, 26 Dec 2023 23:52:24 +0700
Subject: [PATCH 9/9] adjust default ir send pin

so it does not overlapse with elcd
---
 src/user_code.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/user_code.hpp b/src/user_code.hpp
index 938316e..8b3e361 100644
--- a/src/user_code.hpp
+++ b/src/user_code.hpp
@@ -25,7 +25,7 @@
 
 // IR Kit Configuration
 #define IR_RECIEVE_PIN 35
-#define IR_SEND_PIN 17
+#define IR_SEND_PIN 5
 #define MARK_EXCESS_MICROS 20
 #define IR_RAW_BUFFER_LENGTH 750
 #define AC_MAX_TEMPERATURE 30