From c6f45a4c2eaf92dfcd65da44f8c44e77932957d6 Mon Sep 17 00:00:00 2001
From: Supowang1989 <54426333+Supowang1989@users.noreply.github.com>
Date: Tue, 25 Feb 2020 10:07:00 +0800
Subject: [PATCH] update modbus project
update modbus project
---
.../BSP/Src/mcu_init.c | 2 +-
.../BSP/Src/stm32f4xx_it.c | 14 ++++----------
.../modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx | 8 ++++----
.../modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx | 4 ++--
.../Modbus/porting/TencentOS_Tiny/portserial.c | 2 +-
examples/modbus/modbus.c | 4 ++--
6 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/mcu_init.c b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/mcu_init.c
index 66719508..bf2a1663 100644
--- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/mcu_init.c
+++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/mcu_init.c
@@ -31,7 +31,7 @@ void board_init(void)
MX_GPIO_Init();
MX_TIM6_Init();
MX_USART1_UART_Init();
- MX_USART2_UART_Init();
+ //MX_USART2_UART_Init();
MX_USART3_UART_Init();
}
diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c
index b89e74c0..b003ac77 100644
--- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c
+++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c
@@ -238,27 +238,21 @@ void USART2_IRQHandler(void)
/* USER CODE BEGIN USART1_IRQn 0 */
uint8_t tmp;
- if(__HAL_UART_GET_FLAG(&huart1,UART_FLAG_PE))//???????
+ if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_PE))//???????
{
- HAL_UART_Receive(&huart1,&tmp,1,1);
+ HAL_UART_Receive(&huart2,&tmp,1,1);
}
- else if(__HAL_UART_GET_FLAG(&huart1,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart1,UART_IT_RXNE))
+ else if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_RXNE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_RXNE))
{
prvvUARTRxISR();
}
- if(__HAL_UART_GET_FLAG(&huart1,UART_FLAG_TXE)&&__HAL_UART_GET_IT_SOURCE(&huart1,UART_IT_TXE))
+ if(__HAL_UART_GET_FLAG(&huart2,UART_FLAG_TXE)&&__HAL_UART_GET_IT_SOURCE(&huart2,UART_IT_TXE))
{
prvvUARTTxReadyISR();
}
-
- /* USER CODE END USART1_IRQn 0 */
- HAL_UART_IRQHandler(&huart1);
- /* USER CODE BEGIN USART1_IRQn 1 */
-
- /* USER CODE END USART1_IRQn 1 */
}
/**
diff --git a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx
index e5f1df90..77920877 100644
--- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx
+++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx
@@ -120,7 +120,7 @@
0
JL2CM3
- -U29999997 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06413041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)
+ -U29999997 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06413041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)
0
@@ -208,7 +208,7 @@
Application/User
- 0
+ 1
0
0
0
@@ -880,7 +880,7 @@
examples
- 0
+ 1
0
0
0
@@ -1052,7 +1052,7 @@
modbus_port
- 0
+ 1
0
0
0
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 08ca0d05..a325a930 100644
--- a/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx
+++ b/board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx
@@ -134,11 +134,11 @@
0
1
1
- 4107
+ 4101
1
STLink\ST-LINKIII-KEIL_SWO.dll
-
+ "" ()
diff --git a/components/connectivity/Modbus/porting/TencentOS_Tiny/portserial.c b/components/connectivity/Modbus/porting/TencentOS_Tiny/portserial.c
index 46807ac7..df272213 100644
--- a/components/connectivity/Modbus/porting/TencentOS_Tiny/portserial.c
+++ b/components/connectivity/Modbus/porting/TencentOS_Tiny/portserial.c
@@ -52,7 +52,7 @@ vMBPortSerialEnable( BOOL xRxEnable, BOOL xTxEnable )
BOOL
xMBPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits, eMBParity eParity )
{
- HAL_UART_DeInit(&huart2);
+ //HAL_UART_DeInit(&huart2);
(void)ucPORT;
huart2.Instance = USART2;
huart2.Init.BaudRate = ulBaudRate;
diff --git a/examples/modbus/modbus.c b/examples/modbus/modbus.c
index 88185d8d..4d977d37 100644
--- a/examples/modbus/modbus.c
+++ b/examples/modbus/modbus.c
@@ -9,7 +9,7 @@
#define REG_HOLDING_NREGS ( 32 )
/* ----------------------- Static variables ---------------------------------*/
static uint16_t usRegInputStart = REG_INPUT_START;
-static uint16_t usRegInputBuf[REG_INPUT_NREGS]={0x01,0x02,0x03,0x04};
+static uint16_t usRegInputBuf[REG_INPUT_NREGS]={0x05,0x06,0x07,0x08};
static USHORT usRegHoldingStart = REG_HOLDING_START;
static USHORT usRegHoldingBuf[REG_HOLDING_NREGS];
@@ -27,7 +27,7 @@ void task1(void *arg)
while (1) {
eMBPoll();
- printf("###I am task1\r\n");
+ printf("FreeModbus eMBPoll function running\r\n");
osDelay(2000);
}
}