Update Jenkinsfile

Merge branch 'main' into lcd_upload
2023-12-07 16:44:03 +07:00 · 2023-12-07 16:43:52 +07:00 · 2023-12-07 15:03:10 +07:00 · 2023-12-07 13:59:23 +07:00 · 2023-12-07 13:40:29 +07:00 · 2023-12-07 12:27:46 +07:00
9 changed files with 98 additions and 179 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@
 .vscode/settings.json
 firmware/
 release/
+.vscode/extensions.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -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"
-}
--- a/2
+++ b/2
@ -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'
--- a/gen_release.py
+++ b/gen_release.py
@ -89,10 +89,6 @@ 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)
--- a/src/espmega_iot_core.cpp
+++ b/src/espmega_iot_core.cpp
@ -47,7 +47,6 @@ 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
@ -70,7 +69,6 @@ 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
@ -251,20 +249,18 @@ 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);
@ -324,8 +320,6 @@ 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");
@ -401,11 +395,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;
@ -553,6 +547,24 @@ 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) {
+      Serial.println(file_size);
+      lcd_upload_start(file_size);
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      lcd_upload_write(upload.buf, upload.currentSize);
+    } else if (upload.status == UPLOAD_FILE_END) {
+      Serial.println("Upload END.");
+    }
+  });
  otaserver.begin();
 }
 #endif
@ -671,7 +683,6 @@ 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);
@ -704,7 +715,7 @@ void mqtt_subscribe()
 * @param payload The payload of the received message.
 * @param length The length of the payload.
 */
-IRAM_ATTR void mqtt_callback(char *topic, byte *payload, unsigned int length)
+void mqtt_callback(char *topic, byte *payload, unsigned int length)
 {
  uint8_t topic_length = strlen(topic);
  char topic_trim[50];
@ -720,10 +731,6 @@ IRAM_ATTR 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))
  {
@ -741,14 +748,13 @@ IRAM_ATTR 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))
@ -796,7 +802,7 @@ void thread_initialization()
 * @param payload The message payload.
 * @param payload_length The length of the message payload.
 */
-IRAM_ATTR void pwm_state_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length)
+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 +828,7 @@ IRAM_ATTR void pwm_state_callback(char *topic, uint8_t topic_length, char *paylo
 * @param payload The message payload.
 * @param payload_length The length of the message payload.
 */
-IRAM_ATTR void pwm_value_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)
 {
  int a = topic[5] - '0';
  int b = topic[6] - '0';
@ -881,7 +887,6 @@ void publish_pwm_states()
  for (int i = 0; i < PWM_COUNT; i++)
  {
    publish_pwm_state(i);
-    publish_pwm_value(i);
  }
 }

@ -892,11 +897,12 @@ 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");
@ -905,15 +911,6 @@ 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);
@ -925,7 +922,7 @@ void publish_pwm_value(int id)
 * @param id The ID of the PWM pin.
 * @param state The new state of the PWM pin.
 */
-IRAM_ATTR void pwm_set_state(int id, int state)
+void pwm_set_state(int id, int state)
 {
  if (state != pwm_states[id])
  {
@ -949,7 +946,7 @@ IRAM_ATTR 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.
 */
-IRAM_ATTR void pwm_set_value(int id, int value)
+void pwm_set_value(int id, int value)
 {
  pwm_values[id] = value;
  int pwm_state = pwm_states[id];
@ -960,7 +957,7 @@ IRAM_ATTR 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_value(id);
+  publish_pwm_state(id);
  pwm_changed_user_callback(id);
 }

@ -1076,11 +1073,6 @@ 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.
 *
@ -1091,7 +1083,6 @@ void state_request_callback()
 {
  publish_input_states();
  publish_pwm_states();
-  pwm_report_enable = true;
 #ifdef ENABLE_CLIMATE_MODULE
  publish_ac_state();
  publish_env_state();
@ -1268,8 +1259,6 @@ 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)
@ -1920,10 +1909,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
@ -2296,10 +2285,8 @@ 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]);
  }
 }
--- a/src/espmega_iot_core.hpp
+++ b/src/espmega_iot_core.hpp
@ -43,7 +43,7 @@
 #endif
 #include "espmega_iot_timer.hpp"

-IRAM_ATTR void mqtt_callback(char* topic, byte* payload, unsigned int length);
+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();
-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 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);
 void state_request_callback();
 void io_begin();
 void ir_loop();
@ -61,9 +61,8 @@ void ota_begin();

 void publish_pwm_states();
 void publish_pwm_state(int id);
-void publish_pwm_value(int id);
-IRAM_ATTR void pwm_set_state(int id, int state);
-IRAM_ATTR void pwm_set_value(int id, int value);
+void pwm_set_state(int id, int state);
+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);
@ -159,5 +158,3 @@ 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);
-
-void pwm_set_publish_callback(char *topic, uint8_t topic_length, char *payload, unsigned int payload_length);
--- a/src/espmega_iot_lcd.cpp
+++ b/src/espmega_iot_lcd.cpp
@ -1,6 +1,8 @@
 #include <user_code.hpp>
 #include <espmega_iot_lcd.hpp>

+int lcd_byte_counter = 0;
+
 /**
 * @brief Sends stop bit to LCD.
 *
@ -70,9 +72,11 @@ 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();
 }

 /**
@ -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);
    }
--- a/src/ota_html/ota-part3.html
+++ b/src/ota_html/ota-part3.html
@ -23,11 +23,14 @@ 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,
      processData: false,
+      headers: {
+        "Content-Length": data.length
+      },
      xhr: function () {
        var xhr = new window.XMLHttpRequest();
        xhr.upload.addEventListener(
--- 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 5
+#define IR_SEND_PIN 17
 #define MARK_EXCESS_MICROS 20
 #define IR_RAW_BUFFER_LENGTH 750
 #define AC_MAX_TEMPERATURE 30
Author	SHA1	Message	Date
Siwat Sirichai	88c2003116	Update Jenkinsfile	2023-12-07 16:44:03 +07:00
Siwat Sirichai	1206427e82	Merge branch 'main' into lcd_upload	2023-12-07 16:43:52 +07:00
Siwat Sirichai	7351c8d46a	Merge branch 'main' into lcd_upload	2023-12-07 15:03:10 +07:00
Siwat Sirichai	4c54da6e34	Update espmega_iot_core.cpp	2023-12-07 13:59:23 +07:00
Siwat Sirichai	e2bf2610b3	initial upload implementation draft	2023-12-07 13:40:29 +07:00
Siwat Sirichai	0c31060035	temp change upload endpoint to lcd	2023-12-07 12:27:46 +07:00
Siwat Sirichai	6ba2a1a0f7	Merge branch 'main' into lcd_upload	2023-12-07 12:20:53 +07:00
Siwat Sirichai	d056e6fa7b	lcd upload endpoint	2023-11-13 15:31:50 +07:00