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
---
Function/GPRS/gprs_module_api.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Function/GPRS/gprs_module_api.c b/Function/GPRS/gprs_module_api.c
index d813120..fa35970 100644
--- a/Function/GPRS/gprs_module_api.c
+++ b/Function/GPRS/gprs_module_api.c
@@ -8,17 +8,17 @@
uint8_t gprs_resend_data_flag_g = 0;
/*Զ��DMA���պ˲�*/
-ErrorStatus_STM32 Gprs_Uart1_Rx_DMA_CH5_Check(void)
+ErrorStatus_STM32 Gprs_Uart1_Rx_DMA_CH3_Check(void)
{
uint16_t timeout_cnt = 0, dma_recv_cnt;
- uint32_t dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH9);
+ uint32_t dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH3);
if (dma_mar_reg_read != (uint32)gprs_module_para_g.gprs_recv_buf)
{
delay_ms(2);
- while (dma_mar_reg_read != DMA_CHxMAR_Read(DMA_CH9))
+ while (dma_mar_reg_read != DMA_CHxMAR_Read(DMA_CH3))
{
- dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH9);
+ dma_mar_reg_read = DMA_CHxMAR_Read(DMA_CH3);
delay_ms(2);
if (timeout_cnt++ > 100)
break;
@@ -32,12 +32,12 @@
{
gprs_module_para_g.gprs_recv_length = dma_recv_cnt;
// ����RAM��ַ����
- DMA_ISR_DMACHFT_Clr(DMA_CH5);
- DMA_CHxCR_ChxEN_Setable(DMA_CH5, DISABLE); // ͨ��ʧ��
+ DMA_ISR_DMACHFT_Clr(DMA_CH3);
+ DMA_CHxCR_ChxEN_Setable(DMA_CH3, DISABLE); // ͨ��ʧ��
- DMA_CHxMAR_Write(DMA_CH5, (uint32)gprs_module_para_g.gprs_recv_buf);
+ DMA_CHxMAR_Write(DMA_CH3, (uint32)gprs_module_para_g.gprs_recv_buf);
- DMA_CHxCR_ChxEN_Setable(DMA_CH5, ENABLE); // ͨ��ʹ��
+ DMA_CHxCR_ChxEN_Setable(DMA_CH3, ENABLE); // ͨ��ʹ��
gprs_module_para_g.gprs_recv_flag = SET; // �������
return SUCCESS_0;
// DMA_GCR_DMAEN_Setable(DISABLE);//DMA��ʹ��
--
Gitblit v1.9.3