diff --git a/app/inc/hardware.h b/app/inc/hardware.h index c677362..a925028 100644 --- a/app/inc/hardware.h +++ b/app/inc/hardware.h @@ -3,16 +3,21 @@ /*接收数组大小*/ #define MODBUS_RX_BUF_SIZE 256 +/*发送数组大小*/ +#define MODBUS_TX_BUF_SIZE 256 + /*modbus通信波特率*/ #define MODBUS_USART_BAUDRATE 19200 extern uint8_t ModbusRxBuf[MODBUS_RX_BUF_SIZE]; extern uint16_t ModbusRxLen; +extern uint8_t ModbusTxBuf[MODBUS_TX_BUF_SIZE]; +extern uint16_t ModbusTxLen; -void MdobusHardwareInit(void); +void ModbusHardwareInit(void); #endif diff --git a/app/src/hardware.c b/app/src/hardware.c index f6d61a2..ada84f8 100644 --- a/app/src/hardware.c +++ b/app/src/hardware.c @@ -1,10 +1,12 @@ #include "stm32f4xx.h" #include "hardware.h" -/*接收数组*/ -uint8_t ModbusRxBuf[MODBUS_RX_BUF_SIZE]; -/*接收数据长度*/ -uint16_t ModbusRxLen = 0; + +uint8_t ModbusRxBuf[MODBUS_RX_BUF_SIZE]; /*接收数组*/ +uint16_t ModbusRxLen = 0; /*接收数据长度*/ +uint8_t ModbusTxBuf[MODBUS_TX_BUF_SIZE]; /*发送数组*/ +uint16_t ModbusTxLen = 0; /*发送数据长度*/ + void ModbusGpioInit(void) { @@ -15,7 +17,7 @@ void ModbusGpioInit(void) /* PA9->USART1_TX,PA10->USART1_RX */ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9 | GPIO_Pin_10; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; - GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; /*推挽输出*/ GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_Init(GPIOA, &GPIO_InitStructure); @@ -58,7 +60,7 @@ void ModbusDmaInit(void) DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)&(USART1->DR); /*设置DMA外设端地址为USART1数据寄存器地址*/ DMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)ModbusRxBuf; /*设置DMA存储器目标地址为接收缓冲区首地址*/ DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralToMemory; /*传输方向为外设->内存*/ - DMA_InitStructure.DMA_BufferSize = MODBUS_RX_BUF_SIZE; /*传输最大字节数*/ + DMA_InitStructure.DMA_BufferSize = MODBUS_RX_BUF_SIZE; /*传输字节数*/ DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; /*禁止外设地址递增*/ DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; /*使能内存地址自增*/ DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; /*设置外设数据宽度为1字节(8位)*/ @@ -72,16 +74,27 @@ void ModbusDmaInit(void) DMA_Init(DMA2_Stream2, &DMA_InitStructure); /* DMA2_Stream7_Channel_4 用于 USART1_TX */ - /*USART1_TX的其他配置在USART中断中配置*/ - DMA_DeInit(DMA2_Stream7); - DMA_InitStructure.DMA_Channel = DMA_Channel_4; + DMA_DeInit(DMA2_Stream7); /*恢复默认状态*/ + DMA_InitStructure.DMA_Channel = DMA_Channel_4; /*配置通道4*/ DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)&(USART1->DR); /*设置DMA外设端地址为USART1数据寄存器地址*/ + DMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)ModbusRxBuf; /*设置DMA存储器目标地址*/ DMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral; /*传输方向为内存->外设*/ + DMA_InitStructure.DMA_BufferSize = MODBUS_RX_BUF_SIZE; /*设置传输字节数*/ + DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; /*禁止外设地址递增*/ + DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; /*使能内存地址自增*/ + DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; /*设置外设数据宽度为1字节(8位)*/ + DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte; /*设置内存数据宽度为1字节(8位)*/ + DMA_InitStructure.DMA_Mode = DMA_Mode_Normal; /*modbus帧长度不固定,无法使用循环模式,配置为普通模式,每次传输完软件重新使能*/ + DMA_InitStructure.DMA_Priority = DMA_Priority_High; /*高优先级*/ + DMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Disable; /*不使用FIFO模式*/ + DMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_1QuarterFull; /*禁止FIFO后无用*/ + DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single; /*内存侧单次传输,每次搬运一个数据单位*/ + DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_Single; /*外设侧单次传输,每次搬运一个数据单位*/ DMA_Init(DMA2_Stream7, &DMA_InitStructure); /* 使能USART的DMA请求 */ - USART_DMACmd(USART1, USART_DMAReq_Rx | USART_DMAReq_Tx, ENABLE); /*使能USART1的RX、TX的DMA请求*/ - DMA_Cmd(DMA2_Stream2, ENABLE); + USART_DMACmd(USART1, USART_DMAReq_Rx | USART_DMAReq_Tx, ENABLE); /*使能USART1的RX、Tx的DMA请求*/ + DMA_Cmd(DMA2_Stream2, ENABLE); /*使能DMA的接收通道,发送通道暂不使能*/ } void ModbusNvicInit(void) @@ -96,7 +109,7 @@ void ModbusNvicInit(void) } -void MdobusHardwareInit(void) +void ModbusHardwareInit(void) { /*NVIC分组配置*/ NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4); /*4位抢占优先级,0位子优先级*/