espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/freemodbus_fix_parity_propagation_issue_v42' into 'release/v4.2'

Browse Source 
Bugfix/freemodbus fix parity propagation issue (Backport v4.2)

See merge request espressif/esp-idf!12389
This commit is contained in:
Michael (XIAO Xufeng)
2021-02-22 05:23:02 +00:00
parent af1ebd7e01 be68c0e8d8
commit e511dd58b3
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/freemodbus/port/port.h
View File

@ -17,7 +17,6 @@
#define PORT_COMMON_H_ #define PORT_COMMON_H_
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/xtensa_api.h"
#include "esp_log.h" // for ESP_LOGE macro #include "esp_log.h" // for ESP_LOGE macro
#include "sdkconfig.h" #include "sdkconfig.h"
@ -77,15 +76,17 @@ typedef long LONG;
void vMBPortEnterCritical(void); void vMBPortEnterCritical(void);
void vMBPortExitCritical(void); void vMBPortExitCritical(void);
#define ENTER_CRITICAL_SECTION( ) { ESP_LOGD(MB_PORT_TAG,"%s: Port enter critical.", __func__); \ #define ENTER_CRITICAL_SECTION( ) { ESP_EARLY_LOGD(MB_PORT_TAG,"%s: Port enter critical.", __func__); \
vMBPortEnterCritical(); } vMBPortEnterCritical(); }
#define EXIT_CRITICAL_SECTION( ) { vMBPortExitCritical(); \ #define EXIT_CRITICAL_SECTION( ) { vMBPortExitCritical(); \
ESP_LOGD(MB_PORT_TAG,"%s: Port exit critical", __func__); } ESP_EARLY_LOGD(MB_PORT_TAG,"%s: Port exit critical", __func__); }
#define MB_PORT_CHECK_EVENT( event, mask ) ( event & mask ) #define MB_PORT_CHECK_EVENT( event, mask ) ( event & mask )
#define MB_PORT_CLEAR_EVENT( event, mask ) do { event &= ~mask; } while(0) #define MB_PORT_CLEAR_EVENT( event, mask ) do { event &= ~mask; } while(0)
#define MB_PORT_PARITY_GET(parity) ((parity != UART_PARITY_DISABLE) ? \
((parity == UART_PARITY_ODD) ? MB_PAR_ODD : MB_PAR_EVEN) : MB_PAR_NONE)
#ifdef __cplusplus #ifdef __cplusplus
PR_END_EXTERN_C PR_END_EXTERN_C
#endif /* __cplusplus */ #endif /* __cplusplus */

4
components/freemodbus/port/portserial.c
View File

@ -182,7 +182,6 @@ BOOL xMBPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate,
UCHAR ucDataBits, eMBParity eParity) UCHAR ucDataBits, eMBParity eParity)
{ {
esp_err_t xErr = ESP_OK; esp_err_t xErr = ESP_OK;
MB_PORT_CHECK((eParity <= MB_PAR_EVEN), FALSE, "mb serial set parity failure.");
// Set communication port number // Set communication port number
ucUartNumber = ucPORT; ucUartNumber = ucPORT;
// Configure serial communication parameters // Configure serial communication parameters
@ -198,6 +197,9 @@ BOOL xMBPortSerialInit(UCHAR ucPORT, ULONG ulBaudRate,
case MB_PAR_EVEN: case MB_PAR_EVEN:
ucParity = UART_PARITY_EVEN; ucParity = UART_PARITY_EVEN;
break; break;
default:
ESP_LOGE(TAG, "Incorrect parity option: %d", eParity);
return FALSE;
} }
switch(ucDataBits){ switch(ucDataBits){
case 5: case 5:

4
components/freemodbus/port/portserial_m.c
View File

@ -177,7 +177,6 @@ static void vUartTask(void* pvParameters)
BOOL xMBMasterPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits, eMBParity eParity ) BOOL xMBMasterPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits, eMBParity eParity )
{ {
esp_err_t xErr = ESP_OK; esp_err_t xErr = ESP_OK;
MB_PORT_CHECK((eParity <= MB_PAR_EVEN), FALSE, "mb serial set parity failure.");
// Set communication port number // Set communication port number
ucUartNumber = ucPORT; ucUartNumber = ucPORT;
// Configure serial communication parameters // Configure serial communication parameters
@ -193,6 +192,9 @@ BOOL xMBMasterPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
case MB_PAR_EVEN: case MB_PAR_EVEN:
ucParity = UART_PARITY_EVEN; ucParity = UART_PARITY_EVEN;
break; break;
default:
ESP_LOGE(TAG, "Incorrect parity option: %d", eParity);
return FALSE;
} }
switch(ucDataBits){ switch(ucDataBits){
case 5: case 5:

6
components/freemodbus/serial_master/modbus_controller/mbc_serial_master.c
View File

@ -83,7 +83,7 @@ static esp_err_t mbc_serial_master_setup(void* comm_info)
(uint32_t)comm_info_ptr->mode); (uint32_t)comm_info_ptr->mode);
MB_MASTER_CHECK((comm_info_ptr->port < UART_NUM_MAX), ESP_ERR_INVALID_ARG, MB_MASTER_CHECK((comm_info_ptr->port < UART_NUM_MAX), ESP_ERR_INVALID_ARG,
"mb wrong port to set = (0x%x).", (uint32_t)comm_info_ptr->port); "mb wrong port to set = (0x%x).", (uint32_t)comm_info_ptr->port);
MB_MASTER_CHECK((comm_info_ptr->parity <= UART_PARITY_EVEN), ESP_ERR_INVALID_ARG, MB_MASTER_CHECK((comm_info_ptr->parity <= UART_PARITY_ODD), ESP_ERR_INVALID_ARG,
"mb wrong parity option = (0x%x).", (uint32_t)comm_info_ptr->parity); "mb wrong parity option = (0x%x).", (uint32_t)comm_info_ptr->parity);
// Save the communication options // Save the communication options
mbm_opts->mbm_comm = *(mb_communication_info_t*)comm_info_ptr; mbm_opts->mbm_comm = *(mb_communication_info_t*)comm_info_ptr;
@ -102,7 +102,9 @@ static esp_err_t mbc_serial_master_start(void)
// Initialize Modbus stack using mbcontroller parameters // Initialize Modbus stack using mbcontroller parameters
status = eMBMasterInit((eMBMode)comm_info->mode, (UCHAR)comm_info->port, status = eMBMasterInit((eMBMode)comm_info->mode, (UCHAR)comm_info->port,
(ULONG)comm_info->baudrate, (eMBParity)comm_info->parity); (ULONG)comm_info->baudrate,
MB_PORT_PARITY_GET(comm_info->parity));
MB_MASTER_CHECK((status == MB_ENOERR), ESP_ERR_INVALID_STATE, MB_MASTER_CHECK((status == MB_ENOERR), ESP_ERR_INVALID_STATE,
"mb stack initialization failure, eMBInit() returns (0x%x).", status); "mb stack initialization failure, eMBInit() returns (0x%x).", status);
status = eMBMasterEnable(); status = eMBMasterEnable();

15
components/freemodbus/serial_slave/modbus_controller/mbc_serial_slave.c
View File

@ -75,7 +75,7 @@ static esp_err_t mbc_serial_slave_setup(void* comm_info)
(uint32_t)comm_settings->slave_addr); (uint32_t)comm_settings->slave_addr);
MB_SLAVE_CHECK((comm_settings->port < UART_NUM_MAX), ESP_ERR_INVALID_ARG, MB_SLAVE_CHECK((comm_settings->port < UART_NUM_MAX), ESP_ERR_INVALID_ARG,
"mb wrong port to set = (0x%x).", (uint32_t)comm_settings->port); "mb wrong port to set = (0x%x).", (uint32_t)comm_settings->port);
MB_SLAVE_CHECK((comm_settings->parity <= UART_PARITY_EVEN), ESP_ERR_INVALID_ARG, MB_SLAVE_CHECK((comm_settings->parity <= UART_PARITY_ODD), ESP_ERR_INVALID_ARG,
"mb wrong parity option = (0x%x).", (uint32_t)comm_settings->parity); "mb wrong parity option = (0x%x).", (uint32_t)comm_settings->parity);
// Set communication options of the controller // Set communication options of the controller
@ -91,12 +91,15 @@ static esp_err_t mbc_serial_slave_start(void)
"Slave interface is not correctly initialized."); "Slave interface is not correctly initialized.");
mb_slave_options_t* mbs_opts = &mbs_interface_ptr->opts; mb_slave_options_t* mbs_opts = &mbs_interface_ptr->opts;
eMBErrorCode status = MB_EIO; eMBErrorCode status = MB_EIO;
const mb_communication_info_t* comm_info = (mb_communication_info_t*)&mbs_opts->mbs_comm;
// Initialize Modbus stack using mbcontroller parameters // Initialize Modbus stack using mbcontroller parameters
status = eMBInit((eMBMode)mbs_opts->mbs_comm.mode, status = eMBInit((eMBMode)comm_info->mode,
(UCHAR)mbs_opts->mbs_comm.slave_addr, (UCHAR)comm_info->slave_addr,
(UCHAR)mbs_opts->mbs_comm.port, (UCHAR)comm_info->port,
(ULONG)mbs_opts->mbs_comm.baudrate, (ULONG)comm_info->baudrate,
(eMBParity)mbs_opts->mbs_comm.parity); MB_PORT_PARITY_GET(comm_info->parity));
MB_SLAVE_CHECK((status == MB_ENOERR), ESP_ERR_INVALID_STATE, MB_SLAVE_CHECK((status == MB_ENOERR), ESP_ERR_INVALID_STATE,
"mb stack initialization failure, eMBInit() returns (0x%x).", status); "mb stack initialization failure, eMBInit() returns (0x%x).", status);
status = eMBEnable(); status = eMBEnable();