yincheng.zhong
2024-09-20 0c4a7b78eee22326538b29c9a2ddf1c9e6ba0ae4
keil/include/drivers/serial_at_cmd_app.c
@@ -165,12 +165,12 @@
                switch(pack_cmd)
                {
                case CMD_WRITE:
                  if(pack_index==MODBUS_MODE*2)
                  {
                      Uart1GpsRecDebugSend();
                      g_com_map[MODBUS_MODE] = 1;
                      return;
                  }
                    if(pack_index==MODBUS_MODE*2)
                    {
                        Uart1GpsRecDebugSend();
                        g_com_map[MODBUS_MODE] = 1;
                        return;
                    }
                    //从mUsartReceivePack中读取pack_length长度的字节,放到全局变量中,赋值保存的参数并且存入flash
                    memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
                    if(mUsartReceivePack[0]==1)
@@ -234,7 +234,7 @@
//GPS解析数据
//   static ST_BLERecv BLE_recvive;
        GGA_DataStruct jdrecv,wdrecv,Posstate;
        //接收数据开始分析
        mUsart2ReceivePack[index]  =  data; //char数组传进来参数data
        mUsart2ReceivePack_before  =  mUsart2ReceivePack_now;
@@ -243,40 +243,40 @@
        if( mUsart2ReceivePack_before == 0x0D && mUsart2ReceivePack_now==0x0A )//接收数据到“0x0D 0x0A”结束
        {
            //解析该条GPS报文
            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;//以防多次发生
                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
                }
            }
               }
            memset(mUsart2ReceivePack,0,sizeof(mUsart2ReceivePack));
            memset(wdrecv.m_pData,0,sizeof(wdrecv.m_pData));