diff --git a/src/adapter/driver/driver.c b/src/adapter/driver/driver.c index 7fb83562..f7126bed 100644 --- a/src/adapter/driver/driver.c +++ b/src/adapter/driver/driver.c @@ -1229,21 +1229,13 @@ int is_value_in_range(neu_type_e tag_type, int64_t value, double value_d, return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; } case NEU_TYPE_FLOAT: - if (write_type != NEU_TYPE_DOUBLE) { - return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; - } else if (result < (int64_t) -FLT_MAX || - result > (int64_t) FLT_MAX) { + if (result < (int64_t) -FLT_MAX || result > (int64_t) FLT_MAX) { return NEU_ERR_PLUGIN_TAG_VALUE_OUT_OF_RANGE; } else { return NEU_ERR_SUCCESS; } case NEU_TYPE_DOUBLE: - if (write_type != NEU_TYPE_DOUBLE) { - return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; - } else { - return NEU_ERR_SUCCESS; - } - return check_value(write_type, result, INT16_MIN, INT16_MAX); + return NEU_ERR_SUCCESS; case NEU_TYPE_STRING: case NEU_TYPE_BOOL: case NEU_TYPE_BIT: @@ -1287,20 +1279,13 @@ int is_value_in_range(neu_type_e tag_type, int64_t value, double value_d, return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; } case NEU_TYPE_FLOAT: - if (write_type != NEU_TYPE_DOUBLE) { - return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; - } else if (value < (int64_t) -FLT_MAX || - value > (int64_t) FLT_MAX) { + if (value < (int64_t) -FLT_MAX || value > (int64_t) FLT_MAX) { return NEU_ERR_PLUGIN_TAG_VALUE_OUT_OF_RANGE; } else { return NEU_ERR_SUCCESS; } case NEU_TYPE_DOUBLE: - if (write_type != NEU_TYPE_DOUBLE) { - return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; - } else { - return NEU_ERR_SUCCESS; - } + return NEU_ERR_SUCCESS; case NEU_TYPE_STRING: if (write_type != NEU_TYPE_STRING) { return NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH; diff --git a/tests/ft/driver/test_modbus.py b/tests/ft/driver/test_modbus.py index 4afe1836..2ef63cfc 100644 --- a/tests/ft/driver/test_modbus.py +++ b/tests/ft/driver/test_modbus.py @@ -582,12 +582,6 @@ class TestModbus: assert error.NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH == response.json()[ 'error'] - response = api.write_tag( - node=param[0], group='group', tag=hold_float[0]['name'], value=1) - assert 400 == response.status_code - assert error.NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH == response.json()[ - 'error'] - response = api.write_tags(node=param[0], group='group', tag_values=[ {"tag": hold_int16[0]['name'], "value": 32768}, {"tag": hold_uint16[0]['name'], "value": 2},