Merge branch 'main' into remote_ctrl

Author: SmartArduino

components/vb6824/libs/libesp32.a

@@ -623,6 +623,10 @@ bool vb6824_is_support_ota(){
 void vb6824_init(gpio_num_t tx, gpio_num_t rx){
     __uart_init(tx, rx);
 
+#if defined(CONFIG_VB6824_OTA_SUPPORT) && CONFIG_VB6824_OTA_SUPPORT == 1
+    jl_set_uart_port(UART_NUM);
+#endif
+
 #if defined(CONFIG_VB6824_TYPE_OPUS_16K_20MS)
     g_rx_ringbuffer = xRingbufferCreate(RECV_BUF_LENGTH, RINGBUF_TYPE_NOSPLIT);
     g_tx_ringbuffer = xRingbufferCreate(SEND_BUF_LENGTH, RINGBUF_TYPE_NOSPLIT);

components/vb6824/libs/libesp32c2.a

@@ -31,6 +31,7 @@ void jl_ondata(uint8_t *buf, uint16_t len);
 int jl_set_ota_url(const char* url);
 int jl_ota_start(jl_ota_event_t evt_cb);
 int jl_ota_set_code(char  *code);
+void jl_set_uart_port(uint8_t port);
 
 
 #ifdef __cplusplus

components/vb6824/libs/libesp32c3.a

@@ -64,7 +64,7 @@ std::string VbAduioCodec::GenDevCode() {
         mbedtls_md5(reinterpret_cast<const unsigned char*>(mac.c_str()), mac.size(), md5_result);
         uint16_t value =  (((md5_result[14]) << 8) | md5_result[15]) & 0xFFFF; 
         std::ostringstream oss;
-        oss << value % 10000;
+        oss << std::setw(4) << std::setfill('0') << (value % 10000);
         last_four_digits = oss.str();
         ESP_LOGW(TAG, "last_four_digits: %s", last_four_digits.c_str());
     }
@@ -113,11 +113,11 @@ int VbAduioCodec::OtaStart(uint8_t mode) {
 bool VbAduioCodec::InOtaMode(bool reShowIfInOta) {
 #if defined(CONFIG_VB6824_OTA_SUPPORT) && CONFIG_VB6824_OTA_SUPPORT == 1
     auto &app = Application::GetInstance();
-    std::string code = GenDevCode();
     const std::string ip = WifiStation::GetInstance().GetIpAddress();
     if (jl_ws_is_start() == 1) {
         if (reShowIfInOta)
         {
+            std::string code = GenDevCode();
             app.ShowOtaInfo(code, ip);
         }
         return true;