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

Commented the demo/server in a new module.

Browse Source 
Embedded its PICS in the server documentation (hopefully a good idea).
Added a PrettyPrintPropertyValue() function to the epics program (hopefully OK format).
Added a function apdu_service_supported_to_index() to the apdu code to translate a SERVICE_SUPPORTED_ enum to its SERVICE_CONFIRMED_ or SERVICE_UNCONFIRMED_ index, and used it when PrettyPrinting services.
This commit is contained in:
tbrennan3
2010-03-23 04:55:11 +00:00
parent 35f0a52d51
commit 5a99f0662c
4 changed files with 218 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/epics/main.c
+86 -1
View File
@@ -135,6 +135,85 @@ void MyRejectHandler(
Error_Detected = true;
}
/** Provide a nicer output for Supported Services and Object Types.
*
* @param stream
* @param value
* @param property
* @return
*/
bool PrettyPrintPropertyValue(
FILE * stream,
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property)
{
bool status = true; /*return value */
size_t len = 0, i = 0, j = 0;
if ( (value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING) &&
( (property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED) ||
(property == PROP_PROTOCOL_SERVICES_SUPPORTED) ) )
{
len = bitstring_bits_used(&value->type.Bit_String);
fprintf(stream, "{ \r\n ");
for (i = 0; i < len; i++) {
fprintf(stream, "%s",
bitstring_bit(&value->type.Bit_String,
(uint8_t) i) ? " true" : "false");
if (i < len - 1)
fprintf(stream, ",");
else
fprintf(stream, " ");
if ( (i == (len-1) ) || ( (i % 8) == 7 ) ) // line break every 8
{
fprintf(stream, " # ");
// Now rerun the same 8 bits, but print labels for true ones
for ( j = i - (i%8); j <= i; j++)
{
if ( bitstring_bit(&value->type.Bit_String, (uint8_t) j) )
{
if (property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED)
fprintf( stream, " %s,", bactext_object_type_name(j) );
// PROP_PROTOCOL_SERVICES_SUPPORTED
else
{
bool bIsConfirmed;
size_t newIndex;
if ( apdu_service_supported_to_index( j,
&newIndex, &bIsConfirmed ) )
{
if ( bIsConfirmed )
fprintf( stream, " %s,",
bactext_confirmed_service_name(newIndex) );
else
fprintf( stream, " %s,",
bactext_unconfirmed_service_name(
(newIndex) ) );
}
}
}
else // not supported
fprintf( stream, "," );
}
fprintf(stream, "\r\n ");
}
}
fprintf(stream, "}");
}
else
{
/* How did I get here? Fix your code. */
/* Meanwhile, a safe fallback plan */
status = bacapp_print_value(stdout, value, property);
}
return status;
}
void PrintReadPropertyData(
BACNET_READ_PROPERTY_DATA * data)
{
@@ -198,7 +277,13 @@ void PrintReadPropertyData(
fprintf(stdout, "\r\n");
}
}
} else {
}
else if ( (data->object_property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED) ||
(data->object_property == PROP_PROTOCOL_SERVICES_SUPPORTED) )
{
PrettyPrintPropertyValue(stdout, &value, data->object_property);
}
else {
bacapp_print_value(stdout, &value, data->object_property);
}
if (len) {