From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Tue, 11 Jun 2024 14:23:53 +0800
Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power
---
Pre_Drivers/RS232.c | 85 +++---------------------------------------
1 files changed, 7 insertions(+), 78 deletions(-)
diff --git a/Pre_Drivers/RS232.c b/Pre_Drivers/RS232.c
index ede146d..324c5f9 100644
--- a/Pre_Drivers/RS232.c
+++ b/Pre_Drivers/RS232.c
@@ -239,89 +239,18 @@
}
///*--------------------------------�жϷ�����--------------------------------------------------*/
-uint8_t RX_dat;
-uint8_t RX_flag;
void UART1_IRQHandler(void)
{
-
- // �����жϴ���
- if ((ENABLE == UARTx_IER_RXBF_IE_Getable(UART1)) && (SET == UARTx_ISR_RXBF_Chk(UART1)))
+ if (UARTx_ISR_RXTO_Chk(UART1) == SET)
{
- DMA_ISR_DMACHFT_Clr(DMA_CH3);
-
- DMA_CHxCR_ChxEN_Setable(DMA_CH3, DISABLE); // ͨ��ʧ��
-
- DMA_CHxMAR_Write(DMA_CH3, (uint32)LinkDlg.UartBuff);
-
- DMA_CHxCR_ChxEN_Setable(DMA_CH3, ENABLE); // ͨ��ʹ��
- }
+ UARTx_ISR_RXTO_Clr(UART1);
+ }
}
void UART5_IRQHandler(void)
{
-
- // �����жϴ���
- if ((ENABLE == UARTx_IER_RXBF_IE_Getable(UART5)) && (SET == UARTx_ISR_RXBF_Chk(UART5)))
- {
-
- DMA_ISR_DMACHFT_Clr(DMA_CH5);
-
- DMA_CHxCR_ChxEN_Setable(DMA_CH5, DISABLE); // ͨ��ʧ��
-
- DMA_CHxMAR_Write(DMA_CH5, (u32)(UTR_rec_buff));
-
- DMA_CHxCR_ChxEN_Setable(DMA_CH5, ENABLE); // ͨ��ʹ��
+ if (UARTx_ISR_RXTO_Chk(UART5) == SET)
+ {
+ UARTx_ISR_RXTO_Clr(UART5);
}
-}
-
-void DMA_IRQHandler(void)
-{
- if ((ENABLE == DMA_CHxCR_CHxFTIE_Getable(DMA_CH3)) && (SET == DMA_ISR_DMACHFT_Chk(DMA_CH3)))
- {
- // �ж�ת�����յ�������
- DMA_ISR_DMACHFT_Clr(DMA_CH3);
- }
-}
-
-///*--------------------------------DMA�����жϺ���--------------------------------------------------*/
-/*Զ��DMA���պ˲�*/
-ErrorStatus_STM32 Gprs_Uart1_Rx_DMA_CH3_Check(void)
-{
- uint16_t timeout_cnt = 0;
- uint16_t dma_recv_cnt;
- uint32_t dma_mar_reg_read;
-
- dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH3);
-
- if (dma_mar_reg_read != (uint32)LinkDlg.UartBuff)
- {
- delay_ms(2);
- while (dma_mar_reg_read != DMA_CHxMAR_Read(DMA_CH3))
- {
- dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH3);
- delay_ms(2);
- if (timeout_cnt++ > 100)
- break;
- }
- }
- else
- return ERROR_1;
-
- dma_recv_cnt = dma_mar_reg_read - (uint32)LinkDlg.UartBuff;
- if (dma_recv_cnt)
- {
- LinkDlg.DataLen = dma_recv_cnt;
- // ����RAM��ַ����
- DMA_ISR_DMACHFT_Clr(DMA_CH3);
- DMA_CHxCR_ChxEN_Setable(DMA_CH3, DISABLE); // ͨ��ʧ��
-
- DMA_CHxMAR_Write(DMA_CH3, (uint32)LinkDlg.UartBuff);
-
- DMA_CHxCR_ChxEN_Setable(DMA_CH3, ENABLE); // ͨ��ʹ��
-
- LinkDlg.Gprs_Finish_Flag = SET; // �������
- return SUCCESS_0;
- // DMA_GCR_DMAEN_Setable(DISABLE);//DMA��ʹ��
- }
- return ERROR_1;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3