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

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
+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
+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);
}