加入mqtt切网络需要测试

build/include/version.h

@@ -2,5 +2,5 @@
 #define PROJECT_VERSION_MINOR 1
 #define PROJECT_VERSION_PATCH 7
 #define GIT_HASH ""
-#define BUILD_TIMESTAMP "2025-06-05T10:05:06"
+#define BUILD_TIMESTAMP "2025-06-06T09:12:32"
 #define BUILD_USER "orangepi"

include/wifichange.h

@@ -6,10 +6,11 @@
 #define CMD_BUFFER_SIZE 256
 #define MAX_WIFI_LIST 100
 
-#define default_SSID jking
-#define default_password 12345678
+#define default_SSID "jking"
+#define default_password "12345678"
 
 #define WIFI_CONF_PATH "/home/orangepi/car/master/device_wifi.conf"
+#define WIFI_CONF_DIR "/home/orangepi/car/master"
 
 typedef struct {
     char ssid[SSID_MAX_LEN];
@@ -17,6 +18,7 @@ typedef struct {
 } wifi_info_t;
 
 void scan_wifi_json();//显示以连接WiFi名称和周围已有的WiFi和过滤信号强度低于50的WiFi
+int wifi_change_sendmqtt_init();//wifi改变初始化，放在main开头,必须要等mqtt直播就绪才行
+void wifi_change_recmqtt(cJSON *body);//接收到修改WiFi指令
 
-int delete_wifi_by_ssid(const char* ssid);//忘记指定的WiFi的密码
 #endif
\ No newline at end of file

src/mqtt.c

@@ -14,6 +14,7 @@
 #include "judg.h"
 #include "ads1115.h"
 #include "audioplay.h"
+#include "wifichange.h"
 
 struct mosquitto *mosq;
 
@@ -299,8 +300,11 @@ int device_message_receive(cJSON *json){//接收到的控制设备的mqtt消息
                 my_zlog_debug("进入查询WiFi");
                 break;
             case 2004:
+                wifi_change_recmqtt(body);
+                my_zlog_debug("进入修改WiFi");
                 break;
-            case 2005:download_message(body);
+            case 2005:
+                download_message(body);
                 break;
             default:
                 break;

src/thread_main.c

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "device_exit.h"
 #include "thread_main.h"
+#include "wifichange.h"
 
 pthread_t thread[6];  // 全局线程句柄数组（或传参）
 
@@ -60,7 +61,8 @@ void *AppExit(void *arg) { //出现意外自动停止
 void *Mqttbeat(void *arg) { 
     //printf("Mqttbeat start\n");
     my_zlog_info("Mqttbeat start");
-    Delay_Ms(15,0);
+    Delay_Ms(5,0);
+    wifi_change_sendmqtt_init();
     while(1) {
         if( AppExit_pin_pwm == 202) Delay_Ms(0,45);
         if( AppExit_pin_pwm != 202) Delay_Ms(0,100);