20240529.1

- Increased Zigbee flashing speed to 500000 - English interface: visual corrections and logical perception #49 Thanks @SAOPP 🏆 - Adjusted input field length restrictions for mqtt broker #52 Thanks @dzerrenner 🏆 - Fix Zigbee flashing using USB **Before** flash enable *Flash Mode* using Web UI/MQTT or a button. **After** flash *Restart* Zigbee using Web UI/MQTT.
xyzroe · May 29, 2024 · 4d94517 · 4d94517
1 parent 7aced54
commit 4d94517
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/etc.cpp b/src/etc.cpp
@@ -167,13 +167,23 @@ void zigbeeEnableBSL()
   printLogMsg("ZB enable BSL");
   CCTool.enterBSL();
   printLogMsg("Now you can flash CC2652!");
+  if (systemCfg.workMode == WORK_MODE_USB)
+  {
+    Serial.updateBaudRate(500000);
+    Serial2.updateBaudRate(500000);
+  }
 }
 
 void zigbeeRestart()
 {
   printLogMsg("ZB RST begin");
   CCTool.restart();
   printLogMsg("ZB restart was done");
+  if (systemCfg.workMode == WORK_MODE_USB)
+  {
+    Serial.updateBaudRate(systemCfg.serialSpeed);
+    Serial2.updateBaudRate(systemCfg.serialSpeed);
+  }
 }
 
 void usbModeSet(usbMode mode)

diff --git a/src/web.cpp b/src/web.cpp
@@ -1006,7 +1006,7 @@ void handleGeneral()
     String result;
 
     doc[hwBtnIsKey] = vars.hwBtnIs;
-    //doc[hwUartSelIsKey] = vars.hwUartSelIs;
+    // doc[hwUartSelIsKey] = vars.hwUartSelIs;
     doc[hwLedPwrIsKey] = vars.hwLedPwrIs;
     doc[hwLedUsbIsKey] = vars.hwLedUsbIs;
 
@@ -1056,7 +1056,7 @@ void handleGeneral()
     serializeJson(doc, result);
     serverWeb.sendHeader(respHeaderName, result);
 
-    DynamicJsonDocument zones(10240);
+    DynamicJsonDocument zones(8000);
     String results;
 
     JsonArray zonesArray = zones.to<JsonArray>();
@@ -1065,6 +1065,9 @@ void handleGeneral()
         zonesArray.add(timeZones[i].zone);
     }
 
+    size_t usedMemory = zones.memoryUsage();
+    LOGD("Zones used: %s bytes", String(usedMemory));
+
     serializeJson(zones, results);
     serverWeb.sendHeader(respTimeZonesName, results);
 }
@@ -1488,7 +1491,7 @@ void handleTools()
     DynamicJsonDocument doc(512);
 
     doc[hwBtnIsKey] = vars.hwBtnIs;
-    //doc[hwUartSelIsKey] = vars.hwUartSelIs;
+    // doc[hwUartSelIsKey] = vars.hwUartSelIs;
     doc[hwLedPwrIsKey] = vars.hwLedPwrIs;
     doc[hwLedUsbIsKey] = vars.hwLedUsbIs;
     // doc["hostname"] = systemCfg.hostname;

diff --git a/src/zb.cpp b/src/zb.cpp
@@ -135,7 +135,7 @@ void zbEraseNV(void *pvParameters)
 
 void flashZbUrl(String url)
 {
-    Serial2.updateBaudRate(460800);
+    Serial2.updateBaudRate(500000);
     float last_percent = 0;
 
     const char *tagZB_FW_info = "ZB_FW_info";