From 4134ad4f557162e1391597a8f24639ac48f0fc48 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sun, 7 Mar 2021 21:23:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3modbus=20demo=E4=B8=8Ehel?= =?UTF-8?q?lo=20world=E5=85=B1=E7=94=A8stm32f4xx=5Fit.c=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx index a325a930..b6d05544 100644 --- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx +++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx @@ -336,7 +336,7 @@ 0 - USE_HAL_DRIVER,STM32F407xx,USE_HAL_DRIVER,STM32F407xx + USE_HAL_DRIVER,STM32F407xx,USE_HAL_DRIVER,STM32F407xx,USE_MODBUS ..\..\BSP\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F4xx_HAL_Driver\Inc;..\..\..\..\platform\vendor_bsp\st\STM32F4xx_HAL_Driver\Inc\Legacy;..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32F4xx\Include;..\..\..\..\platform\vendor_bsp\st\CMSIS\Include;..\..\..\..\arch\arm\arm-v7m\common\include;..\..\..\..\arch\arm\arm-v7m\cortex-m4\armcc;..\..\..\..\kernel\core\include;..\..\..\..\kernel\pm\include;..\..\..\..\osal\cmsis_os;..\..\TOS_CONFIG;..\..\..\..\components\connectivity\Modbus\3rdparty\freemodbus-v1.6\modbus\ascii;..\..\..\..\components\connectivity\Modbus\3rdparty\freemodbus-v1.6\modbus\functions;..\..\..\..\components\connectivity\Modbus\3rdparty\freemodbus-v1.6\modbus\include;..\..\..\..\components\connectivity\Modbus\3rdparty\freemodbus-v1.6\modbus\rtu;..\..\..\..\components\connectivity\Modbus\3rdparty\freemodbus-v1.6\modbus\tcp;..\..\..\..\components\connectivity\Modbus\porting\TencentOS_Tiny From f8a86559938ea294732e036cf6485ffa486e797d Mon Sep 17 00:00:00 2001 From: David Lin Date: Sun, 7 Mar 2021 21:27:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3modbus=20demo=E4=B8=8Ehel?= =?UTF-8?q?lo=20world=E5=85=B1=E7=94=A8stm32f4xx=5Fit.c=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c index b003ac77..3f0d31bc 100644 --- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c +++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c @@ -242,7 +242,7 @@ void USART2_IRQHandler(void) { HAL_UART_Receive(&huart2,&tmp,1,1); } - + #ifdef USE_MODBUS else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE)) { prvvUARTRxISR(); @@ -253,6 +253,7 @@ void USART2_IRQHandler(void) prvvUARTTxReadyISR(); } + #endif /* USE_MODBUS */ } /** @@ -275,7 +276,9 @@ void USART3_IRQHandler(void) void TIM6_DAC_IRQHandler(void) { /* USER CODE BEGIN TIM6_DAC_IRQn 0 */ - prvvTIMERExpiredISR(); + #ifdef USE_MODBUS + prvvTIMERExpiredISR(); + #endif/* USE_MODBUS */ /* USER CODE END TIM6_DAC_IRQn 0 */ HAL_TIM_IRQHandler(&htim6); /* USER CODE BEGIN TIM6_DAC_IRQn 1 */ From 78a21eebad171e43b4c2643d2b80e3a6c3495419 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sun, 7 Mar 2021 21:37:17 +0800 Subject: [PATCH 3/4] Update stm32f4xx_it.c --- .../ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c index 3f0d31bc..0d585b8d 100644 --- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c +++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c @@ -236,13 +236,13 @@ void USART2_IRQHandler(void) /* USER CODE END USART2_IRQn 1 */ - /* USER CODE BEGIN USART1_IRQn 0 */ + /* USER CODE BEGIN USART1_IRQn 0 */ uint8_t tmp; if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_PE))//??????? { HAL_UART_Receive(&huart2,&tmp,1,1); } - #ifdef USE_MODBUS + #if defined USE_MODBUS else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE)) { prvvUARTRxISR(); @@ -276,7 +276,7 @@ void USART3_IRQHandler(void) void TIM6_DAC_IRQHandler(void) { /* USER CODE BEGIN TIM6_DAC_IRQn 0 */ - #ifdef USE_MODBUS + #if defined USE_MODBUS prvvTIMERExpiredISR(); #endif/* USE_MODBUS */ /* USER CODE END TIM6_DAC_IRQn 0 */ From d9661b5326963bd3063894b905004c56838f47f1 Mon Sep 17 00:00:00 2001 From: David Lin Date: Sun, 7 Mar 2021 21:42:23 +0800 Subject: [PATCH 4/4] Update stm32f4xx_it.c --- board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c index 0d585b8d..9a6afb45 100644 --- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c +++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c @@ -242,7 +242,7 @@ void USART2_IRQHandler(void) { HAL_UART_Receive(&huart2,&tmp,1,1); } - #if defined USE_MODBUS + #if defined (USE_MODBUS) else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE)) { prvvUARTRxISR(); @@ -276,7 +276,7 @@ void USART3_IRQHandler(void) void TIM6_DAC_IRQHandler(void) { /* USER CODE BEGIN TIM6_DAC_IRQn 0 */ - #if defined USE_MODBUS + #if defined (USE_MODBUS) prvvTIMERExpiredISR(); #endif/* USE_MODBUS */ /* USER CODE END TIM6_DAC_IRQn 0 */