|
@@ -267,8 +267,11 @@ static void Main_Task(void* arg)
|
|
|
PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_SLEEP);
|
|
|
PROC_CAN_STATE_SWITCH(PROCESS_CAN_STATE_SLEEP);
|
|
|
PROC_TCP_STATE_SWITCH(PROCESS_TCP_STATE_SLEEP);
|
|
|
+ osDelay(1000/portTICK_PERIOD_MS);
|
|
|
}
|
|
|
-
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("Ms_sleep:uart_%d,can_%d,tcp_%d\r\n",gProcess_Uart_Task,gProcess_Can_Task,gProcess_Tcp_Task);
|
|
|
+ #endif
|
|
|
slpManSlpState_t State;
|
|
|
uint8_t cnt;
|
|
|
if(slpManCheckVoteState(MainSlpHandler, &State, &cnt)==RET_TRUE)
|
|
@@ -471,6 +474,9 @@ static void Uart_Task(void* arg)
|
|
|
}
|
|
|
case PROCESS_UART_STATE_WORK:
|
|
|
{
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("UART_STATE_WORK!\n");
|
|
|
+ #endif
|
|
|
NetSocDisplay(LED_SOC_1,LED_TURN_ON);
|
|
|
Uart_task = false;
|
|
|
Uart_Rece_buffer = (uint8_t *)malloc(Uart_Rece_LEN);
|
|
@@ -588,7 +594,7 @@ static void Uart_Task(void* arg)
|
|
|
{
|
|
|
//slpManPlatVoteEnableSleep(UartSlpHandler, SLP_SLP2_STATE);
|
|
|
#ifdef USING_PRINTF
|
|
|
- printf("PROCESS_UART_STATE_SLEEP\n");
|
|
|
+ printf("UART_STATE_SLEEP\n");
|
|
|
#endif
|
|
|
while(1)
|
|
|
{
|
|
@@ -648,6 +654,9 @@ static void Can_Task(void* arg)
|
|
|
}
|
|
|
case PROCESS_CAN_STATE_RECV:
|
|
|
{
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("CAN_STATE_RECV!\n");
|
|
|
+ #endif
|
|
|
//can采用先接收后发送的策略
|
|
|
HAL_Can_Receive(Can_Rece_buffer);
|
|
|
if (Can_Rece_buffer[0]!=0xff)//满足can发送使能
|
|
@@ -663,12 +672,12 @@ static void Can_Task(void* arg)
|
|
|
}
|
|
|
case PROCESS_CAN_STATE_SEND:
|
|
|
{
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("CAN_STATE_SEND!\n");
|
|
|
+ #endif
|
|
|
Can_Flag=false;
|
|
|
while(!Can_Flag)
|
|
|
{
|
|
|
- #ifdef USING_PRINTF
|
|
|
- printf("Can_Send!\n");
|
|
|
- #endif
|
|
|
switch(send_index)
|
|
|
{
|
|
|
case 0:
|
|
@@ -812,7 +821,7 @@ static void Can_Task(void* arg)
|
|
|
{
|
|
|
//slpManPlatVoteEnableSleep(CanSlpHandler, SLP_SLP2_STATE);
|
|
|
#ifdef USING_PRINTF
|
|
|
- printf("PROCESS_CAN_STATE_SLEEP\n");
|
|
|
+ printf("CAN_STATE_SLEEP\n");
|
|
|
#endif
|
|
|
while(1)
|
|
|
{
|
|
@@ -1033,6 +1042,9 @@ static void Tcp_Task(void* arg)
|
|
|
}
|
|
|
case PROCESS_TCP_STATE_WORK:
|
|
|
{
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("TCP_STATE_WORK!\n");
|
|
|
+ #endif
|
|
|
Tcp_Flag = false;
|
|
|
TcpSendBuffer = (uint8_t *)malloc(NB_send_len);
|
|
|
while (!Tcp_Flag)
|
|
@@ -1101,7 +1113,7 @@ static void Tcp_Task(void* arg)
|
|
|
closesocket(sockfd);
|
|
|
deregisterPSEventCallback(socketRegisterPSUrcCallback);//注销NB网络事件函数
|
|
|
#ifdef USING_PRINTF
|
|
|
- printf("PROCESS_TCP_STATE_SLEEP\n");
|
|
|
+ printf("TCP_STATE_SLEEP\n");
|
|
|
#endif
|
|
|
while(1)
|
|
|
{
|