From 4a13529748c983ff0d5627a28365ad7737141016 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 二月 2022 09:31:49 +0800
Subject: [PATCH] V1.62
---
源码/核心板/Src/OnChipDevices/Usart.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
index 234c307..776f8d1 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
@@ -2,7 +2,6 @@
#include <string.h>
#include <stdio.h>
#include "modbus.h"
-
//数据发送队列变量
EUART_Frame m_EUART_TxFrames[EUART_TX_FRM_SIZE]; //数据发送帧队列
volatile int8_t m_EUART_TxFrm_Tail = 0; //数据发送帧队列尾指针
@@ -123,6 +122,7 @@
UART_DMAConfiguration();
}
+
extern u8 cmd_mode;
u8 overrun_flag=0;
u16 t1,t2,t3,t4;
@@ -270,7 +270,6 @@
}
-
#ifndef EXUART_USE_TXDMA
//查询方式发送数据
void UART_CheckSend(void)
@@ -333,7 +332,7 @@
} // */
#else
-
+ /*
//检查是否数据帧需要发送
void UART_CheckSend(void)
{
@@ -361,12 +360,10 @@
if(m_EUART_TxFrm_Head == m_EUART_TxFrm_Tail)
{
m_bEUARTCheckingSend = 0;
- OUT485_DISABLE;
return;
}
//开启一次数据发送
- OUT485_ENABLE;
EUART_TX_DMA_CH->CMAR = (uint32_t)m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf; //要发送的内存地址
EUART_TX_DMA_CH->CNDTR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].len; //要发送的字节数
EUART_TX_DMA_CH->CCR |= 0x01; //开启一次DMA
@@ -401,7 +398,6 @@
m_EUART_TxFrm_Head = 0;
m_EUART_TxFrm_FreeFrmLen--;
m_bEUARTPushingFrms = 0;
- UART_CheckSend();
}
//将最新一帧数据Pop出队列
--
Gitblit v1.9.3