|
@@ -49,7 +49,6 @@ static void UartTask(void* arg)
|
|
|
PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_ENCRYPT);
|
|
|
while (1)
|
|
|
{
|
|
|
- osDelay(100);
|
|
|
switch (gProcess_Uart_Task)
|
|
|
{
|
|
|
case PROCESS_UART_STATE_ENCRYPT:
|
|
@@ -66,7 +65,7 @@ static void UartTask(void* arg)
|
|
|
}
|
|
|
case PROCESS_UART_STATE_IDLE:
|
|
|
{
|
|
|
- osDelay(50);
|
|
|
+ osDelay(100);
|
|
|
if(TimeCounter%10==0 && gProcess_app==WORK)
|
|
|
{
|
|
|
if(osMessageQueueGet(UartWriteCmdHandle,&UartWriteData,0,0)==osOK)
|
|
@@ -122,6 +121,9 @@ static void UartTask(void* arg)
|
|
|
Uart_Read_Msg.CRC_L = CRC_chk_buffer;
|
|
|
Uart_Read_Msg.CRC_H = CRC_chk_buffer>>8;
|
|
|
Uart_Recv_LEN = Uart_DataRecv_func(Uart_Read_Msg,(UINT8*)(UartAnswerData.Header));
|
|
|
+ #ifdef USING_PRINTF
|
|
|
+ printf("[%d]Uart_Recv_buffer-%d: ",__LINE__,Uart_Recv_LEN);
|
|
|
+ #endif
|
|
|
if(Uart_Recv_LEN>0)
|
|
|
{
|
|
|
UartRecvFlag = 1;
|
|
@@ -135,7 +137,7 @@ static void UartTask(void* arg)
|
|
|
|
|
|
PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
|
|
|
#ifdef USING_PRINTF
|
|
|
- printf("\nUart_Recv_buffer: ");
|
|
|
+ printf("[%d]Uart_Recv_buffer-%d: ",__LINE__,Uart_Recv_LEN);
|
|
|
for(int i=0;i<Uart_Recv_LEN;i++)
|
|
|
{
|
|
|
printf("%x ",*((UINT8 *)&UartAnswerData.Header+i));
|
|
@@ -166,8 +168,14 @@ static void UartTask(void* arg)
|
|
|
{
|
|
|
osDelay(1000);
|
|
|
}
|
|
|
- PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
|
|
|
+ PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_ENCRYPT);
|
|
|
+ USARTdrv->Initialize(USART_callback);
|
|
|
USARTdrv->PowerControl(ARM_POWER_FULL);
|
|
|
+ USARTdrv->Control(ARM_USART_MODE_ASYNCHRONOUS |
|
|
|
+ ARM_USART_DATA_BITS_8 |
|
|
|
+ ARM_USART_PARITY_NONE |
|
|
|
+ ARM_USART_STOP_BITS_1 |
|
|
|
+ ARM_USART_FLOW_CONTROL_NONE, 9600);
|
|
|
break;
|
|
|
}
|
|
|
default:
|
|
@@ -175,7 +183,6 @@ static void UartTask(void* arg)
|
|
|
PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -284,7 +291,7 @@ UINT8 Uart_Encrypt_Send()
|
|
|
}
|
|
|
}
|
|
|
#ifdef USING_PRINTF
|
|
|
- printf("Uart_Rece_buffer: ");
|
|
|
+ printf("[%d]Uart_Encrypt_Recv: ",__LINE__);
|
|
|
for(int i=0;i<5;i++)
|
|
|
{
|
|
|
printf("%x ",UartDecryptBuffer[i]);
|