PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update modbus project

Browse Source 
update modbus project
This commit is contained in:
Supowang1989
2020-02-25 10:07:00 +08:00
parent ef82dbfc6d
commit c6f45a4c2e
6 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/mcu_init.c
View File

@@ -31,7 +31,7 @@ void board_init(void)
MX_GPIO_Init(); MX_GPIO_Init();
MX_TIM6_Init(); MX_TIM6_Init();
MX_USART1_UART_Init(); MX_USART1_UART_Init();
MX_USART2_UART_Init(); //MX_USART2_UART_Init();
MX_USART3_UART_Init(); MX_USART3_UART_Init();
} }

14
board/ALIENTEK_EXPLORER_STM32F407ZGT6/BSP/Src/stm32f4xx_it.c
View File

@@ -238,27 +238,21 @@ void USART2_IRQHandler(void)
/* USER CODE BEGIN USART1_IRQn 0 */ /* USER CODE BEGIN USART1_IRQn 0 */
uint8_t tmp; 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(); 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(); prvvUARTTxReadyISR();
} }
/* USER CODE END USART1_IRQn 0 */
HAL_UART_IRQHandler(&huart1);
/* USER CODE BEGIN USART1_IRQn 1 */
/* USER CODE END USART1_IRQn 1 */
} }
/** /**

8
board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvoptx
View File

@@ -120,7 +120,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>JL2CM3</Key> <Key>JL2CM3</Key>
<Name>-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)</Name> <Name>-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)</Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@@ -208,7 +208,7 @@
<Group> <Group>
<GroupName>Application/User</GroupName> <GroupName>Application/User</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -880,7 +880,7 @@
<Group> <Group>
<GroupName>examples</GroupName> <GroupName>examples</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -1052,7 +1052,7 @@
<Group> <Group>
<GroupName>modbus_port</GroupName> <GroupName>modbus_port</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

4
board/ALIENTEK_EXPLORER_STM32F407ZGT6/KEIL/modbus/ALIENTEK_EXPLORER_STM32F407ZGT6.uvprojx
View File

@@ -134,11 +134,11 @@
<RunIndependent>0</RunIndependent> <RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging> <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
<Capability>1</Capability> <Capability>1</Capability>
<DriverSelection>4107</DriverSelection> <DriverSelection>4101</DriverSelection>
</Flash1> </Flash1>
<bUseTDR>1</bUseTDR> <bUseTDR>1</bUseTDR>
<Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2> <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
<Flash3></Flash3> <Flash3>"" ()</Flash3>
<Flash4></Flash4> <Flash4></Flash4>
<pFcarmOut></pFcarmOut> <pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp> <pFcarmGrp></pFcarmGrp>

2
components/connectivity/Modbus/porting/TencentOS_Tiny/portserial.c
View File

@@ -52,7 +52,7 @@ vMBPortSerialEnable( BOOL xRxEnable, BOOL xTxEnable )
BOOL BOOL
xMBPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits, eMBParity eParity ) xMBPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits, eMBParity eParity )
{ {
HAL_UART_DeInit(&huart2); //HAL_UART_DeInit(&huart2);
(void)ucPORT; (void)ucPORT;
huart2.Instance = USART2; huart2.Instance = USART2;
huart2.Init.BaudRate = ulBaudRate; huart2.Init.BaudRate = ulBaudRate;

4
examples/modbus/modbus.c
View File

@@ -9,7 +9,7 @@
#define REG_HOLDING_NREGS ( 32 ) #define REG_HOLDING_NREGS ( 32 )
/* ----------------------- Static variables ---------------------------------*/ /* ----------------------- Static variables ---------------------------------*/
static uint16_t usRegInputStart = REG_INPUT_START; 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 usRegHoldingStart = REG_HOLDING_START;
static USHORT usRegHoldingBuf[REG_HOLDING_NREGS]; static USHORT usRegHoldingBuf[REG_HOLDING_NREGS];
@@ -27,7 +27,7 @@ void task1(void *arg)
while (1) { while (1) {
eMBPoll(); eMBPoll();
printf("###I am task1\r\n"); printf("FreeModbus eMBPoll function running\r\n");
osDelay(2000); osDelay(2000);
} }
} }