From 12c64dd79ad5069e9e6ae50d7ee688edafe84f0f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 14 十一月 2019 17:41:29 +0800
Subject: [PATCH] 控制完成,纹波过大

---
 源码/核心板/Src/OnChipDevices/Usart.c |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 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..66396fa 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;
@@ -87,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
@@ -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,6 +190,7 @@
 		m_bEUARTCheckingSend = 0;
 		return;
 	}
+	 OUT485_ENABLE;
 	if(!m_bEUARTTxEn)
 	{
 		m_bEUARTTxEn = 1;
@@ -192,6 +199,7 @@
 //		temp32 |= (0x000000009<<8);
 //		GPIOC->CRH = temp32;// */
 	}
+	
 	//发送一个字节数据
 	EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];		
 	s_count++;
@@ -287,4 +295,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