|
@@ -34,6 +34,7 @@
|
|
//全局变量输出区
|
|
//全局变量输出区
|
|
UINT32 TcpService = 0;
|
|
UINT32 TcpService = 0;
|
|
UINT8 WorkFlag=0;
|
|
UINT8 WorkFlag=0;
|
|
|
|
+QueueHandle_t Error_Handle = NULL;
|
|
//全局变量输入区
|
|
//全局变量输入区
|
|
extern UINT32 Timer_count;
|
|
extern UINT32 Timer_count;
|
|
extern volatile BOOL Sleep_flag;
|
|
extern volatile BOOL Sleep_flag;
|
|
@@ -85,6 +86,10 @@ static void TcpTask(void* arg)
|
|
{
|
|
{
|
|
TcpRecvHandle = osMessageQueueNew(1,sizeof(TcpipConnectionRecvDataInd*), NULL);
|
|
TcpRecvHandle = osMessageQueueNew(1,sizeof(TcpipConnectionRecvDataInd*), NULL);
|
|
}
|
|
}
|
|
|
|
+ if(Error_Handle == NULL)
|
|
|
|
+ {
|
|
|
|
+ Error_Handle = osMessageQueueNew(5,sizeof(UINT16), NULL);
|
|
|
|
+ }
|
|
while (true)
|
|
while (true)
|
|
{
|
|
{
|
|
osDelay(100);
|
|
osDelay(100);
|
|
@@ -271,6 +276,7 @@ static void TcpDataInfoAssembleSend()
|
|
|
|
|
|
UINT16 year;
|
|
UINT16 year;
|
|
UINT8 month,day,hour,minute,sec;
|
|
UINT8 month,day,hour,minute,sec;
|
|
|
|
+ UINT16 ErrorTemp;
|
|
UTC8TimeType UTC8TimeTcp;
|
|
UTC8TimeType UTC8TimeTcp;
|
|
int i = 0;
|
|
int i = 0;
|
|
INT8 len = -1;
|
|
INT8 len = -1;
|
|
@@ -352,10 +358,24 @@ static void TcpDataInfoAssembleSend()
|
|
BattToTcpInfo.battInfo.msgCollectionTimeUTC[5] = UTC8TimeTcp.second & 0xFF; //sec
|
|
BattToTcpInfo.battInfo.msgCollectionTimeUTC[5] = UTC8TimeTcp.second & 0xFF; //sec
|
|
BattToTcpInfo.battInfo.signalStrength = csq ;
|
|
BattToTcpInfo.battInfo.signalStrength = csq ;
|
|
//故障等级故障代码未定义
|
|
//故障等级故障代码未定义
|
|
- BattToTcpInfo.battInfo.errClass = 0x01;
|
|
|
|
- BattToTcpInfo.battInfo.errCode[0] = 0x01;
|
|
|
|
- BattToTcpInfo.battInfo.errCode[1] = 0x01;
|
|
|
|
-
|
|
|
|
|
|
+ if(osMessageQueueGet(Error_Handle, &ErrorTemp, 0, 0)==osOK)
|
|
|
|
+ {
|
|
|
|
+ #ifdef USING_PRINTF
|
|
|
|
+ printf("Temp-Error:%d\n",ErrorTemp);
|
|
|
|
+ #endif
|
|
|
|
+ BattToTcpInfo.battInfo.errClass = 0x00;
|
|
|
|
+ BattToTcpInfo.battInfo.errCode[0] = ErrorTemp>>8;
|
|
|
|
+ BattToTcpInfo.battInfo.errCode[1] = ErrorTemp;
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ #ifdef USING_PRINTF
|
|
|
|
+ printf("Temp-Error:%d\n",ErrorTemp);
|
|
|
|
+ #endif
|
|
|
|
+ BattToTcpInfo.battInfo.errClass = 0x00;
|
|
|
|
+ BattToTcpInfo.battInfo.errCode[0] = 0x00;
|
|
|
|
+ BattToTcpInfo.battInfo.errCode[1] = 0x00;
|
|
|
|
+ }
|
|
BattToTcpInfo.battInfo.battI[0] = battI>>8;
|
|
BattToTcpInfo.battInfo.battI[0] = battI>>8;
|
|
BattToTcpInfo.battInfo.battI[1] = battI & 0xFF;
|
|
BattToTcpInfo.battInfo.battI[1] = battI & 0xFF;
|
|
|
|
|