From 0781da980b9359a5542bacba06b6a60b0508650c Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 02 四月 2020 22:08:23 +0800 Subject: [PATCH] 增加标签随机位置模式 --- 源码/核心板/Src/OnChipDevices/Usart.c | 13 +++++++++++-- 1 files changed, 11 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 41efcbd..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++; -- Gitblit v1.9.3