From c854d51d514c155325b6ea2d011206696d0fcd1a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 24 十一月 2019 23:08:19 +0800
Subject: [PATCH] 修改串口485bug
---
源码/核心板/Src/OnChipDevices/Usart.c | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 cdb2241..c36282b 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"
@@ -17,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;
@@ -88,9 +87,13 @@
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
@@ -139,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 )
{
@@ -175,6 +179,7 @@
{
if(m_bEUARTTxEn)
{
+ OUT485_DISABLE;
m_bEUARTTxEn = 0;
// temp32 = GPIOC->CRH; //C10悬空输入
// temp32 &= ~(0x00000000F<<8);
@@ -185,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++;
@@ -288,7 +297,24 @@
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)
{
--
Gitblit v1.9.3