Bugfix/using-uint16-for-units-property-storage (#1107)

* Fixed units property declaration in basic Analog Input header file to be uint16_t instead of uint8_t.

* Added range checking of units property in example objects WriteProperty handler.
This commit is contained in:
Steve Karg
2025-09-24 09:35:10 -05:00
committed by GitHub
parent b357bca5dd
commit 7dfc840dfc
8 changed files with 91 additions and 23 deletions
+8 -2
View File
@@ -559,8 +559,14 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
break;
case PROP_UNITS:
if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
status = Analog_Value_Units_Set(
wp_data->object_instance, value.type.Enumerated);
if (value.type.Enumerated <= UINT16_MAX) {
Analog_Value_Units_Set(
wp_data->object_instance, value.type.Enumerated);
} else {
status = false;
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
}
} else {
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_INVALID_DATA_TYPE;
+8 -2
View File
@@ -279,8 +279,14 @@ bool Analog_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
status = write_property_type_valid(wp_data, &value,
BACNET_APPLICATION_TAG_ENUMERATED);
if (status) {
Analog_Input_Out_Of_Service_Set(
wp_data->object_instance, value.type.Enumerated);
if (value.type.Enumerated <= UINT16_MAX) {
Analog_Input_Units_Set(
wp_data->object_instance, value.type.Enumerated);
} else {
status = false;
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
}
}
break;
case PROP_OBJECT_IDENTIFIER: