20240519

Add 12h time format - change by click on clock #7 Reworked Chinese translation by @CXA918 🚀 Reworked Zigbee flashing code
xyzroe · May 19, 2024 · f1fcad9 · f1fcad9
1 parent 8c36d79
commit f1fcad9
Show file tree

Hide file tree

Showing 11 changed files with 230 additions and 8 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1 @@
+*debug*
diff --git a/bin/XZG_20240510.full.bin b/bin/XZG_20240510.full.bin
diff --git a/bin/XZG_20240510.ota.bin b/bin/XZG_20240510.ota.bin
diff --git a/lib/CCTools/src/CCTools.cpp b/lib/CCTools/src/CCTools.cpp
@@ -855,16 +855,17 @@ bool CCTools::beginFlash(uint32_t startAddr, int totalSize)
     return _cmdDownload(startAddr, totalSize);
 }
 
-void CCTools::processFlash(byte *data, int size)
+bool CCTools::processFlash(byte *data, int size)
 {
     if (memcmp(data, this->emptyPacket, size) != 0)
     {
         if (!_cmdSendData(data, size))
         {
-            return;
+            return false;
         }
     }
     this->currentAddr += size;
+    return true;
 }
 
 bool CCTools::checkFirmwareVersion()

diff --git a/lib/CCTools/src/CCTools.h b/lib/CCTools/src/CCTools.h
@@ -610,7 +610,7 @@ class CCTools : public CommandInterface
     bool detectChipInfo();
     bool eraseFlash();
     bool beginFlash(uint32_t startAddr, int totalSize);
-    void processFlash(byte *data, int size);
+    bool processFlash(byte *data, int size);
     bool checkFirmwareVersion();
     bool ledToggle();
     bool nvram_reset(void (*logFunction)(const String&));

diff --git a/platformio.ini b/platformio.ini
@@ -36,7 +36,7 @@ lib_deps =
 	;plerup/EspSoftwareSerial@8.1.0
 	;marian-craciunescu/ESP32Ping@>=1.7
 	;me-no-dev/ESPAsyncWebServer@1.2.3
-monitor_filters = direct ; log2file ; esp32_exception_decoder, default ;
+monitor_filters = direct ; log2file ; esp32_exception_decoder, default ; 
 monitor_speed = 115200
 upload_speed = 460800
 ;platform_packages =

diff --git a/src/version.h b/src/version.h
@@ -1,4 +1,4 @@
 // AUTO GENERATED FILE
 #ifndef VERSION
-    #define VERSION "20240510"
+    #define VERSION "20240519"
 #endif
diff --git a/src/websrc/html/PAGE_ZIGBEE.html b/src/websrc/html/PAGE_ZIGBEE.html
@@ -43,7 +43,7 @@
         </div>
     </div>
     <div class="col-12 cardPadding">
-        <form class="saveParams" method='POST' action="saveParams">
+        <form class="saveParams" method='POST' action="saveParams" style="margin-block-end: 0em;">
             <div class='card'>
                 <div class="card-header fw-bold">
                     <svg class="card_icon" fill="currentColor" viewBox="0 0 16 16">

diff --git a/src/websrc/js/functions.js b/src/websrc/js/functions.js
@@ -917,10 +917,23 @@ function updateTooltips() {
 
 function extractTime(dateStr) {
 	const date = new Date(dateStr);
-	let hours = date.getHours().toString().padStart(2, '0');
+	let hours = date.getHours().toString();
 	let minutes = date.getMinutes().toString().padStart(2, '0');
 	let seconds = date.getSeconds().toString().padStart(2, '0');
-	return `${hours}:${minutes}:${seconds}`;
+
+	let pm = "AM";
+	if (localStorage.getItem('clock_format_12h') == 'true') {
+		if (hours > 12) {
+			hours = hours - 12;
+			pm = "PM";
+		}
+		return `${hours}:${minutes}:${seconds} ${pm}`;
+	}
+	else {
+		hours = hours.padStart(2, '0');
+		return `${hours}:${minutes}:${seconds}`;
+	}
+
 }
 
 function dataReplace(values, navOnly = false) {
@@ -2550,6 +2563,15 @@ function handleClicks() {
 			}
 		}
 	});
+
+	const clockButton = document.getElementById('clock');
+
+	clockButton.addEventListener('click', function () {
+		const currentFormat = localStorage.getItem('clock_format_12h');
+		const is12HourFormat = currentFormat === 'true';
+		localStorage.setItem('clock_format_12h', !is12HourFormat);
+		console.log('Clock format set to:', !is12HourFormat ? '12-hour' : '24-hour');
+	});
 }
 
 function handleMsg() {

diff --git a/src/zb.cpp b/src/zb.cpp
@@ -144,6 +144,7 @@ void flashZbUrl(String url)
             // char buffer[100];
             // snprintf(buffer, sizeof(buffer), "Flash progress: %.2f%%", percent);
             // printLogMsg(String(buffer));
+            LOGI("%s", String(percent));
             sendEvent(tagZB_FW_progress, eventLen, String(percent));
             last_percent = percent;
         }
@@ -196,6 +197,7 @@ void printBufferAsHex(const byte *buffer, size_t length)
 
 bool eraseWriteZbUrl(const char *url, std::function<void(float)> progressShow, CCTools &CCTool)
 {
+    /*
     HTTPClient http;
     WiFiClientSecure client;
     client.setInsecure();
@@ -250,6 +252,197 @@ bool eraseWriteZbUrl(const char *url, std::function<void(float)> progressShow, C
 
     CCTool.restart();
     return true;
+    */
+    /*
+     HTTPClient http;
+     WiFiClientSecure client;
+     client.setInsecure();
+     http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+
+     int loadedSize = 0;
+     int totalSize = 0;
+     int maxRetries = 10;
+     int retryCount = 0;
+     int retryDelay = 500;
+     bool isSuccess = false;
+
+     while (retryCount < maxRetries && !isSuccess)
+     {
+         if (loadedSize == 0)
+         {
+             CCTool.eraseFlash();
+             sendEvent("ZB_FW_info", 11, String("erase"));
+             printLogMsg("Erase completed!");
+         }
+         http.begin(client, url);
+         http.addHeader("Content-Type", "application/octet-stream");
+
+         if (loadedSize > 0)
+         {
+             http.addHeader("Range", "bytes=" + String(loadedSize) + "-");
+         }
+
+         int httpCode = http.GET();
+
+         if (httpCode != HTTP_CODE_OK && httpCode != HTTP_CODE_PARTIAL_CONTENT)
+         {
+             char buffer[100];
+             snprintf(buffer, sizeof(buffer), "Failed to download file, HTTP code: %d\n", httpCode);
+             printLogMsg(buffer);
+
+             http.end();
+             retryCount++;
+             delay(retryDelay);
+             continue;
+         }
+
+         if (totalSize == 0)
+         {
+             totalSize = http.getSize();
+         }
+
+         if (loadedSize == 0)
+         {
+             if (!CCTool.beginFlash(BEGIN_ZB_ADDR, totalSize))
+             {
+                 http.end();
+                 LOGI("Error initializing flash process");
+                 continue;
+             }
+             printLogMsg("Begin flash");
+         }
+
+         byte buffer[CCTool.TRANSFER_SIZE];
+         WiFiClient *stream = http.getStreamPtr();
+
+         while (http.connected() && loadedSize < totalSize)
+         {
+             size_t size = stream->available();
+             if (size)
+             {
+                 int c = stream->readBytes(buffer, std::min(size, sizeof(buffer)));
+                 if (!CCTool.processFlash(buffer, c))
+                 {
+                     loadedSize = 0;
+                     // http.end();
+                     retryCount++;
+                     delay(retryDelay);
+                     break;
+                 }
+                 loadedSize += c;
+                 float percent = static_cast<float>(loadedSize) / totalSize * 100.0f;
+                 progressShow(percent);
+             }
+             delay(1); // Yield to the WiFi stack
+         }
+
+         http.end();
+
+         if (loadedSize >= totalSize)
+         {
+             isSuccess = true;
+         }
+     }
+
+     CCTool.restart();
+     if (isSuccess)
+     {
+
+         return true;
+     }
+     else
+     {
+         return false;
+     }
+     */
+    WiFiClientSecure client;
+    client.setInsecure();
+
+    int loadedSize = 0;
+    int totalSize = 0;
+    int maxRetries = 10;
+    int retryCount = 0;
+    const int retryDelay = 500;
+    bool isSuccess = false;
+
+    while (retryCount < maxRetries && !isSuccess)
+    {
+        HTTPClient http;
+        http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+        http.begin(client, url);
+        http.addHeader("Content-Type", "application/octet-stream");
+
+        if (loadedSize > 0)
+        {
+            http.addHeader("Range", "bytes=" + String(loadedSize) + "-");
+        }
+
+        int httpCode = http.GET();
+
+        if (httpCode != HTTP_CODE_OK && httpCode != HTTP_CODE_PARTIAL_CONTENT)
+        {
+            char buffer[100];
+            snprintf(buffer, sizeof(buffer), "Failed to download file, HTTP code: %d\n", httpCode);
+            printLogMsg(buffer);
+
+            http.end();
+            retryCount++;
+            delay(retryDelay);
+            continue;
+        }
+
+        if (totalSize == 0)
+        {
+            totalSize = http.getSize();
+        }
+
+        if (loadedSize == 0)
+        {
+            sendEvent("ZB_FW_info", 11, "erase");
+            printLogMsg("Erase completed!");
+            CCTool.eraseFlash();
+
+            if (!CCTool.beginFlash(BEGIN_ZB_ADDR, totalSize))
+            {
+                printLogMsg("Error initializing flash process");
+                http.end();
+                continue;
+            }
+        }
+
+        byte buffer[CCTool.TRANSFER_SIZE];
+        WiFiClient *stream = http.getStreamPtr();
+
+        while (http.connected() && loadedSize < totalSize)
+        {
+            size_t size = stream->available();
+            if (size)
+            {
+                int c = stream->readBytes(buffer, std::min(size, sizeof(buffer)));
+                if (!CCTool.processFlash(buffer, c))
+                {
+                    loadedSize = 0;
+                    retryCount++;
+                    delay(retryDelay);
+                    break;
+                }
+                loadedSize += c;
+                float percent = static_cast<float>(loadedSize) / totalSize * 100.0f;
+                progressShow(percent);
+            }
+            delay(1); // Yield to the WiFi stack
+        }
+
+        http.end();
+
+        if (loadedSize >= totalSize)
+        {
+            isSuccess = true;
+        }
+    }
+
+    CCTool.restart();
+    return isSuccess;
 }
 
 #include <FS.h>

diff --git a/tools/build/build.py b/tools/build/build.py
@@ -42,6 +42,11 @@ def after_build(source, target, env):
     VERSION_NUMBER = extract_version_from_file(VERSION_FILE)
 
     NEW_NAME_BASE = "bin/XZG_" + VERSION_NUMBER
+
+    build_env = env['PIOENV']
+    if "debug" in build_env:
+        NEW_NAME_BASE += "_" + build_env
+
     NEW_NAME_FULL = NEW_NAME_BASE + ".full.bin"
     NEW_NAME_OTA = NEW_NAME_BASE + ".ota.bin"