From d0ecbb6b662da93cf85096bd628d41729cd47b24 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期一, 11 十一月 2024 18:16:49 +0800 Subject: [PATCH] 手环加入上位机配置4G和GPS更新频率设置,加入供电过低保护,减少搜索为1s,震动逻辑变为10s停,500ms震,搜索模式加入校准时间函数,满足功耗稳定测距版本,加入SOS报警上传,初步加入查询伪代码,加入休眠唤醒逻辑 --- keil/include/drivers/serial_at_cmd_app.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c index 538a1ce..05068a6 100644 --- a/keil/include/drivers/serial_at_cmd_app.c +++ b/keil/include/drivers/serial_at_cmd_app.c @@ -27,7 +27,7 @@ extern void IO_control_init(void); extern void blink_led(uint8_t*state); extern void updata_led_power_state(void); -extern uint8_t gps_success_state; +extern uint8_t gps_success_state,gps_power_state; extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag; extern uint16_t gps_wait_count; typedef enum @@ -135,6 +135,7 @@ } } +double d_value; void UsartParseDataHandler(uint8_t data) { if(state5V_prase_flag&&!g_com_map[MODBUS_MODE]) @@ -244,28 +245,26 @@ analysis_num=sscanf((char*)mUsart2ReceivePack,"$%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*[^,],%*s",gps_header,wdrecv.m_pData,jdrecv.m_pData,Posstate.m_pData); if(!memcmp(gps_header,"GNGGA",5)) - { - if(g_com_map[MODBUS_MODE]) - LOG_INFO(TRACE_MODULE_APP,"%s", mUsart2ReceivePack); - wd=strtod(wdrecv.m_pData,NULL); - jd=strtod(jdrecv.m_pData,NULL); - pos_state=atoi(Posstate.m_pData); - } else { - wd=0; - jd=0; - } - index = 0; - blink_led(&gps_success_state); - if(pos_state!=0) - { - //4g.jd=jd; - //4g.wd=wd; - gps_timeout_flag=1;//不超时接收状态 + { d_value=strtod(wdrecv.m_pData,NULL); + if(d_value>0) + { + blink_led(&gps_success_state); + wd=strtod(wdrecv.m_pData,NULL); + jd=strtod(jdrecv.m_pData,NULL); + pos_state=atoi(Posstate.m_pData); + } + if(pos_state!=0) + { + gps_timeout_flag=0;//不超时接收状态 gps_need_data_flag=0;//接收数据完成 gps_wait_count=0;//清0接收状态 -// gps_enable_flag=0;//收到有效数据关闭GPS - } - //memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack)); + gps_power_state=0;//立即关闭gps避免紧接着进入搜索导致未及时关闭 + update_led_power_state(); + pos_state=0; + } + } + + memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack)); memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData)); memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData)); memset(Posstate.m_pData,0,sizeof(Posstate.m_pData)); -- Gitblit v1.9.3