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

Changed the object type print to be as defined in EPICS.

Browse Source 
Changed property names to show "proprietary #" when in proprietary range.
This commit is contained in:
skarg
2009-10-15 04:06:19 +00:00
parent deba2aab3e
commit a7c598306b
4 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_rpm_a.c
+8 -2
View File
@@ -206,8 +206,14 @@ static void PrintReadPropertyMultipleData(
listOfProperties = rpm_data->listOfProperties;
while (listOfProperties) {
#if PRINT_ENABLED
fprintf(stdout, " %s: ",
bactext_property_name(listOfProperties->propertyIdentifier));
if (listOfProperties->propertyIdentifier < 512) {
fprintf(stdout, " %s: ",
bactext_property_name(
listOfProperties->propertyIdentifier));
} else {
fprintf(stdout, " proprietary %u: ",
listOfProperties->propertyIdentifier);
}
#endif
if (listOfProperties->propertyArrayIndex != BACNET_ARRAY_ALL) {
#if PRINT_ENABLED
bacnet-stack/demo/handler/h_ucov.c
+7 -2
View File
@@ -70,8 +70,13 @@ void handler_ucov_notification(
bactext_object_type_name(cov_data.monitoredObjectIdentifier.type),
cov_data.monitoredObjectIdentifier.instance);
fprintf(stderr, "time remaining=%u seconds ", cov_data.timeRemaining);
fprintf(stderr, "%s ",
bactext_property_name(property_value.propertyIdentifier));
if (property_value.propertyIdentifier < 512) {
fprintf(stderr, "%s ",
bactext_property_name(property_value.propertyIdentifier));
} else {
fprintf(stderr, "proprietary %u ",
property_value.propertyIdentifier);
}
if (property_value.propertyArrayIndex != BACNET_ARRAY_ALL) {
fprintf(stderr, "%u ", property_value.propertyArrayIndex);
}
bacnet-stack/include/bacenum.h
+1
View File
@@ -903,6 +903,7 @@ typedef enum {
/* the procedures and constraints described in Clause 23. */
} BACNET_OBJECT_TYPE;
/* used for bit string loop */
#define PROPRIETARY_BACNET_OBJECT_TYPE 128
#define MAX_BACNET_OBJECT_TYPE 1023
typedef enum {
bacnet-stack/src/bacapp.c
+32 -8
View File
@@ -847,17 +847,31 @@ bool bacapp_print_value(
case BACNET_APPLICATION_TAG_ENUMERATED:
switch (property) {
case PROP_OBJECT_TYPE:
fprintf(stream, "%s",
bactext_object_type_name(value->type.Enumerated));
if (value->type.Enumerated < MAX_ASHRAE_OBJECT_TYPE) {
fprintf(stream, "%s",
bactext_object_type_name(
value->type.Enumerated));
} else if (value->type.Enumerated < 128) {
fprintf(stream, "reserved %u",
value->type.Enumerated);
} else {
fprintf(stream, "proprietary %u",
value->type.Enumerated);
}
break;
case PROP_EVENT_STATE:
fprintf(stream, "%s",
bactext_event_state_name(value->type.Enumerated));
break;
case PROP_UNITS:
fprintf(stream, "%s",
bactext_engineering_unit_name(value->type.
Enumerated));
if (value->type.Enumerated < 256) {
fprintf(stream, "%s",
bactext_engineering_unit_name(value->type.
Enumerated));
} else {
fprintf(stream, "proprietary %u",value->type.
Enumerated);
}
break;
case PROP_PRESENT_VALUE:
fprintf(stream, "%s",
@@ -921,9 +935,19 @@ bool bacapp_print_value(
}
break;
case BACNET_APPLICATION_TAG_OBJECT_ID:
fprintf(stream, "%s %u",
bactext_object_type_name(value->type.Object_Id.type),
value->type.Object_Id.instance);
if (value->type.Object_Id.type < MAX_ASHRAE_OBJECT_TYPE) {
fprintf(stream, "(%s, %u)",
bactext_object_type_name(value->type.Object_Id.type),
value->type.Object_Id.instance);
} else if (value->type.Object_Id.type < 128) {
fprintf(stream, "(reserved %u, %u)",
value->type.Object_Id.type,
value->type.Object_Id.instance);
} else {
fprintf(stream, "(proprietary %u, %u)",
value->type.Object_Id.type,
value->type.Object_Id.instance);
}
break;
default:
status = false;