diff --git a/.vscode/settings.json b/.vscode/settings.json index 0a1ea92..9cb9f22 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,6 +56,11 @@ "tick.h": "c", "bsp_ooid.h": "c", "tpc_x.h": "c", - "typeinfo": "c" + "typeinfo": "c", + "cstddef": "c", + "string": "c", + "optional": "c", + "memory": "c", + "new": "c" } } \ No newline at end of file diff --git a/source/app/task_appstatus.c b/source/app/task_appstatus.c index 40cb1ee..2437182 100644 --- a/source/app/task_appstatus.c +++ b/source/app/task_appstatus.c @@ -78,11 +78,11 @@ void L3_task_appstatus_handler(S_TASK_APPSTATUS *s) // 音频通电后播放开机语音 // L2_WT2605B_PWRON(); // Lc_delay_ms(1000); - L2_WT2605B_broadcast(&audio_poweron); - //wifi任务初始化 - L3_task_W600_flow_init(W600_ST); + L2_WT2605B_broadcast(&audio_poweron); // OID、WIFI开启 - L2_OID_WIFI_Open(); + L2_OID_WIFI_Open(); + //wifi任务初始化 + L3_task_W600_flow_init(W600_ST); } else if (s->status == WIFI_CONFIG) @@ -92,7 +92,7 @@ void L3_task_appstatus_handler(S_TASK_APPSTATUS *s) // 音频播放 L2_WT2605B_broadcast(&audio_config_mode); // 配网任务初始化,进入配网 - L3_gm35_send_str("+++"); + // L3_gm35_send_str("+++"); L3_task_W600_flow_init(W600_SC); } else if (s->status == WIFI_CONFIG_Phone) diff --git a/source/app/task_w600.c b/source/app/task_w600.c index e636afa..4e0bf9f 100644 --- a/source/app/task_w600.c +++ b/source/app/task_w600.c @@ -150,7 +150,6 @@ void L3_task_W600_flow_init(U8 mode) #define TTSS_TASK_GM35_FLOW_ST_CIPOFF 0x30 -#define TTSS_TASK_GM35_FLOW_ATE0QV 0x31 #define TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG 0x32 #define TTSS_TASK_GM35_FLOW_ST_SMARTCWATING 0x33 #define TTSS_TASK_GM35_FLOW_ST_SAMRTCSTOP 0x34 @@ -165,7 +164,29 @@ void L3_task_W600_flow_init(U8 mode) void L2_task_W600_flow_handle(struct _s_task_W600_Para *s) { TTSS_Task_init() - L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV,D_Tdelay_5s);//上电等待5s + L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ST_CIPOFF,D_Tdelay_5s);//上电等待5s + + TTSS_Task_step(TTSS_TASK_GM35_FLOW_ST_CIPOFF) + if(s->send == 0) + {//发送 + L3_gm35_send_str("+++"); //关闭CIP + s->ins_ok = 0; + s->ins_stmp = s_nos_tick.t_1s; + s->send = 0; + s->busy = 0; + L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATEQV,D_Tdelay_1s); + } + // else if(1 == s->ins_ok) + // { + // s->send = 0; + // s->st_error = 0; + // L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG,D_Tdelay_1s); + // } + // else if(s_nos_tick.t_1s - s->ins_stmp > INS_TIMEOUT) + // {//超时重发 + // s->send = 0; + // } + TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV) if(s->send == 0) {//发送 @@ -308,45 +329,6 @@ void L2_task_W600_flow_handle(struct _s_task_W600_Para *s) L2_task_go(TTSS_TASK_GM35_FLOW_ST_DATA); /*******************************************s->mode = W600_SC(按键进入)********************************************** */ - - TTSS_Task_step(TTSS_TASK_GM35_FLOW_ST_CIPOFF) - if(s->send == 0) - {//发送 - L3_gm35_send_str("+++"); //关闭CIP - s->ins_ok = 0; - s->ins_stmp = s_nos_tick.t_1s; - s->send = 0; - s->busy = 0; - L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ATE0QV,D_Tdelay_1s); - } - // else if(1 == s->ins_ok) - // { - // s->send = 0; - // s->st_error = 0; - // L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG,D_Tdelay_1s); - // } - // else if(s_nos_tick.t_1s - s->ins_stmp > INS_TIMEOUT) - // {//超时重发 - // s->send = 0; - // } - TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATE0QV) - if(s->send == 0) - {//发送 - L3_gm35_send_str(AT_INS_ATE0); //"ATE0\r\n" //模块查询+关闭回显 - s->ins_ok = 0; - s->ins_stmp = s_nos_tick.t_1s; - s->send = 1; - s->busy = 0; - } - else if(s->busy == 0 && s->ins_ok == 1) //等待 - { - s->send = 0; - L2_task_go_Tdelay(TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG,D_Tdelay_1s); - } - else if(s_nos_tick.t_1s - s->ins_stmp > INS_TIMEOUT) - {//超时重发 - s->send = 0; - } TTSS_Task_step(TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG) if(s->send == 0) {//发送