Corrected SourceForge.net bug ID: 2783175. Changed the way that Time and Date unspecified values were printed in bacapp. Thank you piotrek ( bacpack )!

This commit is contained in:
skarg
2009-05-03 11:34:50 +00:00
parent 0d9aafe92d
commit 83392d0a4d
2 changed files with 42 additions and 9 deletions
+38 -9
View File
@@ -803,18 +803,47 @@ bool bacapp_print_value(
} }
break; break;
case BACNET_APPLICATION_TAG_DATE: case BACNET_APPLICATION_TAG_DATE:
fprintf(stream, "%s, %s %u, %u", fprintf(stream, "%s, %s ",
bactext_day_of_week_name(value->type.Date.wday), bactext_day_of_week_name(value->type.Date.wday),
bactext_month_name(value->type.Date.month), bactext_month_name(value->type.Date.month));
(unsigned) value->type.Date.day, if (value->type.Date.day == 255) {
(unsigned) value->type.Date.year); fprintf(stream, "(unspecified), ");
} else {
fprintf(stream, "%u, ",
(unsigned) value->type.Date.day);
}
if (value->type.Date.year == 255) {
fprintf(stream, "(unspecified), ");
} else {
fprintf(stream, "%u",
(unsigned) value->type.Date.year);
}
break; break;
case BACNET_APPLICATION_TAG_TIME: case BACNET_APPLICATION_TAG_TIME:
fprintf(stream, "%02u:%02u:%02u.%03u", if (value->type.Time.hour == 255) {
(unsigned) value->type.Time.hour, fprintf(stream, "**:");
(unsigned) value->type.Time.min, } else {
(unsigned) value->type.Time.sec, fprintf(stream, "%02u:",
(unsigned) value->type.Time.hundredths); (unsigned) value->type.Time.hour);
}
if (value->type.Time.min == 255) {
fprintf(stream, "**:");
} else {
fprintf(stream, "%02u:",
(unsigned) value->type.Time.min);
}
if (value->type.Time.sec == 255) {
fprintf(stream, "**.");
} else {
fprintf(stream, "%02u.",
(unsigned) value->type.Time.sec);
}
if (value->type.Time.hundredths == 255) {
fprintf(stream, "**");
} else {
fprintf(stream, "%02u",
(unsigned) value->type.Time.hundredths);
}
break; break;
case BACNET_APPLICATION_TAG_OBJECT_ID: case BACNET_APPLICATION_TAG_OBJECT_ID:
fprintf(stream, "%s %u", fprintf(stream, "%s %u",
+4
View File
@@ -1628,6 +1628,10 @@ INDTEXT_DATA bacnet_month_names[] = {
, ,
{12, "December"} {12, "December"}
, ,
{13, "Odd Months"}
,
{14, "Even Months"}
,
{255, "Any Month"} {255, "Any Month"}
, ,
{0, NULL} {0, NULL}