blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/modbus_fix_invalid_error_handling_for_duplicate_param_key_v41' into 'release/v4.1'

Browse Source 
freemodbus: fix invalid error handling for duplicate param key (backport v4.1)

See merge request espressif/esp-idf!14786
This commit is contained in:
Alex Lisitsyn 2021-09-09 05:56:33 +00:00
commit 05d647a04a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/freemodbus/common/include/esp_modbus_master.h
View File

@ -208,7 +208,7 @@ esp_err_t mbc_master_get_cid_info(uint16_t cid, const mb_parameter_descriptor_t*
* @return * @return
* - esp_err_t ESP_OK - request was successful and value buffer contains * - esp_err_t ESP_OK - request was successful and value buffer contains
* representation of actual parameter data from slave * representation of actual parameter data from slave
* - esp_err_t ESP_ERR_INVALID_ARG - invalid argument of function * - esp_err_t ESP_ERR_INVALID_ARG - invalid argument of function or parameter descriptor
* - esp_err_t ESP_ERR_INVALID_RESPONSE - an invalid response from slave * - esp_err_t ESP_ERR_INVALID_RESPONSE - an invalid response from slave
* - esp_err_t ESP_ERR_INVALID_STATE - invalid state during data processing or allocation failure * - esp_err_t ESP_ERR_INVALID_STATE - invalid state during data processing or allocation failure
* - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave * - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave
@ -229,7 +229,7 @@ esp_err_t mbc_master_get_parameter(uint16_t cid, char* name, uint8_t* value, uin
* *
* @return * @return
* - esp_err_t ESP_OK - request was successful and value was saved in the slave device registers * - esp_err_t ESP_OK - request was successful and value was saved in the slave device registers
* - esp_err_t ESP_ERR_INVALID_ARG - invalid argument of function * - esp_err_t ESP_ERR_INVALID_ARG - invalid argument of function or parameter descriptor
* - esp_err_t ESP_ERR_INVALID_RESPONSE - an invalid response from slave during processing of parameter * - esp_err_t ESP_ERR_INVALID_RESPONSE - an invalid response from slave during processing of parameter
* - esp_err_t ESP_ERR_INVALID_STATE - invalid state during data processing or allocation failure * - esp_err_t ESP_ERR_INVALID_STATE - invalid state during data processing or allocation failure
* - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave * - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave

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

@ -451,8 +451,9 @@ static esp_err_t mbc_serial_master_get_parameter(uint16_t cid, char* name,
// Set the type of parameter found in the table // Set the type of parameter found in the table
*type = reg_info.param_type; *type = reg_info.param_type;
} else { } else {
ESP_LOGD(MB_MASTER_TAG, "%s: The cid(%u) not found in the data dictionary.", ESP_LOGE(MB_MASTER_TAG, "%s: The cid(%u) not found in the data dictionary.",
__FUNCTION__, reg_info.cid); __FUNCTION__, reg_info.cid);
error = ESP_ERR_INVALID_ARG;
} }
return error; return error;
} }
@ -493,6 +494,7 @@ static esp_err_t mbc_serial_master_set_parameter(uint16_t cid, char* name,
} else { } else {
ESP_LOGE(MB_MASTER_TAG, "%s: The requested cid(%u) not found in the data dictionary.", ESP_LOGE(MB_MASTER_TAG, "%s: The requested cid(%u) not found in the data dictionary.",
__FUNCTION__, reg_info.cid); __FUNCTION__, reg_info.cid);
error = ESP_ERR_INVALID_ARG;
} }
return error; return error;
} }