diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index 2beac064..837a4e2b 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -1062,9 +1062,8 @@ int main(
(invoke_id ==
Read_Property_Multiple_Data.service_data.invoke_id)) {
Read_Property_Multiple_Data.new_data = false;
- PrintReadPropertyData
- (Read_Property_Multiple_Data.rpm_data->
- listOfProperties);
+ PrintReadPropertyData(Read_Property_Multiple_Data.
+ rpm_data->listOfProperties);
if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0;
} else {
@@ -1188,4 +1187,4 @@ int main(
return 0;
}
- /*@} *//* End group BACEPICS */
+ /*@} *//* End group BACEPICS */
diff --git a/bacnet-stack/demo/handler/h_cov.c b/bacnet-stack/demo/handler/h_cov.c
index b96878b4..4ae4243d 100644
--- a/bacnet-stack/demo/handler/h_cov.c
+++ b/bacnet-stack/demo/handler/h_cov.c
@@ -345,9 +345,8 @@ static bool cov_send_request(
value_list[1].next = NULL;
switch (cov_subscription->monitoredObjectIdentifier.type) {
case OBJECT_BINARY_INPUT:
- Binary_Input_Encode_Value_List
- (cov_subscription->monitoredObjectIdentifier.instance,
- &value_list[0]);
+ Binary_Input_Encode_Value_List(cov_subscription->
+ monitoredObjectIdentifier.instance, &value_list[0]);
break;
default:
goto COV_FAILED;
@@ -464,8 +463,8 @@ static bool cov_subscribe(
switch (cov_data->monitoredObjectIdentifier.type) {
case OBJECT_BINARY_INPUT:
- if (Binary_Input_Valid_Instance
- (cov_data->monitoredObjectIdentifier.instance)) {
+ if (Binary_Input_Valid_Instance(cov_data->
+ monitoredObjectIdentifier.instance)) {
status =
cov_list_subscribe(src, cov_data, error_class, error_code);
} else {
diff --git a/bacnet-stack/demo/handler/h_rpm_a.c b/bacnet-stack/demo/handler/h_rpm_a.c
index cdbef20d..75b72bf1 100644
--- a/bacnet-stack/demo/handler/h_rpm_a.c
+++ b/bacnet-stack/demo/handler/h_rpm_a.c
@@ -218,8 +218,8 @@ void rpm_ack_print_data(
#if PRINT_ENABLED
if (listOfProperties->propertyIdentifier < 512) {
fprintf(stdout, " %s: ",
- bactext_property_name(listOfProperties->
- propertyIdentifier));
+ bactext_property_name
+ (listOfProperties->propertyIdentifier));
} else {
fprintf(stdout, " proprietary %u: ",
(unsigned) listOfProperties->propertyIdentifier);
@@ -260,10 +260,10 @@ void rpm_ack_print_data(
#if PRINT_ENABLED
/* AccessError */
fprintf(stdout, "BACnet Error: %s: %s\r\n",
- bactext_error_class_name((int) listOfProperties->
- error.error_class),
- bactext_error_code_name((int) listOfProperties->
- error.error_code));
+ bactext_error_class_name((int) listOfProperties->error.
+ error_class),
+ bactext_error_code_name((int) listOfProperties->error.
+ error_code));
#endif
}
listOfProperties = listOfProperties->next;
diff --git a/bacnet-stack/demo/handler/h_ucov.c b/bacnet-stack/demo/handler/h_ucov.c
index f5c198e0..6b872b5a 100644
--- a/bacnet-stack/demo/handler/h_ucov.c
+++ b/bacnet-stack/demo/handler/h_ucov.c
@@ -104,8 +104,8 @@ void handler_ucov_notification(
fprintf(stderr, "UCOV: ");
if (pProperty_value->propertyIdentifier < 512) {
fprintf(stderr, "%s ",
- bactext_property_name
- (pProperty_value->propertyIdentifier));
+ bactext_property_name(pProperty_value->
+ propertyIdentifier));
} else {
fprintf(stderr, "proprietary %u ",
pProperty_value->propertyIdentifier);
diff --git a/bacnet-stack/demo/handler/h_whohas.c b/bacnet-stack/demo/handler/h_whohas.c
index b8e0e44f..e83d303d 100644
--- a/bacnet-stack/demo/handler/h_whohas.c
+++ b/bacnet-stack/demo/handler/h_whohas.c
@@ -79,8 +79,8 @@ void handler_who_has(
&object_instance);
if (found)
Send_I_Have(Device_Object_Instance_Number(),
- (BACNET_OBJECT_TYPE)object_type,
- object_instance, object_name);
+ (BACNET_OBJECT_TYPE) object_type, object_instance,
+ object_name);
} else {
/* valid object in my device? */
object_name =
@@ -88,7 +88,7 @@ void handler_who_has(
data.object.identifier.instance);
if (object_name)
Send_I_Have(Device_Object_Instance_Number(),
- (BACNET_OBJECT_TYPE)data.object.identifier.type,
+ (BACNET_OBJECT_TYPE) data.object.identifier.type,
data.object.identifier.instance, object_name);
}
}
diff --git a/bacnet-stack/demo/handler/h_wp.c b/bacnet-stack/demo/handler/h_wp.c
index 1f07541a..83bdab98 100644
--- a/bacnet-stack/demo/handler/h_wp.c
+++ b/bacnet-stack/demo/handler/h_wp.c
@@ -174,8 +174,8 @@ bool WPValidateString(
(characterstring_length(&pValue->type.Character_String) ==
0)) {
*pErrorCode = ERROR_CODE_VALUE_OUT_OF_RANGE;
- } else if (characterstring_length(&pValue->
- type.Character_String) >= iMaxLen) {
+ } else if (characterstring_length(&pValue->type.
+ Character_String) >= iMaxLen) {
*pErrorClass = ERROR_CLASS_RESOURCES;
*pErrorCode = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;
} else
diff --git a/bacnet-stack/demo/handler/s_whois.c b/bacnet-stack/demo/handler/s_whois.c
index c68aa0c3..f200c32e 100644
--- a/bacnet-stack/demo/handler/s_whois.c
+++ b/bacnet-stack/demo/handler/s_whois.c
@@ -69,15 +69,16 @@ void Send_WhoIs_To_Network(
/* encode the NPDU portion of the packet */
npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
pdu_len =
- npdu_encode_pdu(&Handler_Transmit_Buffer[0],target_address, NULL, &npdu_data);
+ npdu_encode_pdu(&Handler_Transmit_Buffer[0], target_address, NULL,
+ &npdu_data);
/* encode the APDU portion of the packet */
len =
whois_encode_apdu(&Handler_Transmit_Buffer[pdu_len], low_limit,
high_limit);
pdu_len += len;
bytes_sent =
- datalink_send_pdu(target_address, &npdu_data, &Handler_Transmit_Buffer[0],
- pdu_len);
+ datalink_send_pdu(target_address, &npdu_data,
+ &Handler_Transmit_Buffer[0], pdu_len);
#if PRINT_ENABLED
if (bytes_sent <= 0)
fprintf(stderr, "Failed to Send Who-Is Request (%s)!\n",
@@ -145,9 +146,8 @@ void Send_WhoIs_Local(
int loop;
- for(loop = 0; loop < 6; loop++)
- {
- dest.mac[loop] = temp[loop];
+ for (loop = 0; loop < 6; loop++) {
+ dest.mac[loop] = temp[loop];
}
Send_WhoIs_To_Network(&dest, low_limit, high_limit);
@@ -171,7 +171,7 @@ void Send_WhoIs_Remote(
if (!dcc_communication_enabled())
return;
- Send_WhoIs_To_Network(target_address, low_limit, high_limit);
+ Send_WhoIs_To_Network(target_address, low_limit, high_limit);
}
/** Send a global Who-Is request for a specific device, a range, or any device.
@@ -191,4 +191,3 @@ void Send_WhoIs(
{
Send_WhoIs_Global(low_limit, high_limit);
}
-
diff --git a/bacnet-stack/demo/handler/s_wp.c b/bacnet-stack/demo/handler/s_wp.c
index d6e46192..1b66e13b 100644
--- a/bacnet-stack/demo/handler/s_wp.c
+++ b/bacnet-stack/demo/handler/s_wp.c
@@ -155,9 +155,8 @@ uint8_t Send_Write_Property_Request(
#if PRINT_ENABLED_DEBUG
fprintf(stderr, "WriteProperty service: " "%s tag=%d\n",
(object_value->context_specific ? "context" : "application"),
- (int) (object_value->
- context_specific ? object_value->context_tag : object_value->
- tag));
+ (int) (object_value->context_specific ? object_value->
+ context_tag : object_value->tag));
#endif
len = bacapp_encode_data(&application_data[apdu_len], object_value);
if ((len + apdu_len) < MAX_APDU) {
diff --git a/bacnet-stack/demo/object/ao.c b/bacnet-stack/demo/object/ao.c
index b59ef68f..f83685b9 100644
--- a/bacnet-stack/demo/object/ao.c
+++ b/bacnet-stack/demo/object/ao.c
@@ -366,8 +366,7 @@ int Analog_Output_Read_Property(
1] == AO_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]);
else {
- real_value =
- Analog_Output_Level[object_index]
+ real_value = Analog_Output_Level[object_index]
[rpdata->array_index - 1];
apdu_len =
encode_application_real(&apdu[0], real_value);
@@ -442,11 +441,11 @@ bool Analog_Output_Write_Property(
if (status) {
level = AO_LEVEL_NULL;
object_index =
- Analog_Output_Instance_To_Index
- (wp_data->object_instance);
+ Analog_Output_Instance_To_Index(wp_data->
+ object_instance);
status =
- Analog_Output_Present_Value_Relinquish
- (wp_data->object_instance, wp_data->priority);
+ Analog_Output_Present_Value_Relinquish(wp_data->
+ object_instance, wp_data->priority);
if (!status) {
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
diff --git a/bacnet-stack/demo/object/av.c b/bacnet-stack/demo/object/av.c
index 01cddc0c..cb0cf850 100644
--- a/bacnet-stack/demo/object/av.c
+++ b/bacnet-stack/demo/object/av.c
@@ -315,8 +315,7 @@ int Analog_Value_Read_Property(
1] == ANALOG_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]);
else {
- real_value =
- Analog_Value_Level[object_index]
+ real_value = Analog_Value_Level[object_index]
[rpdata->array_index - 1];
apdu_len =
encode_application_real(&apdu[0], real_value);
@@ -392,8 +391,8 @@ bool Analog_Value_Write_Property(
if (status) {
level = ANALOG_LEVEL_NULL;
object_index =
- Analog_Value_Instance_To_Index
- (wp_data->object_instance);
+ Analog_Value_Instance_To_Index(wp_data->
+ object_instance);
priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--;
diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c
index 8849134f..5c8cf337 100644
--- a/bacnet-stack/demo/object/bo.c
+++ b/bacnet-stack/demo/object/bo.c
@@ -296,8 +296,7 @@ int Binary_Output_Read_Property(
1] == BINARY_NULL)
apdu_len = encode_application_null(&apdu[apdu_len]);
else {
- present_value =
- Binary_Output_Level[object_index]
+ present_value = Binary_Output_Level[object_index]
[rpdata->array_index - 1];
apdu_len =
encode_application_enumerated(&apdu[apdu_len],
@@ -371,8 +370,8 @@ bool Binary_Output_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index =
- Binary_Output_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Output_Instance_To_Index(wp_data->
+ object_instance);
priority--;
Binary_Output_Level[object_index][priority] = level;
/* Note: you could set the physical output here if we
@@ -398,8 +397,8 @@ bool Binary_Output_Write_Property(
if (status) {
level = BINARY_NULL;
object_index =
- Binary_Output_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Output_Instance_To_Index(wp_data->
+ object_instance);
priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--;
diff --git a/bacnet-stack/demo/object/bv.c b/bacnet-stack/demo/object/bv.c
index c41d626c..51f4e236 100644
--- a/bacnet-stack/demo/object/bv.c
+++ b/bacnet-stack/demo/object/bv.c
@@ -289,8 +289,7 @@ int Binary_Value_Read_Property(
== BINARY_NULL)
apdu_len = encode_application_null(&apdu[apdu_len]);
else {
- present_value =
- Binary_Value_Level[object_index]
+ present_value = Binary_Value_Level[object_index]
[rpdata->array_index];
apdu_len =
encode_application_enumerated(&apdu[apdu_len],
@@ -354,8 +353,8 @@ bool Binary_Value_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
priority--;
Binary_Value_Level[object_index][priority] = level;
/* Note: you could set the physical output here if we
@@ -381,8 +380,8 @@ bool Binary_Value_Write_Property(
if (status) {
level = BINARY_NULL;
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--;
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index daf157d7..4c5fa37e 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -1241,8 +1241,8 @@ static bool Device_Write_Property_Local(
&wp_data->error_class, &wp_data->error_code);
if (status) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
- (Device_Set_Object_Instance_Number(value.type.
- Object_Id.instance))) {
+ (Device_Set_Object_Instance_Number(value.type.Object_Id.
+ instance))) {
/* FIXME: we could send an I-Am broadcast to let the world know */
} else {
status = false;
@@ -1275,8 +1275,8 @@ static bool Device_Write_Property_Local(
&wp_data->error_class, &wp_data->error_code);
if (status) {
/* FIXME: bounds check? */
- Device_Set_Vendor_Identifier((uint16_t) value.
- type.Unsigned_Int);
+ Device_Set_Vendor_Identifier((uint16_t) value.type.
+ Unsigned_Int);
}
break;
case PROP_SYSTEM_STATUS:
@@ -1303,8 +1303,8 @@ static bool Device_Write_Property_Local(
WPValidateString(&value, MAX_DEV_NAME_LEN, false,
&wp_data->error_class, &wp_data->error_code);
if (status) {
- Device_Set_Object_Name(characterstring_value(&value.
- type.Character_String),
+ Device_Set_Object_Name(characterstring_value(&value.type.
+ Character_String),
characterstring_length(&value.type.Character_String));
}
break;
@@ -1313,8 +1313,8 @@ static bool Device_Write_Property_Local(
WPValidateString(&value, MAX_DEV_LOC_LEN, true,
&wp_data->error_class, &wp_data->error_code);
if (status) {
- Device_Set_Location(characterstring_value(&value.
- type.Character_String),
+ Device_Set_Location(characterstring_value(&value.type.
+ Character_String),
characterstring_length(&value.type.Character_String));
}
break;
@@ -1324,8 +1324,8 @@ static bool Device_Write_Property_Local(
WPValidateString(&value, MAX_DEV_DESC_LEN, true,
&wp_data->error_class, &wp_data->error_code);
if (status) {
- Device_Set_Description(characterstring_value(&value.
- type.Character_String),
+ Device_Set_Description(characterstring_value(&value.type.
+ Character_String),
characterstring_length(&value.type.Character_String));
}
break;
@@ -1334,8 +1334,8 @@ static bool Device_Write_Property_Local(
WPValidateString(&value, MAX_DEV_MOD_LEN, true,
&wp_data->error_class, &wp_data->error_code);
if (status) {
- Device_Set_Model_Name(characterstring_value(&value.
- type.Character_String),
+ Device_Set_Model_Name(characterstring_value(&value.type.
+ Character_String),
characterstring_length(&value.type.Character_String));
}
break;
@@ -1347,8 +1347,8 @@ static bool Device_Write_Property_Local(
&wp_data->error_class, &wp_data->error_code);
if (status) {
if (value.type.Unsigned_Int <= 255) {
- dlmstp_set_max_info_frames((uint8_t) value.
- type.Unsigned_Int);
+ dlmstp_set_max_info_frames((uint8_t) value.type.
+ Unsigned_Int);
} else {
status = false;
wp_data->error_class = ERROR_CLASS_PROPERTY;
diff --git a/bacnet-stack/demo/object/lo.c b/bacnet-stack/demo/object/lo.c
index d5041f3e..5cfe238b 100644
--- a/bacnet-stack/demo/object/lo.c
+++ b/bacnet-stack/demo/object/lo.c
@@ -469,12 +469,11 @@ int Lighting_Output_Read_Property(
object_index =
Lighting_Output_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
- if (Lighting_Output_Level[object_index][rpdata->array_index
- - 1] == LIGHTING_LEVEL_NULL)
+ if (Lighting_Output_Level[object_index][rpdata->
+ array_index - 1] == LIGHTING_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]);
else {
- real_value =
- Lighting_Output_Level[object_index]
+ real_value = Lighting_Output_Level[object_index]
[rpdata->array_index - 1];
apdu_len =
encode_application_real(&apdu[0], real_value);
@@ -550,11 +549,11 @@ bool Lighting_Output_Write_Property(
if (status) {
level = LIGHTING_LEVEL_NULL;
object_index =
- Lighting_Output_Instance_To_Index
- (wp_data->object_instance);
+ Lighting_Output_Instance_To_Index(wp_data->
+ object_instance);
status =
- Lighting_Output_Present_Value_Relinquish
- (wp_data->object_instance, wp_data->priority);
+ Lighting_Output_Present_Value_Relinquish(wp_data->
+ object_instance, wp_data->priority);
if (wp_data->priority == 6) {
/* Command priority 6 is reserved for use by Minimum On/Off
algorithm and may not be used for other purposes in any
@@ -581,8 +580,8 @@ bool Lighting_Output_Write_Property(
&wp_data->error_class, &wp_data->error_code);
if (status) {
object_index =
- Lighting_Output_Instance_To_Index
- (wp_data->object_instance);
+ Lighting_Output_Instance_To_Index(wp_data->
+ object_instance);
Lighting_Output_Out_Of_Service[object_index] =
value.type.Boolean;
}
diff --git a/bacnet-stack/demo/object/lsp.c b/bacnet-stack/demo/object/lsp.c
index d7f1e48c..931cea6b 100644
--- a/bacnet-stack/demo/object/lsp.c
+++ b/bacnet-stack/demo/object/lsp.c
@@ -318,8 +318,8 @@ bool Life_Safety_Point_Write_Property(
if (status) {
if (value.type.Enumerated <= MAX_LIFE_SAFETY_MODE) {
object_index =
- Life_Safety_Point_Instance_To_Index
- (wp_data->object_instance);
+ Life_Safety_Point_Instance_To_Index(wp_data->
+ object_instance);
Life_Safety_Point_Mode[object_index] =
value.type.Enumerated;
} else {
@@ -335,8 +335,8 @@ bool Life_Safety_Point_Write_Property(
&wp_data->error_class, &wp_data->error_code);
if (status) {
object_index =
- Life_Safety_Point_Instance_To_Index
- (wp_data->object_instance);
+ Life_Safety_Point_Instance_To_Index(wp_data->
+ object_instance);
Life_Safety_Point_Out_Of_Service[object_index] =
value.type.Boolean;
}
diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c
index 31921480..0c3dc600 100644
--- a/bacnet-stack/demo/object/ms-input.c
+++ b/bacnet-stack/demo/object/ms-input.c
@@ -400,8 +400,8 @@ int Multistate_Input_Read_Property(
/* if no index was specified, then try to encode the entire list */
/* into one packet. */
object_index =
- Multistate_Input_Instance_To_Index
- (rpdata->object_instance);
+ Multistate_Input_Instance_To_Index(rpdata->
+ object_instance);
for (i = 0; i < MULTISTATE_NUMBER_OF_STATES; i++) {
characterstring_init_ansi(&char_string,
Multistate_Input_State_Text(rpdata->object_instance,
@@ -422,8 +422,8 @@ int Multistate_Input_Read_Property(
}
} else {
object_index =
- Multistate_Input_Instance_To_Index
- (rpdata->object_instance);
+ Multistate_Input_Instance_To_Index(rpdata->
+ object_instance);
if (rpdata->array_index <= MULTISTATE_NUMBER_OF_STATES) {
characterstring_init_ansi(&char_string,
Multistate_Input_State_Text(rpdata->object_instance,
@@ -478,8 +478,8 @@ bool Multistate_Input_Write_Property(
if (status) {
if (Out_Of_Service[object_index]) {
status =
- Multistate_Input_Present_Value_Set
- (wp_data->object_instance, value.type.Unsigned_Int);
+ Multistate_Input_Present_Value_Set(wp_data->
+ object_instance, value.type.Unsigned_Int);
if (!status) {
wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
@@ -497,8 +497,8 @@ bool Multistate_Input_Write_Property(
&wp_data->error_class, &wp_data->error_code);
if (status) {
object_index =
- Multistate_Input_Instance_To_Index
- (wp_data->object_instance);
+ Multistate_Input_Instance_To_Index(wp_data->
+ object_instance);
Out_Of_Service[object_index] = value.type.Boolean;
}
break;
diff --git a/bacnet-stack/demo/object/mso.c b/bacnet-stack/demo/object/mso.c
index 76f37bcc..9e630577 100644
--- a/bacnet-stack/demo/object/mso.c
+++ b/bacnet-stack/demo/object/mso.c
@@ -266,8 +266,8 @@ int Multistate_Output_Read_Property(
/* into one packet. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) {
object_index =
- Multistate_Output_Instance_To_Index
- (rpdata->object_instance);
+ Multistate_Output_Instance_To_Index(rpdata->
+ object_instance);
for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */
if (Multistate_Output_Level[object_index][i] ==
@@ -292,15 +292,14 @@ int Multistate_Output_Read_Property(
}
} else {
object_index =
- Multistate_Output_Instance_To_Index
- (rpdata->object_instance);
+ Multistate_Output_Instance_To_Index(rpdata->
+ object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Multistate_Output_Level[object_index]
[rpdata->array_index - 1] == MULTISTATE_NULL)
apdu_len = encode_application_null(&apdu[0]);
else {
- present_value =
- Multistate_Output_Level[object_index]
+ present_value = Multistate_Output_Level[object_index]
[rpdata->array_index - 1];
apdu_len =
encode_application_unsigned(&apdu[0],
@@ -370,8 +369,8 @@ bool Multistate_Output_Write_Property(
(value.type.Unsigned_Int <= MULTISTATE_NUMBER_OF_STATES)) {
level = value.type.Unsigned_Int;
object_index =
- Multistate_Output_Instance_To_Index
- (wp_data->object_instance);
+ Multistate_Output_Instance_To_Index(wp_data->
+ object_instance);
priority--;
Multistate_Output_Level[object_index][priority] =
(uint8_t) level;
@@ -398,8 +397,8 @@ bool Multistate_Output_Write_Property(
if (status) {
level = MULTISTATE_NULL;
object_index =
- Multistate_Output_Instance_To_Index
- (wp_data->object_instance);
+ Multistate_Output_Instance_To_Index(wp_data->
+ object_instance);
priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--;
@@ -425,8 +424,8 @@ bool Multistate_Output_Write_Property(
&wp_data->error_class, &wp_data->error_code);
if (status) {
object_index =
- Multistate_Output_Instance_To_Index
- (wp_data->object_instance);
+ Multistate_Output_Instance_To_Index(wp_data->
+ object_instance);
Multistate_Output_Out_Of_Service[object_index] =
value.type.Boolean;
}
diff --git a/bacnet-stack/demo/object/trendlog.c b/bacnet-stack/demo/object/trendlog.c
index 48632719..163339b5 100644
--- a/bacnet-stack/demo/object/trendlog.c
+++ b/bacnet-stack/demo/object/trendlog.c
@@ -731,9 +731,9 @@ bool Trend_Log_Write_Property(
if (wp_data->application_data_len != 0) {
iOffset += len;
len =
- bacapp_decode_context_data(&wp_data->application_data
- [iOffset], wp_data->application_data_len, &value,
- PROP_LOG_DEVICE_OBJECT_PROPERTY);
+ bacapp_decode_context_data(&wp_data->
+ application_data[iOffset], wp_data->application_data_len,
+ &value, PROP_LOG_DEVICE_OBJECT_PROPERTY);
if ((len == 0) || ((value.context_tag != 2) &&
(value.context_tag != 3))) {
/* Bad decode or wrong tag */
@@ -750,8 +750,8 @@ bool Trend_Log_Write_Property(
if (wp_data->application_data_len != 0) {
iOffset += len;
len =
- bacapp_decode_context_data
- (&wp_data->application_data[iOffset],
+ bacapp_decode_context_data(&wp_data->
+ application_data[iOffset],
wp_data->application_data_len, &value,
PROP_LOG_DEVICE_OBJECT_PROPERTY);
if ((len == 0) || (value.context_tag != 3)) {
@@ -1093,8 +1093,8 @@ int rr_trend_log_encode(
pRequest->ItemCount = 0; /* Start out with nothing */
/* Bail out now if nowt - should never happen for a Trend Log but ... */
- if (LogInfo[Trend_Log_Instance_To_Index(pRequest->
- object_instance)].ulRecordCount == 0)
+ if (LogInfo[Trend_Log_Instance_To_Index(pRequest->object_instance)].
+ ulRecordCount == 0)
return (0);
if ((pRequest->RequestType == RR_BY_POSITION) ||
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index 4131e0a3..426a2d12 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -185,4 +185,4 @@ int main(
}
}
- /* @} *//* End group ServerDemo */
+ /* @} *//* End group ServerDemo */
diff --git a/bacnet-stack/include/datalink.h b/bacnet-stack/include/datalink.h
index 6163623e..c2468502 100644
--- a/bacnet-stack/include/datalink.h
+++ b/bacnet-stack/include/datalink.h
@@ -139,7 +139,7 @@ extern "C" {
* chosen at runtime from among these choices.
* - Clause 10 POINT-TO-POINT (PTP) and Clause 11 EIA/CEA-709.1 ("LonTalk") LAN
* are not currently supported by this project.
- *//** @defgroup DLTemplates DataLink Template Functions
+ *//** @defgroup DLTemplates DataLink Template Functions
* @ingroup DataLink
* Most of the functions in this group are function templates which are assigned
* to a specific DataLink network layer implementation either at compile time or
diff --git a/bacnet-stack/include/dcc.h b/bacnet-stack/include/dcc.h
index 335bf07b..252027ee 100644
--- a/bacnet-stack/include/dcc.h
+++ b/bacnet-stack/include/dcc.h
@@ -101,7 +101,7 @@ extern "C" {
* These device management BIBBs prescribe the BACnet capabilities required
* to interoperably perform the device management functions enumerated in
* 22.2.1.5 for the BACnet devices defined therein.
- *//** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC)
+ *//** @defgroup DMDCC Device Management-Device Communication Control (DM-DCC)
* @ingroup RDMS
* 16.1 DeviceCommunicationControl Service
* The DeviceCommunicationControl service is used by a client BACnet-user to
diff --git a/bacnet-stack/include/device.h b/bacnet-stack/include/device.h
index 609bb96a..829730ab 100644
--- a/bacnet-stack/include/device.h
+++ b/bacnet-stack/include/device.h
@@ -237,11 +237,11 @@ extern "C" {
* - The interface between the implemented Objects and the BAC-stack services,
* specifically the handlers, which are mediated through function calls to
* the Device object.
- *//** @defgroup ObjHelpers Object Helper Functions
+ *//** @defgroup ObjHelpers Object Helper Functions
* @ingroup ObjFrmwk
* This section describes the function templates for the helper functions that
* provide common object support.
- *//** @defgroup ObjIntf Handler-to-Object Interface Functions
+ *//** @defgroup ObjIntf Handler-to-Object Interface Functions
* @ingroup ObjFrmwk
* This section describes the fairly limited set of functions that link the
* BAC-stack handlers to the BACnet Object instances. All of these calls are
diff --git a/bacnet-stack/include/event.h b/bacnet-stack/include/event.h
index 6c819803..fa93d75f 100644
--- a/bacnet-stack/include/event.h
+++ b/bacnet-stack/include/event.h
@@ -213,7 +213,7 @@ extern "C" {
* These BIBBs prescribe the BACnet capabilities required to interoperably
* perform the alarm and event management functions enumerated in 22.2.1.2
* for the BACnet devices defined therein.
- *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
+ *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
* @ingroup ALMEVNT
* 13.6 ConfirmedCOVNotification Service
* The ConfirmedCOVNotification service is used to notify subscribers about
@@ -230,7 +230,7 @@ extern "C" {
* For unsubscribed notifications, the algorithm for determining when to issue
* this service is a local matter and may be based on a change of value,
* periodic updating, or some other criteria.
- *//** @defgroup ALMACK Alarm and Event-ACK (AE-ACK)
+ *//** @defgroup ALMACK Alarm and Event-ACK (AE-ACK)
* @ingroup ALMEVNT
* 13.5 AcknowledgeAlarm Service
* In some systems a device may need to know that an operator has seen the alarm
diff --git a/bacnet-stack/include/rp.h b/bacnet-stack/include/rp.h
index 52333aff..dc8cf5f4 100644
--- a/bacnet-stack/include/rp.h
+++ b/bacnet-stack/include/rp.h
@@ -135,7 +135,7 @@ extern "C" {
* These BIBBs prescribe the BACnet capabilities required to interoperably
* perform the data sharing functions enumerated in 22.2.1.1 for the BACnet
* devices defined therein.
- *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
+ *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
* @ingroup DataShare
* 15.5 ReadProperty Service
* The ReadProperty service is used by a client BACnet-user to request the
diff --git a/bacnet-stack/ports/at91sam7s/av.c b/bacnet-stack/ports/at91sam7s/av.c
index 90bc895f..3c5ff0a3 100644
--- a/bacnet-stack/ports/at91sam7s/av.c
+++ b/bacnet-stack/ports/at91sam7s/av.c
@@ -355,8 +355,8 @@ bool Analog_Value_Write_Property(
(value.type.Real >= 0.0) && (value.type.Real <= 100.0)) {
level = (uint8_t) value.type.Real;
object_index =
- Analog_Value_Instance_To_Index
- (wp_data->object_instance);
+ Analog_Value_Instance_To_Index(wp_data->
+ object_instance);
priority--;
Present_Value[object_index] = level;
/* Note: you could set the physical output here if we
diff --git a/bacnet-stack/ports/at91sam7s/bv.c b/bacnet-stack/ports/at91sam7s/bv.c
index c8a1eb7e..4b15e54e 100644
--- a/bacnet-stack/ports/at91sam7s/bv.c
+++ b/bacnet-stack/ports/at91sam7s/bv.c
@@ -265,8 +265,8 @@ bool Binary_Value_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) {
level = value.type.Enumerated;
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
priority--;
/* NOTE: this Binary value has no priority array */
Present_Value[object_index] = level;
diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c
index 304ac997..73885b88 100644
--- a/bacnet-stack/ports/at91sam7s/device.c
+++ b/bacnet-stack/ports/at91sam7s/device.c
@@ -824,8 +824,8 @@ bool Device_Write_Property_Local(
case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
- (Device_Set_Object_Instance_Number(value.type.
- Object_Id.instance))) {
+ (Device_Set_Object_Instance_Number(value.type.Object_Id.
+ instance))) {
/* we could send an I-Am broadcast to let the world know */
status = true;
} else {
diff --git a/bacnet-stack/ports/atmega168/bv.c b/bacnet-stack/ports/atmega168/bv.c
index fe3f7226..f0b15b68 100644
--- a/bacnet-stack/ports/atmega168/bv.c
+++ b/bacnet-stack/ports/atmega168/bv.c
@@ -206,8 +206,8 @@ bool Binary_Value_Write_Property(
if ((value.type.Enumerated == BINARY_ACTIVE) ||
(value.type.Enumerated == BINARY_INACTIVE)) {
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
/* NOTE: this Binary value has no priority array */
Present_Value[object_index] =
(BACNET_BINARY_PV) value.type.Enumerated;
diff --git a/bacnet-stack/ports/atmega168/device.c b/bacnet-stack/ports/atmega168/device.c
index 39eebd5e..0b7af579 100644
--- a/bacnet-stack/ports/atmega168/device.c
+++ b/bacnet-stack/ports/atmega168/device.c
@@ -374,8 +374,8 @@ bool Device_Write_Property(
case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
- (Device_Set_Object_Instance_Number(value.type.
- Object_Id.instance))) {
+ (Device_Set_Object_Instance_Number(value.type.Object_Id.
+ instance))) {
/* we could send an I-Am broadcast to let the world know */
status = true;
} else {
diff --git a/bacnet-stack/ports/atmega8/bv.c b/bacnet-stack/ports/atmega8/bv.c
index fe3f7226..f0b15b68 100644
--- a/bacnet-stack/ports/atmega8/bv.c
+++ b/bacnet-stack/ports/atmega8/bv.c
@@ -206,8 +206,8 @@ bool Binary_Value_Write_Property(
if ((value.type.Enumerated == BINARY_ACTIVE) ||
(value.type.Enumerated == BINARY_INACTIVE)) {
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
/* NOTE: this Binary value has no priority array */
Present_Value[object_index] =
(BACNET_BINARY_PV) value.type.Enumerated;
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c
index 9356bb86..c7f936b6 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/bo.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/bo.c
@@ -445,8 +445,8 @@ bool Binary_Output_Write_Property(
priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--;
- Binary_Output_Present_Value_Set
- (wp_data->object_instance, level, priority);
+ Binary_Output_Present_Value_Set(wp_data->
+ object_instance, level, priority);
} else if (priority == 6) {
status = false;
/* Command priority 6 is reserved for use by Minimum On/Off
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
index d88b7bc9..e49fc550 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c
@@ -802,8 +802,8 @@ bool Device_Write_Property_Local(
case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
- (Device_Set_Object_Instance_Number(value.type.
- Object_Id.instance))) {
+ (Device_Set_Object_Instance_Number(value.type.Object_Id.
+ instance))) {
/* we could send an I-Am broadcast to let the world know */
status = true;
} else {
@@ -863,8 +863,8 @@ bool Device_Write_Property_Local(
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH,
&small_length, 1);
pCharString =
- characterstring_value(&value.
- type.Character_String);
+ characterstring_value(&value.type.
+ Character_String);
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0,
(uint8_t *) pCharString, length);
status = true;
diff --git a/bacnet-stack/ports/pic18f6720/av.c b/bacnet-stack/ports/pic18f6720/av.c
index e495ba00..6e2c296b 100644
--- a/bacnet-stack/ports/pic18f6720/av.c
+++ b/bacnet-stack/ports/pic18f6720/av.c
@@ -320,8 +320,8 @@ bool Analog_Value_Write_Property(
(value.type.Real >= 0.0) && (value.type.Real <= 100.0)) {
level = (uint8_t) value.type.Real;
object_index =
- Analog_Value_Instance_To_Index
- (wp_data->object_instance);
+ Analog_Value_Instance_To_Index(wp_data->
+ object_instance);
priority--;
Present_Value[object_index] = level;
/* Note: you could set the physical output here if we
diff --git a/bacnet-stack/ports/pic18f6720/bv.c b/bacnet-stack/ports/pic18f6720/bv.c
index 657e57f4..bb0ca381 100644
--- a/bacnet-stack/ports/pic18f6720/bv.c
+++ b/bacnet-stack/ports/pic18f6720/bv.c
@@ -232,8 +232,8 @@ bool Binary_Value_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) {
level = value.type.Enumerated;
object_index =
- Binary_Value_Instance_To_Index
- (wp_data->object_instance);
+ Binary_Value_Instance_To_Index(wp_data->
+ object_instance);
priority--;
/* NOTE: this Binary value has no priority array */
Present_Value[object_index] = level;
diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c
index e61423b8..8f995980 100644
--- a/bacnet-stack/ports/pic18f6720/device.c
+++ b/bacnet-stack/ports/pic18f6720/device.c
@@ -505,8 +505,8 @@ bool Device_Write_Property(
case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
- (Device_Set_Object_Instance_Number(value.type.
- Object_Id.instance))) {
+ (Device_Set_Object_Instance_Number(value.type.Object_Id.
+ instance))) {
/* we could send an I-Am broadcast to let the world know */
status = true;
} else {
diff --git a/bacnet-stack/src/address.c b/bacnet-stack/src/address.c
index 745d652a..1cffa485 100644
--- a/bacnet-stack/src/address.c
+++ b/bacnet-stack/src/address.c
@@ -149,8 +149,7 @@ static struct Address_Cache_Entry *address_remove_oldest(
pMatch = Address_Cache;
while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) {
- if ((pMatch->
- Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ |
+ if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ |
BAC_ADDR_STATIC)) == BAC_ADDR_IN_USE) {
if (pMatch->TimeToLive <= ulTime) { /* Shorter lived entry found */
ulTime = pMatch->TimeToLive;
@@ -169,8 +168,7 @@ static struct Address_Cache_Entry *address_remove_oldest(
/* Second pass - try in use and un bound as last resort */
pMatch = Address_Cache;
while (pMatch <= &Address_Cache[MAX_ADDRESS_CACHE - 1]) {
- if ((pMatch->
- Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ |
+ if ((pMatch->Flags & (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ |
BAC_ADDR_STATIC)) ==
((uint8_t) (BAC_ADDR_IN_USE | BAC_ADDR_BIND_REQ))) {
if (pMatch->TimeToLive <= ulTime) { /* Shorter lived entry found */
diff --git a/bacnet-stack/src/apdu.c b/bacnet-stack/src/apdu.c
index 69935230..1d3cb3e8 100644
--- a/bacnet-stack/src/apdu.c
+++ b/bacnet-stack/src/apdu.c
@@ -190,7 +190,7 @@ bool apdu_service_supported_to_index(
for (i = 0; i < MAX_BACNET_CONFIRMED_SERVICE; i++) {
if (confirmed_service_supported[i] == service_supported) {
found = true;
- *index = (size_t)i;
+ *index = (size_t) i;
*bIsConfirmed = true;
break;
}
@@ -201,7 +201,7 @@ bool apdu_service_supported_to_index(
for (i = 0; i < MAX_BACNET_UNCONFIRMED_SERVICE; i++) {
if (unconfirmed_service_supported[i] == service_supported) {
found = true;
- *index = (size_t)i;
+ *index = (size_t) i;
break;
}
}
@@ -380,7 +380,8 @@ void apdu_handler(
/* PDU Type */
switch (apdu[0] & 0xF0) {
case PDU_TYPE_CONFIRMED_SERVICE_REQUEST:
- len = (int)apdu_decode_confirmed_service_request(&apdu[0],
+ len =
+ (int) apdu_decode_confirmed_service_request(&apdu[0],
apdu_len, &service_data, &service_choice, &service_request,
&service_request_len);
/* When network communications are completely disabled,
diff --git a/bacnet-stack/src/bacapp.c b/bacnet-stack/src/bacapp.c
index f07c1fe6..819e5a39 100644
--- a/bacnet-stack/src/bacapp.c
+++ b/bacnet-stack/src/bacapp.c
@@ -891,8 +891,8 @@ bool bacapp_print_value(
case PROP_OBJECT_TYPE:
if (value->type.Enumerated < MAX_ASHRAE_OBJECT_TYPE) {
fprintf(stream, "%s",
- bactext_object_type_name(value->type.
- Enumerated));
+ bactext_object_type_name(value->
+ type.Enumerated));
} else if (value->type.Enumerated < 128) {
fprintf(stream, "reserved %lu",
(unsigned long) value->type.Enumerated);
@@ -908,8 +908,8 @@ bool bacapp_print_value(
case PROP_UNITS:
if (value->type.Enumerated < 256) {
fprintf(stream, "%s",
- bactext_engineering_unit_name(value->
- type.Enumerated));
+ bactext_engineering_unit_name(value->type.
+ Enumerated));
} else {
fprintf(stream, "proprietary %lu",
(unsigned long) value->type.Enumerated);
@@ -917,13 +917,13 @@ bool bacapp_print_value(
break;
case PROP_POLARITY:
fprintf(stream, "%s",
- bactext_binary_polarity_name(value->
- type.Enumerated));
+ bactext_binary_polarity_name(value->type.
+ Enumerated));
break;
case PROP_PRESENT_VALUE:
fprintf(stream, "%s",
- bactext_binary_present_value_name(value->
- type.Enumerated));
+ bactext_binary_present_value_name(value->type.
+ Enumerated));
break;
case PROP_RELIABILITY:
fprintf(stream, "%s",
@@ -931,8 +931,8 @@ bool bacapp_print_value(
break;
case PROP_SYSTEM_STATUS:
fprintf(stream, "%s",
- bactext_device_status_name(value->
- type.Enumerated));
+ bactext_device_status_name(value->type.
+ Enumerated));
break;
case PROP_SEGMENTATION_SUPPORTED:
fprintf(stream, "%s",
@@ -1303,8 +1303,8 @@ void testBACnetApplicationData_Safe(
break;
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
- characterstring_init_ansi(&input_value[i].type.
- Character_String, "Hello There!");
+ characterstring_init_ansi(&input_value[i].
+ type.Character_String, "Hello There!");
break;
case BACNET_APPLICATION_TAG_BIT_STRING:
diff --git a/bacnet-stack/src/bvlc.c b/bacnet-stack/src/bvlc.c
index b47dbcf9..168a7f4f 100644
--- a/bacnet-stack/src/bvlc.c
+++ b/bacnet-stack/src/bvlc.c
@@ -678,8 +678,8 @@ static void bvlc_bdt_forward_npdu(
mask in the BDT entry and logically ORing it with the
BBMD address of the same entry. */
bip_dest.sin_addr.s_addr =
- htonl(((~BBMD_Table[i].broadcast_mask.
- s_addr) | BBMD_Table[i].dest_address.s_addr));
+ htonl(((~BBMD_Table[i].broadcast_mask.s_addr) | BBMD_Table[i].
+ dest_address.s_addr));
bip_dest.sin_port = htons(BBMD_Table[i].dest_port);
/* don't send to my broadcast address and same port */
if ((bip_dest.sin_addr.s_addr == htonl(bip_get_broadcast_addr()))
diff --git a/bacnet-stack/src/event.c b/bacnet-stack/src/event.c
index dee15389..b3556d8f 100644
--- a/bacnet-stack/src/event.c
+++ b/bacnet-stack/src/event.c
@@ -192,14 +192,14 @@ int event_notify_encode_service_request(
len =
encode_context_bitstring(&apdu[apdu_len], 0,
- &data->notificationParams.
- changeOfBitstring.referencedBitString);
+ &data->notificationParams.changeOfBitstring.
+ referencedBitString);
apdu_len += len;
len =
encode_context_bitstring(&apdu[apdu_len], 1,
- &data->notificationParams.
- changeOfBitstring.statusFlags);
+ &data->notificationParams.changeOfBitstring.
+ statusFlags);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 0);
@@ -223,8 +223,8 @@ int event_notify_encode_service_request(
len =
encode_context_bitstring(&apdu[apdu_len], 1,
- &data->notificationParams.
- changeOfState.statusFlags);
+ &data->notificationParams.changeOfState.
+ statusFlags);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 1);
@@ -242,8 +242,8 @@ int event_notify_encode_service_request(
case CHANGE_OF_VALUE_REAL:
len =
encode_context_real(&apdu[apdu_len], 1,
- data->notificationParams.
- changeOfValue.newValue.changeValue);
+ data->notificationParams.changeOfValue.
+ newValue.changeValue);
apdu_len += len;
break;
@@ -251,8 +251,8 @@ int event_notify_encode_service_request(
len =
encode_context_bitstring(&apdu[apdu_len],
0,
- &data->notificationParams.
- changeOfValue.newValue.changedBits);
+ &data->notificationParams.changeOfValue.
+ newValue.changedBits);
apdu_len += len;
break;
@@ -265,8 +265,8 @@ int event_notify_encode_service_request(
len =
encode_context_bitstring(&apdu[apdu_len], 1,
- &data->notificationParams.
- changeOfValue.statusFlags);
+ &data->notificationParams.changeOfValue.
+ statusFlags);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 2);
@@ -280,20 +280,20 @@ int event_notify_encode_service_request(
len =
encode_context_real(&apdu[apdu_len], 0,
- data->notificationParams.
- floatingLimit.referenceValue);
+ data->notificationParams.floatingLimit.
+ referenceValue);
apdu_len += len;
len =
encode_context_bitstring(&apdu[apdu_len], 1,
- &data->notificationParams.
- floatingLimit.statusFlags);
+ &data->notificationParams.floatingLimit.
+ statusFlags);
apdu_len += len;
len =
encode_context_real(&apdu[apdu_len], 2,
- data->notificationParams.
- floatingLimit.setPointValue);
+ data->notificationParams.floatingLimit.
+ setPointValue);
apdu_len += len;
len =
@@ -312,8 +312,8 @@ int event_notify_encode_service_request(
len =
encode_context_real(&apdu[apdu_len], 0,
- data->notificationParams.
- outOfRange.exceedingValue);
+ data->notificationParams.outOfRange.
+ exceedingValue);
apdu_len += len;
len =
@@ -341,26 +341,26 @@ int event_notify_encode_service_request(
len =
encode_context_enumerated(&apdu[apdu_len], 0,
- data->notificationParams.
- changeOfLifeSafety.newState);
+ data->notificationParams.changeOfLifeSafety.
+ newState);
apdu_len += len;
len =
encode_context_enumerated(&apdu[apdu_len], 1,
- data->notificationParams.
- changeOfLifeSafety.newMode);
+ data->notificationParams.changeOfLifeSafety.
+ newMode);
apdu_len += len;
len =
encode_context_bitstring(&apdu[apdu_len], 2,
- &data->notificationParams.
- changeOfLifeSafety.statusFlags);
+ &data->notificationParams.changeOfLifeSafety.
+ statusFlags);
apdu_len += len;
len =
encode_context_enumerated(&apdu[apdu_len], 3,
- data->notificationParams.
- changeOfLifeSafety.operationExpected);
+ data->notificationParams.changeOfLifeSafety.
+ operationExpected);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 8);
@@ -374,20 +374,20 @@ int event_notify_encode_service_request(
len =
bacapp_encode_context_device_obj_property_ref(&apdu
[apdu_len], 0,
- &data->notificationParams.
- bufferReady.bufferProperty);
+ &data->notificationParams.bufferReady.
+ bufferProperty);
apdu_len += len;
len =
encode_context_unsigned(&apdu[apdu_len], 1,
- data->notificationParams.
- bufferReady.previousNotification);
+ data->notificationParams.bufferReady.
+ previousNotification);
apdu_len += len;
len =
encode_context_unsigned(&apdu[apdu_len], 2,
- data->notificationParams.
- bufferReady.currentNotification);
+ data->notificationParams.bufferReady.
+ currentNotification);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 10);
@@ -399,20 +399,20 @@ int event_notify_encode_service_request(
len =
encode_context_unsigned(&apdu[apdu_len], 0,
- data->notificationParams.
- unsignedRange.exceedingValue);
+ data->notificationParams.unsignedRange.
+ exceedingValue);
apdu_len += len;
len =
encode_context_bitstring(&apdu[apdu_len], 1,
- &data->notificationParams.
- unsignedRange.statusFlags);
+ &data->notificationParams.unsignedRange.
+ statusFlags);
apdu_len += len;
len =
encode_context_unsigned(&apdu[apdu_len], 2,
- data->notificationParams.
- unsignedRange.exceededLimit);
+ data->notificationParams.unsignedRange.
+ exceededLimit);
apdu_len += len;
len = encode_closing_tag(&apdu[apdu_len], 11);
@@ -595,18 +595,16 @@ int event_notify_decode_service_request(
case EVENT_CHANGE_OF_BITSTRING:
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 0,
- &data->
- notificationParams.changeOfBitstring.
- referencedBitString))) {
+ &data->notificationParams.
+ changeOfBitstring.referencedBitString))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->
- notificationParams.changeOfBitstring.
- statusFlags))) {
+ &data->notificationParams.
+ changeOfBitstring.statusFlags))) {
return -1;
}
len += section_length;
@@ -617,16 +615,16 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
bacapp_decode_context_property_state(&apdu
[len], 0,
- &data->notificationParams.
- changeOfState.newState))) {
+ &data->notificationParams.changeOfState.
+ newState))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->notificationParams.
- changeOfState.statusFlags))) {
+ &data->notificationParams.changeOfState.
+ statusFlags))) {
return -1;
}
len += section_length;
@@ -644,9 +642,8 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 0,
- &data->
- notificationParams.changeOfValue.
- newValue.changedBits))) {
+ &data->notificationParams.
+ changeOfValue.newValue.changedBits))) {
return -1;
}
@@ -657,9 +654,8 @@ int event_notify_decode_service_request(
CHANGE_OF_VALUE_REAL)) {
if (-1 == (section_length =
decode_context_real(&apdu[len], 1,
- &data->
- notificationParams.changeOfValue.
- newValue.changeValue))) {
+ &data->notificationParams.
+ changeOfValue.newValue.changeValue))) {
return -1;
}
@@ -677,8 +673,8 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->notificationParams.
- changeOfValue.statusFlags))) {
+ &data->notificationParams.changeOfValue.
+ statusFlags))) {
return -1;
}
len += section_length;
@@ -687,31 +683,31 @@ int event_notify_decode_service_request(
case EVENT_FLOATING_LIMIT:
if (-1 == (section_length =
decode_context_real(&apdu[len], 0,
- &data->notificationParams.
- floatingLimit.referenceValue))) {
+ &data->notificationParams.floatingLimit.
+ referenceValue))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->notificationParams.
- floatingLimit.statusFlags))) {
+ &data->notificationParams.floatingLimit.
+ statusFlags))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_real(&apdu[len], 2,
- &data->notificationParams.
- floatingLimit.setPointValue))) {
+ &data->notificationParams.floatingLimit.
+ setPointValue))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_real(&apdu[len], 3,
- &data->notificationParams.
- floatingLimit.errorLimit))) {
+ &data->notificationParams.floatingLimit.
+ errorLimit))) {
return -1;
}
len += section_length;
@@ -720,31 +716,31 @@ int event_notify_decode_service_request(
case EVENT_OUT_OF_RANGE:
if (-1 == (section_length =
decode_context_real(&apdu[len], 0,
- &data->notificationParams.
- outOfRange.exceedingValue))) {
+ &data->notificationParams.outOfRange.
+ exceedingValue))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->notificationParams.
- outOfRange.statusFlags))) {
+ &data->notificationParams.outOfRange.
+ statusFlags))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_real(&apdu[len], 2,
- &data->notificationParams.
- outOfRange.deadband))) {
+ &data->notificationParams.outOfRange.
+ deadband))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_real(&apdu[len], 3,
- &data->notificationParams.
- outOfRange.exceededLimit))) {
+ &data->notificationParams.outOfRange.
+ exceededLimit))) {
return -1;
}
len += section_length;
@@ -772,9 +768,8 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 2,
- &data->
- notificationParams.changeOfLifeSafety.
- statusFlags))) {
+ &data->notificationParams.
+ changeOfLifeSafety.statusFlags))) {
return -1;
}
len += section_length;
@@ -784,8 +779,8 @@ int event_notify_decode_service_request(
&value))) {
return -1;
}
- data->notificationParams.
- changeOfLifeSafety.operationExpected =
+ data->notificationParams.changeOfLifeSafety.
+ operationExpected =
(BACNET_LIFE_SAFETY_OPERATION) value;
len += section_length;
break;
@@ -794,24 +789,24 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
bacapp_decode_context_device_obj_property_ref
(&apdu[len], 0,
- &data->notificationParams.
- bufferReady.bufferProperty))) {
+ &data->notificationParams.bufferReady.
+ bufferProperty))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_unsigned(&apdu[len], 1,
- &data->notificationParams.
- bufferReady.previousNotification))) {
+ &data->notificationParams.bufferReady.
+ previousNotification))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_unsigned(&apdu[len], 2,
- &data->notificationParams.
- bufferReady.currentNotification))) {
+ &data->notificationParams.bufferReady.
+ currentNotification))) {
return -1;
}
len += section_length;
@@ -820,24 +815,24 @@ int event_notify_decode_service_request(
case EVENT_UNSIGNED_RANGE:
if (-1 == (section_length =
decode_context_unsigned(&apdu[len], 0,
- &data->notificationParams.
- unsignedRange.exceedingValue))) {
+ &data->notificationParams.unsignedRange.
+ exceedingValue))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_bitstring(&apdu[len], 1,
- &data->notificationParams.
- unsignedRange.statusFlags))) {
+ &data->notificationParams.unsignedRange.
+ statusFlags))) {
return -1;
}
len += section_length;
if (-1 == (section_length =
decode_context_unsigned(&apdu[len], 2,
- &data->notificationParams.
- unsignedRange.exceededLimit))) {
+ &data->notificationParams.unsignedRange.
+ exceededLimit))) {
return -1;
}
len += section_length;
@@ -1096,16 +1091,16 @@ void testEventEventState(
data.eventType = EVENT_CHANGE_OF_BITSTRING;
- bitstring_init(&data.notificationParams.
- changeOfBitstring.referencedBitString);
- bitstring_set_bit(&data.notificationParams.
- changeOfBitstring.referencedBitString, 0, true);
- bitstring_set_bit(&data.notificationParams.
- changeOfBitstring.referencedBitString, 1, false);
- bitstring_set_bit(&data.notificationParams.
- changeOfBitstring.referencedBitString, 2, true);
- bitstring_set_bit(&data.notificationParams.
- changeOfBitstring.referencedBitString, 2, false);
+ bitstring_init(&data.notificationParams.changeOfBitstring.
+ referencedBitString);
+ bitstring_set_bit(&data.notificationParams.changeOfBitstring.
+ referencedBitString, 0, true);
+ bitstring_set_bit(&data.notificationParams.changeOfBitstring.
+ referencedBitString, 1, false);
+ bitstring_set_bit(&data.notificationParams.changeOfBitstring.
+ referencedBitString, 2, true);
+ bitstring_set_bit(&data.notificationParams.changeOfBitstring.
+ referencedBitString, 2, false);
bitstring_init(&data.notificationParams.changeOfBitstring.statusFlags);
@@ -1191,16 +1186,16 @@ void testEventEventState(
data.notificationParams.changeOfValue.tag = CHANGE_OF_VALUE_BITS;
- bitstring_init(&data.notificationParams.changeOfValue.
- newValue.changedBits);
- bitstring_set_bit(&data.notificationParams.changeOfValue.
- newValue.changedBits, 0, true);
- bitstring_set_bit(&data.notificationParams.changeOfValue.
- newValue.changedBits, 1, false);
- bitstring_set_bit(&data.notificationParams.changeOfValue.
- newValue.changedBits, 2, false);
- bitstring_set_bit(&data.notificationParams.changeOfValue.
- newValue.changedBits, 3, false);
+ bitstring_init(&data.notificationParams.changeOfValue.newValue.
+ changedBits);
+ bitstring_set_bit(&data.notificationParams.changeOfValue.newValue.
+ changedBits, 0, true);
+ bitstring_set_bit(&data.notificationParams.changeOfValue.newValue.
+ changedBits, 1, false);
+ bitstring_set_bit(&data.notificationParams.changeOfValue.newValue.
+ changedBits, 2, false);
+ bitstring_set_bit(&data.notificationParams.changeOfValue.newValue.
+ changedBits, 3, false);
memset(buffer, 0, MAX_APDU);
inLen = event_notify_encode_service_request(&buffer[0], &data);
@@ -1440,12 +1435,12 @@ void testEventEventState(
data.notificationParams.bufferReady.currentNotification = 2345;
data.notificationParams.bufferReady.bufferProperty.deviceIndentifier.type =
OBJECT_DEVICE;
- data.notificationParams.bufferReady.bufferProperty.
- deviceIndentifier.instance = 500;
+ data.notificationParams.bufferReady.bufferProperty.deviceIndentifier.
+ instance = 500;
data.notificationParams.bufferReady.bufferProperty.objectIdentifier.type =
OBJECT_ANALOG_INPUT;
- data.notificationParams.bufferReady.bufferProperty.
- objectIdentifier.instance = 100;
+ data.notificationParams.bufferReady.bufferProperty.objectIdentifier.
+ instance = 100;
data.notificationParams.bufferReady.bufferProperty.propertyIdentifier =
PROP_PRESENT_VALUE;
data.notificationParams.bufferReady.bufferProperty.arrayIndex = 0;
@@ -1470,34 +1465,34 @@ void testEventEventState(
ct_test(pTest,
- data.notificationParams.bufferReady.bufferProperty.
- deviceIndentifier.type ==
- data2.notificationParams.bufferReady.bufferProperty.
- deviceIndentifier.type);
+ data.notificationParams.bufferReady.bufferProperty.deviceIndentifier.
+ type ==
+ data2.notificationParams.bufferReady.bufferProperty.deviceIndentifier.
+ type);
+
+ ct_test(pTest,
+ data.notificationParams.bufferReady.bufferProperty.deviceIndentifier.
+ instance ==
+ data2.notificationParams.bufferReady.bufferProperty.deviceIndentifier.
+ instance);
+
+ ct_test(pTest,
+ data.notificationParams.bufferReady.bufferProperty.objectIdentifier.
+ instance ==
+ data2.notificationParams.bufferReady.bufferProperty.objectIdentifier.
+ instance);
+
+ ct_test(pTest,
+ data.notificationParams.bufferReady.bufferProperty.objectIdentifier.
+ type ==
+ data2.notificationParams.bufferReady.bufferProperty.objectIdentifier.
+ type);
ct_test(pTest,
data.notificationParams.bufferReady.bufferProperty.
- deviceIndentifier.instance ==
+ propertyIdentifier ==
data2.notificationParams.bufferReady.bufferProperty.
- deviceIndentifier.instance);
-
- ct_test(pTest,
- data.notificationParams.bufferReady.bufferProperty.
- objectIdentifier.instance ==
- data2.notificationParams.bufferReady.bufferProperty.
- objectIdentifier.instance);
-
- ct_test(pTest,
- data.notificationParams.bufferReady.bufferProperty.
- objectIdentifier.type ==
- data2.notificationParams.bufferReady.bufferProperty.
- objectIdentifier.type);
-
- ct_test(pTest,
- data.notificationParams.bufferReady.
- bufferProperty.propertyIdentifier ==
- data2.notificationParams.bufferReady.
- bufferProperty.propertyIdentifier);
+ propertyIdentifier);
ct_test(pTest,
data.notificationParams.bufferReady.bufferProperty.arrayIndex ==