keil/include/src/TCPClient.c
@@ -360,6 +360,78 @@
            WT588E_PLAY(atoi(apcSplitStr[2]));
        }
    }
    else if (STRCMP(_u8Data, "$set_gpsuwbpara,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        uint16_t buffer_len,datalen;
        char send_buffer[20]={"ERROR\r\n"};
        if (u32SplitCnt < 6)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            HIDO_INT32 gpskaiguan,uwbkaiguan,gpspinlv,uwbpinlv,gpsbaudrate1;
            gpskaiguan= HIDO_UtilStrToInt(apcSplitStr[2]);
            g_com_map[GPSENBLE] = gpskaiguan;
            uwbkaiguan= HIDO_UtilStrToInt(apcSplitStr[3]);
            g_com_map[UWBENBLE] = uwbkaiguan;
            gpspinlv= HIDO_UtilStrToInt(apcSplitStr[4]);
            g_com_map[GPSFrequency] = gpspinlv;
            uwbpinlv= HIDO_UtilStrToInt(apcSplitStr[5]);
            g_com_map[UWBFrequency] = uwbpinlv;
            gpsbaudrate1= HIDO_UtilStrToInt(apcSplitStr[6]);
            g_com_map[GPSBAUDRATE1_INDEX] = gpsbaudrate1>>16;
            g_com_map[GPSBAUDRATE2_INDEX] = gpsbaudrate1;
            if((g_com_map[GPSENBLE]||g_com_map[GPSENBLE]==0)
             &&(g_com_map[UWBENBLE]||g_com_map[UWBENBLE]==0)
             &&(g_com_map[GPSFrequency]<65535&&g_com_map[GPSFrequency]>0)
             &&(g_com_map[UWBFrequency]==1||g_com_map[UWBFrequency]==3||g_com_map[UWBFrequency]==5||g_com_map[UWBFrequency]==10)
             &&(gpsbaudrate1==9600||gpsbaudrate1==115200)
            )
            {
            save_com_map_to_flash();
//            Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
            g_com_map[CNT_RESTART] = 1;
            }
            else
            {
            Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,10);
            }
        }
    }
    else if (STRCMP(_u8Data, "$read_gpsuwbpara,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        uint16_t buffer_len,datalen;
        char send_buffer[200]={"ERROR\r\n"};
        if (u32SplitCnt < 1)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            uint16_t checksum = 0;
            send_buffer[0] = 0x55;
            send_buffer[1] = 0xAA;
            send_buffer[2] = 0x03;
            send_buffer[3] = 160+5;
            send_buffer[4] = CMD_REPLY;
            send_buffer[5] = 0;
            send_buffer[6] = 160;
            memcpy(&send_buffer[7], &g_com_map, 160);
            for(uint8_t i = 0; i<(160+5); i++)
            {
                checksum += send_buffer[2+i];
            }
            checksum = Checksum_u16(&send_buffer[2],5+160);
            memcpy(&send_buffer[7+160],&checksum,2);
            Socket_Send(l_i32TCPClientID,send_buffer,9+160);
        }
    }
    return HIDO_OK;
}
@@ -519,8 +591,8 @@
        } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
        {
            u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s,1",
                                       g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, \
            Module_GetCCID(),userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
                                       g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
            userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
        } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NONE)
        {
            u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,1",
@@ -550,6 +622,7 @@
        alarm_type = 0;
}
extern uint32_t uwbled,rtkled,led4g,powerled;
extern uint8_t heartbeasend_flag;
HIDO_INT32 TCPClient_Poll(void)
{
    if (Internet_IsIPReady() == HIDO_TRUE)
@@ -586,9 +659,10 @@
        else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
        {
           led4g=GREEN;
           if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect)
           if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect||heartbeasend_flag)
                //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
            {
                heartbeasend_flag=0;
                flag_first_TCPconnect = 0;
                l_u32HeartBeatTick = u32CurTick;
                // 这里是自定义心跳