dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed out-of-service writability to be consistent with present-value in objects using Write_Enabled flag (#921)

Browse Source
This commit is contained in:
Steve Karg
2025-02-20 09:42:15 -06:00
committed by GitHub
parent 97490dacb1
commit 08f152b4ac
7 changed files with 301 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/bv.c
+40 -3
View File
@@ -288,9 +288,9 @@ void Binary_Value_Out_Of_Service_Set(uint32_t object_instance, bool value)
pObject = Binary_Value_Object(object_instance);
if (pObject) {
if (pObject->Out_Of_Service != value) {
pObject->Out_Of_Service = value;
pObject->Change_Of_Value = true;
}
pObject->Out_Of_Service = value;
}
return;
@@ -525,6 +525,42 @@ static bool Binary_Value_Present_Value_Write(
return status;
}
/**
* For a given object instance-number, sets the out-of-service flag if writable
*
* @param object_instance - object-instance number of the object
* @param value - binary value
* @param error_class - the BACnet error class
* @param error_code - BACnet Error code
*
* @return true if flag is set, false if errors occurred
*/
static bool Binary_Value_Out_Of_Service_Write(
uint32_t object_instance,
bool value,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{
bool status = false;
struct object_data *pObject;
pObject = Binary_Value_Object(object_instance);
if (pObject) {
if (pObject->Write_Enabled) {
Binary_Value_Out_Of_Service_Set(object_instance, value);
status = true;
} else {
*error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
}
} else {
*error_class = ERROR_CLASS_OBJECT;
*error_code = ERROR_CODE_UNKNOWN_OBJECT;
}
return status;
}
/**
* @brief Get the object name
* @param object_instance - object-instance number of the object
@@ -1004,8 +1040,9 @@ bool Binary_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
status = write_property_type_valid(
wp_data, &value, BACNET_APPLICATION_TAG_BOOLEAN);
if (status) {
Binary_Value_Out_Of_Service_Set(
wp_data->object_instance, value.type.Boolean);
status = Binary_Value_Out_Of_Service_Write(
wp_data->object_instance, value.type.Boolean,
&wp_data->error_class, &wp_data->error_code);
}
break;
#if defined(INTRINSIC_REPORTING) && (BINARY_VALUE_INTRINSIC_REPORTING)