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

freemodbus: fix invalid error handling for duplicate param key (backport v4.2)

See merge request espressif/esp-idf!14787

components/freemodbus/common/include/esp_modbus_master.h

@@ -212,7 +212,7 @@ esp_err_t mbc_master_get_cid_info(uint16_t cid, const mb_parameter_descriptor_t*
  * @return
  *     - esp_err_t ESP_OK - request was successful and value buffer contains
  *                          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_STATE - invalid state during data processing or allocation failure
  *     - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave
@@ -233,7 +233,7 @@ esp_err_t mbc_master_get_parameter(uint16_t cid, char* name, uint8_t* value, uin
  *
  * @return
  *     - 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_STATE - invalid state during data processing or allocation failure
  *     - esp_err_t ESP_ERR_TIMEOUT - operation timed out and no response from slave

components/freemodbus/serial_master/modbus_controller/mbc_serial_master.c

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