|
@ -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_ST_CIPOFF 0x30 |
|
|
#define TTSS_TASK_GM35_FLOW_ATE0QV 0x31 |
|
|
|
|
|
#define TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG 0x32 |
|
|
#define TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG 0x32 |
|
|
#define TTSS_TASK_GM35_FLOW_ST_SMARTCWATING 0x33 |
|
|
#define TTSS_TASK_GM35_FLOW_ST_SMARTCWATING 0x33 |
|
|
#define TTSS_TASK_GM35_FLOW_ST_SAMRTCSTOP 0x34 |
|
|
#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) |
|
|
void L2_task_W600_flow_handle(struct _s_task_W600_Para *s) |
|
|
{ |
|
|
{ |
|
|
TTSS_Task_init() |
|
|
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) |
|
|
TTSS_Task_step(TTSS_TASK_GM35_FLOW_ATEQV) |
|
|
if(s->send == 0) |
|
|
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); |
|
|
L2_task_go(TTSS_TASK_GM35_FLOW_ST_DATA); |
|
|
|
|
|
|
|
|
/*******************************************s->mode = W600_SC(按键进入)********************************************** */ |
|
|
/*******************************************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) |
|
|
TTSS_Task_step(TTSS_TASK_GM35_FLOW_ST_SMARTCONFIG) |
|
|
if(s->send == 0) |
|
|
if(s->send == 0) |
|
|
{//发送
|
|
|
{//发送
|
|
|