|
@@ -234,23 +234,23 @@ static void TcpDataInfoAssembleSend()
|
|
|
UINT8 temp=0;
|
|
|
|
|
|
UINT16 DataLen=0;
|
|
|
- UINT8 BattSendFreq=0;
|
|
|
- UINT8 GpsSendFreq=0;
|
|
|
+ UINT8 BattSendFreq=6;
|
|
|
+ UINT8 GpsSendFreq=1;
|
|
|
UINT8 WorkState=0;
|
|
|
- static UINT8 WorkFlag;
|
|
|
+ static UINT8 WorkFlag=0;
|
|
|
int i = 0;
|
|
|
INT8 len = -1;
|
|
|
WorkState = battWorkState;
|
|
|
if(WorkState==0x00 && WorkFlag==0x01)
|
|
|
{
|
|
|
- if(send_counter%RUN_END_DELAY==0)
|
|
|
+ if(send_counter%(RUN_END_DELAY/5)==0)
|
|
|
{
|
|
|
WorkFlag=0x00;
|
|
|
}
|
|
|
}
|
|
|
else if(WorkState==0x00 && WorkFlag==0x02)
|
|
|
{
|
|
|
- if(send_counter%CHRG_END_DELAY==0)
|
|
|
+ if(send_counter%(CHRG_END_DELAY/5)==0)
|
|
|
{
|
|
|
WorkFlag=0x00;
|
|
|
}
|
|
@@ -266,12 +266,10 @@ static void TcpDataInfoAssembleSend()
|
|
|
GpsSendFreq = AppDataInfo.GpsChrgInfoSendFreq/5;
|
|
|
break;
|
|
|
case 0x01:
|
|
|
- BattSendFreq = AppDataInfo.BmsDisChrgInfoSendFreq/5;
|
|
|
GpsSendFreq = AppDataInfo.GpsDisChrgInfoSendFreq/5;
|
|
|
break;
|
|
|
case 0x02:
|
|
|
BattSendFreq = AppDataInfo.BmsChrgInfoSendFreq/5;
|
|
|
- GpsSendFreq = AppDataInfo.GpsChrgInfoSendFreq/5;
|
|
|
break;
|
|
|
default:
|
|
|
BattSendFreq = AppDataInfo.BmsDisChrgInfoSendFreq/5;
|
|
@@ -391,7 +389,8 @@ static void TcpDataInfoAssembleSend()
|
|
|
memcpy((UINT8 *)&GpsToTcpInfo.gpsInfo.locateMark, GpsData,sizeof(GpsData));
|
|
|
GpsToTcpInfo.CRC = bcc_chk((UINT8 *)&GpsToTcpInfo, sizeof(GPSMsgtoTcpType)-1 );
|
|
|
osMutexRelease(GpsMutex);
|
|
|
- if(GpsToTcpInfo.gpsInfo.locateMark==0x01)
|
|
|
+ //if(GpsToTcpInfo.gpsInfo.locateMark==0x01)
|
|
|
+ if(1)
|
|
|
{
|
|
|
len = tcpipConnectionSend(socContext.id, (UINT8 *)&GpsToTcpInfo, sizeof(GpsToTcpInfo), 0, 0, 0);
|
|
|
if(len>0)
|