Merge branch 'xxh' into 'develop'

Xxh-devlop

See merge request !12

qianjiang/main/app_BT_User.c

@@ -11,13 +11,13 @@ extern esp_bd_addr_t peer_addr;
 
 BT_User_Control_Struct BT_User;
 
-#define BT_ReConn_T 3000
+#define BT_ReConn_T 300
 
 void BT_User_Init(void )
 {
     BT_User.BT_Sts = BT_Idle;
     BT_User.Call_Sts = Call_Idle;
-    BT_User.ReconnTime = BT_ReConn_T - 500;
+    BT_User.ReconnTime = BT_ReConn_T - 50;
     BT_User.HF_Ctrl = HF_Idle;
 
 }
@@ -26,7 +26,7 @@ void BT_Connect_Event_Pro(void )
 {
     BT_User.BT_Sts = BT_Conn;
     BT_User.Call_Sts = Call_Idle;
-    BT_User.ReconnTime = BT_ReConn_T - 500;
+    BT_User.ReconnTime = BT_ReConn_T - 50;
     BT_User.HF_Ctrl = HF_Idle;
     // printf("TB CONN\r\n");
 }
@@ -36,7 +36,7 @@ void BT_DisConnect_Event_Pro(void )
 {
     BT_User.BT_Sts = BT_Idle;
     BT_User.Call_Sts = Call_Idle;
-    BT_User.ReconnTime = BT_ReConn_T - 500;
+    BT_User.ReconnTime = BT_ReConn_T - 50;
     BT_User.HF_Ctrl = HF_Idle;
     // printf("TB DISCONN\r\n");
 }

qianjiang/main/bt_app_main.c

@@ -56,6 +56,11 @@ uint8_t app_BT_Get_BondDev(void )
             }
         }
 
+        if(dev_list != NULL)
+        {
+            free(dev_list);
+        }
+
         ret = 1;
     }
     else

工程文件/升级文件/文件说明.txt

+Qj500-7C.bin是ESP32芯片WIFI升级用的工程文件，此文件不要更改文件名字
\ No newline at end of file

工程文件/工程文件-释放绥化/4个文件版本/ota_data_initial.bin

+
\ No newline at end of file

工程文件/工程文件-释放绥化/4个文件版本/文件说明.txt

+bootloader.bin
+ota_data_initial.bin
+partition-table.bin
+QJ-70000PBS0002-ESP32-BootApp-S240911-240911.bin
+是用下载器给仪表下载的工程文件；