引入mqtt 引入cjson

This commit is contained in:
2584532475@qq.com committed 2023-11-30 08:10:01 +08:00
1 parent a69c1a58d6
commit f8591b8b99
86 files changed
+12141 -2157

No files matched your search

+44 -7
View File
@@ -57,8 +57,8 @@ void MX_UART_TickHandle (void)
g_DebugDrv.rx_timer--;
// 4851
if (g_U4851Drv.rx_timer == 2) // 通过事件通知到业务app
{
if (g_U4851Drv.rxdone != NULL)
@@ -238,6 +238,7 @@ void MX_UART_Init (UartDrv_t *drv)
{
Error_Handler();
}
__HAL_UART_ENABLE_IT (&hlpuart2, UART_IT_RXNE);
break;
case G0_UART1 : // 4853
huart1.Instance = USART1;
@@ -328,6 +329,7 @@ void MX_UART_Init (UartDrv_t *drv)
{
Error_Handler();
}
__HAL_UART_ENABLE_IT (&huart3, UART_IT_RXNE);
break;
case G0_UART4: // ETH1
huart4.Instance = USART4;
@@ -383,6 +385,7 @@ void MX_UART_Init (UartDrv_t *drv)
{
Error_Handler();
}
__HAL_UART_ENABLE_IT (&huart6, UART_IT_RXNE);
break;
default:
break;
@@ -394,10 +397,21 @@ void MX_UART_Init (UartDrv_t *drv)
void MX_UART_IRQHandle (void)
{
uint8_t ret;
if (USART3->ISR & (1 << 5)) // 串口2
{
ret = USART3->RDR;
if (g_U4852Drv.rx_buffer != NULL)
{
g_U4852Drv.rx_buffer[g_U4852Drv.rx_size++] = ret;
g_U4852Drv.rx_timer = 30; // 30ms
if (g_U4852Drv.rx_size > UART_UART3_BUFF_SIZE)
g_U4852Drv.rx_size = 0;
}
}
if (USART2->ISR & (1 << 5)) // 串口2
{
ret = USART2->RDR;
if( g_DebugDrv.rx_buffer != NULL)
if (g_DebugDrv.rx_buffer != NULL)
{
g_DebugDrv.rx_buffer[g_DebugDrv.rx_size++] = ret;
g_DebugDrv.rx_timer = 30; // 30ms
@@ -408,7 +422,7 @@ void MX_UART_IRQHandle (void)
if (USART4->ISR & (1 << 5))
{
ret = USART4->RDR;
if( g_ETH1Drv.rx_buffer != NULL)
if (g_ETH1Drv.rx_buffer != NULL)
{
g_ETH1Drv.rx_buffer[g_ETH1Drv.rx_size++] = ret;
g_ETH1Drv.rx_timer = 30; // 30ms
@@ -419,7 +433,7 @@ void MX_UART_IRQHandle (void)
if (USART5->ISR & (1 << 5))
{
ret = USART5->RDR;
if( g_U4851Drv.rx_buffer != NULL)
if (g_U4851Drv.rx_buffer != NULL)
{
g_U4851Drv.rx_buffer[g_U4851Drv.rx_size++] = ret;
g_U4851Drv.rx_timer = 30; // 30ms
@@ -427,11 +441,22 @@ void MX_UART_IRQHandle (void)
g_U4851Drv.rx_size = 0;
}
}
if (USART6->ISR & (1 << 5))
{
ret = USART6->RDR;
if (g_ViewDrv.rx_buffer != NULL)
{
g_ViewDrv.rx_buffer[g_ViewDrv.rx_size++] = ret;
g_ViewDrv.rx_timer = 30; // 30ms
if (g_ViewDrv.rx_size > UART_UART6_BUFF_SIZE)
g_ViewDrv.rx_size = 0;
}
}
if (LPUART1->ISR & (1 << 5))
{
ret = LPUART1->RDR;
if( g_ETH2Drv.rx_buffer != NULL)
if (g_ETH2Drv.rx_buffer != NULL)
{
g_ETH2Drv.rx_buffer[g_ETH2Drv.rx_size++] = ret;
g_ETH2Drv.rx_timer = 30; // 30ms
@@ -439,6 +464,18 @@ void MX_UART_IRQHandle (void)
g_ETH2Drv.rx_size = 0;
}
}
if (LPUART2->ISR & (1 << 5))
{
ret = LPUART2->RDR;
if (g_GSMDrv.rx_buffer != NULL)
{
g_GSMDrv.rx_buffer[g_GSMDrv.rx_size++] = ret;
g_GSMDrv.rx_timer = 30; // 30ms
if (g_GSMDrv.rx_size > UART_LPUART2_BUFF_SIZE)
g_GSMDrv.rx_size = 0;
}
}
}