~wujiazhi/SZV103_FM33A0xxEV_SiZhu.git

			@@ -8,6 +8,12 @@
			uint8_t up_comm_recv_buff[UP_COMM_RECV_BUFF_LEN_MAX] = {0};
			uint8_t WRC_recv_buff[WRC_RECV_BUFF_LEN_MAX] = {0};

			UART_CTRL_PARA_T uart_ctrl_para_g = {
			.WRC_rxto_flag = RESET,
			.RS485_rxto_flag = RESET,
			.UP_COMM_rxto_flag = RESET,
			};

			u16 USART_RX_STA = 0; //½ÓÊÕ×´Ì¬±ê¼Ç
			//void Usmart_RecvDataProcess(UC_RECV_PARA_T *usmart_recv_para_p)
			//{
			@@ -34,15 +40,15 @@

			//ÖØÐ´Õâ¸öº¯Êý,ÖØ¶¨Ïòprintfº¯Êýµ½´®¿Ú£¬ÒâË¼¾ÍÊÇËµprintfÖ±½ÓÊä³öµ½´®¿Ú£¬ÆäÄ¬ÈÏÊä³öµ½¿ØÖÆÌ¨µÄ
			/fputc/
			int fputc(int c, FILE *f)
			{
			uint8_t ch;
			ch = c;
			UARTx_TXBUF_Write(UART0,ch);//·¢ËÍ´®¿Ú
			while(RESET == UARTx_ISR_TXSE_Chk(UART0))
			; //µÈ´ý·¢ËÍÍê³É
			return ch;
			}
			//int fputc(int c, FILE *f)
			//{
			// uint8_t ch;
			// ch = c;
			// UARTx_TXBUF_Write(UART0,ch);//·¢ËÍ´®¿Ú
			// while(RESET == UARTx_ISR_TXSE_Chk(UART0))
			// ; //µÈ´ý·¢ËÍÍê³É
			// return ch;
			//}

			//ÖØ¶¨Ïòscanfº¯Êýµ½´®¿Ú ÒâË¼¾ÍÊÇËµ½ÓÊÜ´®¿Ú·¢¹ýÀ´µÄÊý¾Ý£¬ÆäÄ¬ÈÏÊÇ½ÓÊÜ¿ØÖÆÌ¨µÄÊý¾Ý
			/fgetc/
			@@ -64,6 +70,25 @@
			}
			}

			void UART1_IRQHandler(void)
			{
			//Ö»ÓÐuart0ºÍuart1ÓÐ½ÓÊÕ³¬Ê±ÖÐ¶Ï
			if(UARTx_ISR_RXTO_Chk(UART1) == SET){
			UARTx_ISR_RXTO_Clr(UART1);
			uart_ctrl_para_g.RS485_rxto_flag = SET;
			uart_ctrl_para_g.WRC_rxto_flag = SET;
			}
			}

			//void UART5_IRQHandler(void)
			//{
			// //Ö»ÓÐuart0ºÍuart1ÓÐ½ÓÊÕ³¬Ê±ÖÐ¶Ï
			// if(UARTx_ISR_RXTO_Chk(UART5) == SET){
			// UARTx_ISR_RXTO_Clr(UART5);
			// uart_ctrl_para_g.UP_COMM_rxto_flag = SET;
			// }
			//}


			void RS485_read_data_uart_Init(uint32_t BaudRate,UART_ParityBitTypeDef ParityBit,UART_StopBitTypeDef StopBit)
			{
			@@ -76,8 +101,11 @@
			AltFunIO(RS485_READ_DATA_RX_PORT, RS485_READ_DATA_RX_PIN, ALTFUN_NORMAL);

			//UART¹¤×÷Ê±ÖÓÔ´Ñ¡Ôñ Ö»ÓÐUART0¡¢1ÐèÒªÑ¡Ôñ ÆäËûUART¶Ë¿ÚÔÝ²»ÐèÒª Ö±½Ó×¢ÊÍ¼´¿É
			if((RS485_READ_DATA_UARTX==UART0)\|\|(RS485_READ_DATA_UARTX==UART1))
			if(RS485_READ_DATA_UARTX==UART0)
			UART_para.ClockSrc = CMU_OPCCR1_UART0CKS_APBCLK; //UART0¹¤×÷Ê±ÖÓÑ¡Ôñ
			else if(RS485_READ_DATA_UARTX==UART1)
			UART_para.ClockSrc = CMU_OPCCR1_UART1CKS_APBCLK; //UART1¹¤×÷Ê±ÖÓÑ¡Ôñ


			UART_para.BaudRate = BaudRate;
			UART_para.ParityBit = ParityBit; //ÆæÅ¼Ð£Ñé
			@@ -93,10 +121,16 @@
			// UARTx_IER_RXBF_IE_Setable(RS485_READ_DATA_UARTX, ENABLE);//½ÓÊÕ»º´æÂúÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ½ÓÊÕÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ
			// UARTx_IER_TXSE_IE_Setable(RS485_READ_DATA_UARTX, ENABLE)£»//·¢ËÍ»º´æ¿ÕÇÒ·¢ËÍÒÆÎ»¼Ä´æÆ÷¿ÕÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ·¢ËÍÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ

			/NVICÖÐ¶ÏÓÅÏÈ¼¶ÒÔ¼°ÊÇ·ñ´ò¿ªÖÐ¶ÏÅäÖÃ/
			NVIC_DisableIRQ(RS485_READ_DATA_UARTX_IRQn);
			// NVIC_SetPriority(RS485_READ_DATA_UARTX_IRQn,2);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			// NVIC_EnableIRQ(RS485_READ_DATA_UARTX_IRQn); //ÖÐ¶Ï·þÎñº¯Êý¿ª
			UARTx_TODR_RXTO_LEN_Set(RS485_READ_DATA_UARTX, 255);//Ö»ÓÐuart0ºÍuart1ÓÐ½ÓÊÕ³¬Ê±ÖÐ¶Ï
			UARTx_ISR_RXTO_Clr(RS485_READ_DATA_UARTX);
			UARTx_IER_RXTO_IE_Setable(RS485_READ_DATA_UARTX, ENABLE);
			// NVIC_EnableIRQ(RS485_READ_DATA_UARTX_IRQn);
			UARTx_CSR_RXTOEN_Setable(RS485_READ_DATA_UARTX, ENABLE);
			/NVICÖÐ¶ÏÓÅÏÈ¼¶ÒÔ¼°ÊÇ·ñ´ò¿ªÖÐ¶ÏÅäÖÃ/
			// NVIC_DisableIRQ(RS485_READ_DATA_UARTX_IRQn);
			NVIC_SetPriority(RS485_READ_DATA_UARTX_IRQn,2);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			NVIC_EnableIRQ(RS485_READ_DATA_UARTX_IRQn); //ÖÐ¶Ï·þÎñº¯Êý¿ª

			UARTx_CSR_RXEN_Setable(RS485_READ_DATA_UARTX, ENABLE); //´ò¿ª½ÓÊÕÊ¹ÄÜ
			UARTx_CSR_TXEN_Setable(RS485_READ_DATA_UARTX, ENABLE); //´ò¿ª·¢ËÍÊ¹ÄÜ
			@@ -165,8 +199,10 @@
			UP_COMM_RE_RECV_EN;

			//UART¹¤×÷Ê±ÖÓÔ´Ñ¡Ôñ Ö»ÓÐUART0¡¢1ÐèÒªÑ¡Ôñ ÆäËûUART¶Ë¿ÚÔÝ²»ÐèÒª Ö±½Ó×¢ÊÍ¼´¿É
			if((UP_COMM_UARTX==UART0)\|\|(UP_COMM_UARTX==UART1))
			if(UP_COMM_UARTX==UART0)
			UART_para.ClockSrc = CMU_OPCCR1_UART0CKS_APBCLK; //UART0¹¤×÷Ê±ÖÓÑ¡Ôñ
			else if(UP_COMM_UARTX==UART1)
			UART_para.ClockSrc = CMU_OPCCR1_UART1CKS_APBCLK; //UART1¹¤×÷Ê±ÖÓÑ¡Ôñ

			UART_para.BaudRate = BaudRate;
			UART_para.ParityBit = ParityBit; //ÆæÅ¼Ð£Ñé
			@@ -181,10 +217,17 @@

			// UARTx_IER_RXBF_IE_Setable(UP_COMM_UARTX, ENABLE);//½ÓÊÕ»º´æÂúÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ½ÓÊÕÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ
			// UARTx_IER_TXSE_IE_Setable(UP_COMM_UARTX, ENABLE)£»//·¢ËÍ»º´æ¿ÕÇÒ·¢ËÍÒÆÎ»¼Ä´æÆ÷¿ÕÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ·¢ËÍÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ
			// NVIC_DisableIRQ(UP_COMM_UARTX_IRQn);
			// UARTx_TODR_RXTO_LEN_Set(UP_COMM_UARTX, 255);//Ö»ÓÐuart0ºÍuart1ÓÐ½ÓÊÕ³¬Ê±ÖÐ¶Ï
			// UARTx_ISR_RXTO_Clr(UP_COMM_UARTX);
			// UARTx_IER_RXTO_IE_Setable(UP_COMM_UARTX, ENABLE);
			//// NVIC_EnableIRQ(UP_COMM_UARTX_IRQn);
			// UARTx_CSR_RXTOEN_Setable(UP_COMM_UARTX, ENABLE);


			/NVICÖÐ¶ÏÓÅÏÈ¼¶ÒÔ¼°ÊÇ·ñ´ò¿ªÖÐ¶ÏÅäÖÃ/
			NVIC_DisableIRQ(UP_COMM_UARTX_IRQn);
			// NVIC_SetPriority(UP_COMM_UARTX_IRQn,2);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			// NVIC_SetPriority(UP_COMM_UARTX_IRQn,4);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			// NVIC_EnableIRQ(UP_COMM_UARTX_IRQn); //ÖÐ¶Ï·þÎñº¯Êý¿ª

			UARTx_CSR_RXEN_Setable(UP_COMM_UARTX, ENABLE); //´ò¿ª½ÓÊÕÊ¹ÄÜ
			@@ -250,8 +293,10 @@
			AltFunIO(WRC_RX_PORT, WRC_RX_PIN, ALTFUN_NORMAL);

			//UART¹¤×÷Ê±ÖÓÔ´Ñ¡Ôñ Ö»ÓÐUART0¡¢1ÐèÒªÑ¡Ôñ ÆäËûUART¶Ë¿ÚÔÝ²»ÐèÒª Ö±½Ó×¢ÊÍ¼´¿É
			if((WRC_UARTX==UART0)\|\|(WRC_UARTX==UART1))
			if(WRC_UARTX==UART0)
			UART_para.ClockSrc = CMU_OPCCR1_UART0CKS_APBCLK; //UART0¹¤×÷Ê±ÖÓÑ¡Ôñ
			else if(WRC_UARTX==UART1)
			UART_para.ClockSrc = CMU_OPCCR1_UART1CKS_APBCLK; //UART1¹¤×÷Ê±ÖÓÑ¡Ôñ

			UART_para.BaudRate = BaudRate;
			UART_para.ParityBit = ParityBit; //ÆæÅ¼Ð£Ñé
			@@ -267,10 +312,17 @@
			// UARTx_IER_RXBF_IE_Setable(WRC_UARTX, ENABLE);//½ÓÊÕ»º´æÂúÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ½ÓÊÕÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ
			// UARTx_IER_TXSE_IE_Setable(WRC_UARTX, ENABLE)£»//·¢ËÍ»º´æ¿ÕÇÒ·¢ËÍÒÆÎ»¼Ä´æÆ÷¿ÕÖÐ¶ÏÊ¹ÄÜ ÐèÒªÊ¹ÓÃ·¢ËÍÖÐ¶Ï´ò¿ª´Ë´¦ÉèÖÃ

			/NVICÖÐ¶ÏÓÅÏÈ¼¶ÒÔ¼°ÊÇ·ñ´ò¿ªÖÐ¶ÏÅäÖÃ/
			NVIC_DisableIRQ(WRC_UARTX_IRQn);
			// NVIC_SetPriority(WRC_UARTX_IRQn,2);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			// NVIC_EnableIRQ(WRC_UARTX_IRQn); //ÖÐ¶Ï·þÎñº¯Êý¿ª
			UARTx_TODR_RXTO_LEN_Set(WRC_UARTX, 255);//Ö»ÓÐuart0ºÍuart1ÓÐ½ÓÊÕ³¬Ê±ÖÐ¶Ï
			UARTx_ISR_RXTO_Clr(WRC_UARTX);
			UARTx_IER_RXTO_IE_Setable(WRC_UARTX, ENABLE);
			// NVIC_EnableIRQ(WRC_UARTX_IRQn);
			UARTx_CSR_RXTOEN_Setable(WRC_UARTX, ENABLE);

			/NVICÖÐ¶ÏÓÅÏÈ¼¶ÒÔ¼°ÊÇ·ñ´ò¿ªÖÐ¶ÏÅäÖÃ/
			// NVIC_DisableIRQ(WRC_UARTX_IRQn);
			NVIC_SetPriority(WRC_UARTX_IRQn,2);//ÖÐ¶ÏÓÅÏÈ¼¶ÅäÖÃ
			NVIC_EnableIRQ(WRC_UARTX_IRQn); //ÖÐ¶Ï·þÎñº¯Êý¿ª

			UARTx_CSR_RXEN_Setable(WRC_UARTX, ENABLE); //´ò¿ª½ÓÊÕÊ¹ÄÜ
			UARTx_CSR_TXEN_Setable(WRC_UARTX, ENABLE); //´ò¿ª·¢ËÍÊ¹ÄÜ
			@@ -279,7 +331,7 @@
			}


			void WRC_RX_DMA_CH0_Init(void)
			void WRC_RX_DMA_CH3_Init(void)
			{
			DMA_InitTypeDef DMA_InitStructure;//DMA³õÊ¼»¯²ÎÊý½á¹¹Ìå

			@@ -289,7 +341,7 @@
			DMA_InitStructure.CHx = WRC_DMA_CHX;//DMAÍ¨µÀºÅÉèÖÃ
			DMA_InitStructure.CHxPRI = DMA_CHxCR_CHxPRI_HIGH;//Í¨µÀÓÅÏÈ¼¶ÉèÖÃ
			DMA_InitStructure.CHxINC = DMA_CHxCR_CHxINC_INCREASE;//Í¨µÀµØÖ·Ôö³¤·½Ïò
			DMA_InitStructure.CHxSSEL = DMA_CHxCR_CH0SSEL_UART2_RX;//ÍâÉèÍ¨µÀÑ¡Ôñ
			DMA_InitStructure.CHxSSEL = DMA_CHxCR_CH3SSEL_UART1_RX;//ÍâÉèÍ¨µÀÑ¡Ôñ
			DMA_InitStructure.CHxDIR = DMA_CHxCR_DIR_TO_RAM;//Êý¾Ý´«Êä·½ÏòÉèÖÃ
			DMA_InitStructure.CHxTSIZE = WRC_RECV_BUFF_LEN_MAX - 1;//Í¨µÀ´«Êä³¤¶È
			DMA_InitStructure.CHxRAMAD = (uint32)WRC_recv_buff;//Ä¿±êµØÖ·
			@@ -311,7 +363,7 @@
			DMA_Init(&DMA_InitStructure);//DMAÅäÖÃ²ÎÊýÐ´Èë
			}

			void WRC_RX_DMA_CH0_reload(void)
			void WRC_RX_DMA_CH3_reload(void)
			{
			DMA_ISR_DMACHFT_Clr(WRC_DMA_CHX);
			DMA_CHxCR_ChxEN_Setable(WRC_DMA_CHX, DISABLE); //Í¨µÀÊ§ÄÜ