From 61b5220eefbec3fff8df2fa0ff13d216626df280 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 十一月 2020 17:40:07 +0800
Subject: [PATCH] Revert "Revert "Revert "V1.34 增加滤波 防撞1对10发货"""
---
源码/核心板/Src/OnChipDevices/Usart.c | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 6ed2bf7..e208c34 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"
@@ -1,5 +1,6 @@
#include "Usart.h"
#include <string.h>
+#include <stdio.h>
//数据发送队列变量
EUART_Frame m_EUART_TxFrames[EUART_TX_FRM_SIZE]; //数据发送帧队列
@@ -16,7 +17,6 @@
volatile uint8_t m_bEUARTTxEn = 0; //使能发送
void (*Usart1ParseDataCallback)(uint8_t);
-
void Usart1InitVariables(void)
{
m_EUART_TxFrm_FreeFrmLen = EUART_TX_FRM_SIZE-1;
@@ -82,14 +82,18 @@
//初始化管脚
GPIO_InitStructure.GPIO_Pin = EU_RX_PIN;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING; //Rx上拉输入
+ GPIO_InitStructure.GPIO_Mode =GPIO_Mode_IN_FLOATING; //Rx上拉输入
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(EU_RX_GPIO, &GPIO_InitStructure);
GPIO_InitStructure.GPIO_Pin = EU_TX_PIN;
- GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP
GPIO_Init(EU_TX_GPIO, &GPIO_InitStructure);
+ GPIO_InitStructure.GPIO_Pin = EU_485_PIN;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP
+ GPIO_Init(EU_485_GPIO, &GPIO_InitStructure);
+ OUT485_DISABLE;
#ifdef UART_GPIO_REMAP_ENABLE
GPIO_PinRemapConfig(UART_GPIO_REMAP, ENABLE);
#endif
@@ -109,7 +113,7 @@
USART_ClockInit(EXT_UART, &USART_ClockInitStructure);
USART_Init(EXT_UART, &USART_InitStructure);
-
+// USART_ITConfig(EXT_UART, USART_IT_RXNE, ENABLE);//??????,????? ??????????
// Enable the USARTx
USART_Cmd(EXT_UART, ENABLE);
//DMA配置（须放到UART初始化之后）
@@ -138,6 +142,7 @@
while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
{
Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ delay_us(10);
m_EUART_DMA_RXPtr++;
if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
{
@@ -174,6 +179,7 @@
{
if(m_bEUARTTxEn)
{
+ OUT485_DISABLE;
m_bEUARTTxEn = 0;
// temp32 = GPIOC->CRH; //C10悬空输入
// temp32 &= ~(0x00000000F<<8);
@@ -184,14 +190,18 @@
m_bEUARTCheckingSend = 0;
return;
}
+
if(!m_bEUARTTxEn)
{
m_bEUARTTxEn = 1;
+ OUT485_ENABLE;
+ delay_us(10);
// temp32 = GPIOC->CRH; //C10复用推挽输出
// temp32 &= ~(0x00000000F<<8);
// temp32 |= (0x000000009<<8);
// GPIOC->CRH = temp32;// */
}
+
//发送一个字节数据
EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
s_count++;
@@ -287,4 +297,29 @@
m_EUART_TxFrm_Head = EUART_TX_FRM_SIZE-1;
m_EUART_TxFrm_FreeFrmLen++;
}
+void USART_putc(char c)
+{
+ //while(!(USART2->SR & 0x00000040));
+ //USART_SendData(USART2,c);
+ /* e.g. write a character to the USART */
+ USART_SendData(USART1, c);
+
+ /* Loop until the end of transmission */
+ while (USART_GetFlagStatus(USART1, USART_FLAG_TC) == RESET) ;
+}
+void USART_puts(uint8_t *s,uint8_t len)
+{
+ int i;
+ for(i=0; i<len; i++)
+ {
+ USART_putc(s[i]);
+ }
+}
+int fputc(int ch, FILE *f)
+{
+
+ USART_SendData(USART1, (unsigned char) ch);// USART1 ???? USART2 ?
+ while (!(USART1->SR & USART_FLAG_TXE));
+ return (ch);
+}
--
Gitblit v1.9.3