From c0c1ff032edd95fb1c8becf9dab14d6652b8ea1f Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期五, 30 五月 2025 16:22:20 +0800 Subject: [PATCH] 工装测试底板发货V1.0版本,增加默认g_com表组为150,按键按下后3s会重置标志位,避免重复启动免布线测功率模式 --- keil/include/drivers/serial_at_cmd_app.c | 74 ++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 33 deletions(-) diff --git a/keil/include/drivers/serial_at_cmd_app.c b/keil/include/drivers/serial_at_cmd_app.c index 51d0a94..6b1cf1d 100644 --- a/keil/include/drivers/serial_at_cmd_app.c +++ b/keil/include/drivers/serial_at_cmd_app.c @@ -20,6 +20,8 @@ uint8_t mUsartReceivePack[100] = {0}; uint8_t mUsart2ReceivePack[150] = {0}; +uint8_t GPS_GGAmessage[150]={0}; +uint8_t GPS_GSVmessage[150]={0}; double jd,wd; int analysis_num,pos_state; uint8_t state5V_prase_flag=1,gps_prase_flag=1; @@ -27,10 +29,9 @@ 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_open_flag; extern uint8_t gps_success_state,gps_enable_flag,gps_need_data_flag,gps_timeout_flag,gps_power_state; extern uint16_t gps_wait_count; -uint8_t gps_send_count=3; typedef enum { BLE_RECV_STATE_IDLE = 0, @@ -80,7 +81,27 @@ sum = ~sum; return sum; } - +void SendComMap0(uint8_t data_length, uint8_t index)//表示成功读取的回应包 + { + static uint8_t send_frame[EUART_RX_BUF_SIZE]; + uint16_t checksum = 0; + send_frame[0] = 0x55; + send_frame[1] = 0xAA; + send_frame[2] = 0x03; + send_frame[3] = data_length+5; + send_frame[4] = CMD_REPLY; + send_frame[5] = index; + send_frame[6] = data_length; + memcpy(&send_frame[7], &g_com_map[index], data_length); + for(int i = 0; i<(data_length+5); i++) + { + checksum += send_frame[2+i]; + } + checksum = Checksum_u16(&send_frame[2],5+data_length); + memcpy(&send_frame[7+data_length],&checksum,2); + + uart_send(UART_ID0, send_frame,data_length+9, NULL); +} void SendComMap(uint8_t data_length, uint8_t index)//表示成功读取的回应包 { static uint8_t send_frame[EUART_RX_BUF_SIZE]; @@ -184,7 +205,7 @@ case CMD_READ: //read包中data字节,即mUsartReceivePack[0]表示数据长度; //从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节,发送出来 - SendComMap(pack_datalen,pack_index>>1); + SendComMap0(pack_datalen,pack_index>>1); break; default: break; @@ -247,37 +268,24 @@ 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); - pos_state=atoi(Posstate.m_pData); - if(pos_state!=0) - { - - //4g.jd=jd; - //4g.wd=wd; - blink_led(&gps_success_state); - wd=strtod(wdrecv.m_pData,NULL); - jd=strtod(jdrecv.m_pData,NULL); - gps_send_count--; - gps_timeout_flag=0;//不超时接收状态 - - gps_wait_count=0;//清0接收状态 - if(gps_send_count==0){ - gps_need_data_flag=0;//接收数据完成 - TCPHeartBeatUpload();//上传GPS数据 - gps_power_state=0; - update_led_power_state(); - gps_send_count=3; - } - pos_state=0;//以防多次发生 - - -// gps_enable_flag=0;//收到有效数据关闭GPS - + memcpy(GPS_GGAmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2); + + wd=strtod(wdrecv.m_pData,NULL); + jd=strtod(jdrecv.m_pData,NULL); + if(wd!=0) + pos_state=atoi(Posstate.m_pData); + if(pos_state!=0) + { + pos_state=0;//防止多次进入 + } + } - } +// if(!memcmp(gps_header,"GBGSV",5)) +// {memcpy(GPS_GSVmessage,mUsart2ReceivePack,strlen(mUsart2ReceivePack)-2); +// GPS_ParseGSV(GPS_GSVmessage,strlen(GPS_GSVmessage)); +// +// } - memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack)); memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData)); memset(jdrecv.m_pData,0,sizeof(jdrecv.m_pData)); -- Gitblit v1.9.3