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

Indented using indent script.

Browse Source
This commit is contained in:
skarg
2010-05-04 21:06:26 +00:00
parent b2368acc27
commit 710cfccfef
134 changed files with 2901 additions and 3035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/epics/main.c
+205 -260
View File
@@ -132,7 +132,8 @@ static void MyErrorHandler(
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
#if PRINT_ERRORS #if PRINT_ERRORS
printf("-- BACnet Error: %s: %s\r\n", bactext_error_class_name(error_class), printf("-- BACnet Error: %s: %s\r\n",
bactext_error_class_name(error_class),
bactext_error_code_name(error_code)); bactext_error_code_name(error_code));
#else #else
(void) error_class; (void) error_class;
@@ -153,8 +154,9 @@ void MyAbortHandler(
(void) server; (void) server;
#if PRINT_ERRORS #if PRINT_ERRORS
/* It is normal for this to fail, so don't print. */ /* It is normal for this to fail, so don't print. */
if ( ( myState != GET_ALL_RESPONSE ) && !IsLongArray ) if ((myState != GET_ALL_RESPONSE) && !IsLongArray)
printf("-- BACnet Abort: %s ", bactext_abort_reason_name(abort_reason)); printf("-- BACnet Abort: %s ",
bactext_abort_reason_name(abort_reason));
#else #else
(void) abort_reason; (void) abort_reason;
#endif #endif
@@ -198,12 +200,10 @@ void MyReadPropertyAckHandler(
sizeof(BACNET_CONFIRMED_SERVICE_ACK_DATA)); sizeof(BACNET_CONFIRMED_SERVICE_ACK_DATA));
Read_Property_Multiple_Data.rpm_data = rp_data; Read_Property_Multiple_Data.rpm_data = rp_data;
Read_Property_Multiple_Data.new_data = true; Read_Property_Multiple_Data.new_data = true;
} } else {
else if (len < 0) /* Eg, failed due to no segmentation */
{
if ( len < 0 ) /* Eg, failed due to no segmentation */
Error_Detected = true; Error_Detected = true;
free( rp_data ); free(rp_data);
} }
} }
@@ -229,14 +229,12 @@ void MyReadPropertyMultipleAckHandler(
Read_Property_Multiple_Data.rpm_data = rpm_data; Read_Property_Multiple_Data.rpm_data = rpm_data;
Read_Property_Multiple_Data.new_data = true; Read_Property_Multiple_Data.new_data = true;
/* Will process and free the RPM data later */ /* Will process and free the RPM data later */
} } else {
else if (len < 0) /* Eg, failed due to no segmentation */
{
if ( len < 0 ) /* Eg, failed due to no segmentation */
Error_Detected = true; Error_Detected = true;
free( rpm_data ); free(rpm_data);
}
} }
}
static void Init_Service_Handlers( static void Init_Service_Handlers(
void) void)
@@ -279,7 +277,7 @@ static void Init_Service_Handlers(
* @return True if success. Or otherwise. * @return True if success. Or otherwise.
*/ */
bool PrettyPrintPropertyValue( bool PrettyPrintPropertyValue(
FILE * stream, FILE * stream,
BACNET_APPLICATION_DATA_VALUE * value, BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property) BACNET_PROPERTY_ID property)
@@ -287,66 +285,57 @@ static void Init_Service_Handlers(
bool status = true; /*return value */ bool status = true; /*return value */
size_t len = 0, i = 0, j = 0; size_t len = 0, i = 0, j = 0;
if ( (value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING) && if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING) &&
( (property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED) || ((property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED) ||
(property == PROP_PROTOCOL_SERVICES_SUPPORTED) ) ) (property == PROP_PROTOCOL_SERVICES_SUPPORTED))) {
{
len = bitstring_bits_used(&value->type.Bit_String); len = bitstring_bits_used(&value->type.Bit_String);
fprintf(stream, "( \r\n "); fprintf(stream, "( \r\n ");
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
fprintf(stream, "%s", fprintf(stream, "%s", bitstring_bit(&value->type.Bit_String,
bitstring_bit(&value->type.Bit_String,
(uint8_t) i) ? "T" : "F"); (uint8_t) i) ? "T" : "F");
if (i < len - 1) if (i < len - 1)
fprintf(stream, ","); fprintf(stream, ",");
else else
fprintf(stream, " "); fprintf(stream, " ");
/* Tried with 8 per line, but with the comments, got way too long. */ /* Tried with 8 per line, but with the comments, got way too long. */
if ( (i == (len-1) ) || ( (i % 4) == 3 ) ) /* line break every 4 */ if ((i == (len - 1)) || ((i % 4) == 3)) { /* line break every 4 */
{
fprintf(stream, " -- "); /* EPICS comments begin with "--" */ fprintf(stream, " -- "); /* EPICS comments begin with "--" */
/* Now rerun the same 4 bits, but print labels for true ones */ /* Now rerun the same 4 bits, but print labels for true ones */
for ( j = i - (i%4); j <= i; j++) for (j = i - (i % 4); j <= i; j++) {
{ if (bitstring_bit(&value->type.Bit_String, (uint8_t) j)) {
if ( bitstring_bit(&value->type.Bit_String, (uint8_t) j) )
{
if (property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED) if (property == PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED)
fprintf( stream, " %s,", bactext_object_type_name(j) ); fprintf(stream, " %s,",
bactext_object_type_name(j));
/* PROP_PROTOCOL_SERVICES_SUPPORTED */ /* PROP_PROTOCOL_SERVICES_SUPPORTED */
else else {
{
bool bIsConfirmed; bool bIsConfirmed;
size_t newIndex; size_t newIndex;
if ( apdu_service_supported_to_index( j, if (apdu_service_supported_to_index(j, &newIndex,
&newIndex, &bIsConfirmed ) ) &bIsConfirmed)) {
{ if (bIsConfirmed)
if ( bIsConfirmed ) fprintf(stream, " %s,",
fprintf( stream, " %s,", bactext_confirmed_service_name
bactext_confirmed_service_name(newIndex) ); (newIndex));
else else
fprintf( stream, " %s,", fprintf(stream, " %s,",
bactext_unconfirmed_service_name( bactext_unconfirmed_service_name(
(newIndex) ) ); (newIndex)));
} }
} }
} } else /* not supported */
else /* not supported */ fprintf(stream, ",");
fprintf( stream, "," );
} }
fprintf(stream, "\r\n "); fprintf(stream, "\r\n ");
} }
} }
fprintf(stream, ") \r\n"); fprintf(stream, ") \r\n");
} } else if (value != NULL) {
else if ( value != NULL ) assert(false); /* How did I get here? Fix your code. */
{
assert( false ); /* How did I get here? Fix your code. */
/* Meanwhile, a fallback plan */ /* Meanwhile, a fallback plan */
status = bacapp_print_value(stdout, value, property); status = bacapp_print_value(stdout, value, property);
} } else
else
fprintf(stream, "? \r\n"); fprintf(stream, "? \r\n");
return status; return status;
@@ -362,98 +351,84 @@ static void Init_Service_Handlers(
* Value, and Error information. * Value, and Error information.
*/ */
void PrintReadPropertyData( void PrintReadPropertyData(
BACNET_PROPERTY_REFERENCE *rpm_property) BACNET_PROPERTY_REFERENCE * rpm_property)
{ {
BACNET_APPLICATION_DATA_VALUE *value, *old_value; BACNET_APPLICATION_DATA_VALUE *value, *old_value;
bool print_brace = false; bool print_brace = false;
KEY object_list_element; KEY object_list_element;
bool isSequence = false; /* Ie, will need bracketing braces {} */ bool isSequence = false; /* Ie, will need bracketing braces {} */
if (rpm_property == NULL ) if (rpm_property == NULL) {
{ fprintf(stdout, " -- Null Property data \r\n");
fprintf( stdout, " -- Null Property data \r\n" );
return; return;
} }
value = rpm_property->value; value = rpm_property->value;
if ( value == NULL ) if (value == NULL) {
{
/* Then we print the error information */ /* Then we print the error information */
fprintf(stdout, "? -- BACnet Error: %s: %s\r\n", fprintf(stdout, "? -- BACnet Error: %s: %s\r\n",
bactext_error_class_name((int) rpm_property->error.error_class), bactext_error_class_name((int) rpm_property->error.error_class),
bactext_error_code_name((int) rpm_property->error.error_code)); bactext_error_code_name((int) rpm_property->error.error_code));
return; return;
} }
#if 0 #if 0
if (data->array_index == BACNET_ARRAY_ALL) if (data->array_index == BACNET_ARRAY_ALL)
fprintf(stderr, "%s #%u %s\n", fprintf(stderr, "%s #%u %s\n",
bactext_object_type_name(data->object_type), bactext_object_type_name(data->object_type), data->object_instance,
data->object_instance,
bactext_property_name(data->object_property)); bactext_property_name(data->object_property));
else else
fprintf(stderr, "%s #%u %s[%d]\n", fprintf(stderr, "%s #%u %s[%d]\n",
bactext_object_type_name(data->object_type), bactext_object_type_name(data->object_type), data->object_instance,
data->object_instance, bactext_property_name(data->object_property), data->array_index);
bactext_property_name(data->object_property),
data->array_index);
#endif #endif
if( ( value != NULL ) && ( value->next != NULL ) ) if ((value != NULL) && (value->next != NULL)) {
{
/* Then this is an array of values; open brace */ /* Then this is an array of values; open brace */
fprintf(stdout, "{ "); fprintf(stdout, "{ ");
print_brace = true; /* remember to close it */ print_brace = true; /* remember to close it */
} }
if ( !Using_Walked_List ) if (!Using_Walked_List)
Walked_List_Index = Walked_List_Length = 0; /* In case we need this. */ Walked_List_Index = Walked_List_Length = 0; /* In case we need this. */
/* value(s) loop until there is no "next" ... */ /* value(s) loop until there is no "next" ... */
while ( value != NULL ) while (value != NULL) {
{ switch (rpm_property->propertyIdentifier) {
switch( rpm_property->propertyIdentifier )
{
/* These are all arrays, so they open and close with braces */ /* These are all arrays, so they open and close with braces */
case PROP_OBJECT_LIST: case PROP_OBJECT_LIST:
case PROP_STATE_TEXT: case PROP_STATE_TEXT:
case PROP_STRUCTURED_OBJECT_LIST: case PROP_STRUCTURED_OBJECT_LIST:
case PROP_SUBORDINATE_ANNOTATIONS: case PROP_SUBORDINATE_ANNOTATIONS:
case PROP_SUBORDINATE_LIST: case PROP_SUBORDINATE_LIST:
if ( Using_Walked_List ) if (Using_Walked_List) {
{ if ((rpm_property->propertyArrayIndex == 0) &&
if ( (rpm_property->propertyArrayIndex == 0) && (value->tag == BACNET_APPLICATION_TAG_UNSIGNED_INT)) {
(value->tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) )
{
/* Grab the value of the Object List length - don't print it! */ /* Grab the value of the Object List length - don't print it! */
Walked_List_Length = value->type.Unsigned_Int; Walked_List_Length = value->type.Unsigned_Int;
if ( rpm_property->propertyIdentifier == PROP_OBJECT_LIST) if (rpm_property->propertyIdentifier ==
PROP_OBJECT_LIST)
Object_List_Length = value->type.Unsigned_Int; Object_List_Length = value->type.Unsigned_Int;
break; break;
} } else
else assert(Walked_List_Index ==
assert( Walked_List_Index == rpm_property->propertyArrayIndex); rpm_property->propertyArrayIndex);
} } else {
else
{
Walked_List_Index++; Walked_List_Index++;
/* If we got the whole Object List array in one RP call, keep /* If we got the whole Object List array in one RP call, keep
* the Index and List_Length in sync as we cycle through. */ * the Index and List_Length in sync as we cycle through. */
if ( rpm_property->propertyIdentifier == PROP_OBJECT_LIST) if (rpm_property->propertyIdentifier == PROP_OBJECT_LIST)
Object_List_Length = ++Object_List_Index; Object_List_Length = ++Object_List_Index;
} }
if ( Walked_List_Index == 1 ) if (Walked_List_Index == 1) {
{
/* Open this Array of Objects for the first entry (unless /* Open this Array of Objects for the first entry (unless
* opening brace has already printed, since this is an array * opening brace has already printed, since this is an array
* of values[] ) */ * of values[] ) */
if( value->next == NULL ) if (value->next == NULL)
fprintf(stdout, "{ \r\n "); fprintf(stdout, "{ \r\n ");
else else
fprintf(stdout, "\r\n "); fprintf(stdout, "\r\n ");
} }
if ( rpm_property->propertyIdentifier == PROP_OBJECT_LIST) if (rpm_property->propertyIdentifier == PROP_OBJECT_LIST) {
{ if (value->tag != BACNET_APPLICATION_TAG_OBJECT_ID) {
if ( value->tag != BACNET_APPLICATION_TAG_OBJECT_ID ) { assert(false); /* Something not right here */
assert( false ); /* Something not right here */
break; break;
} }
/* Store the object list so we can interrogate /* Store the object list so we can interrogate
@@ -463,26 +438,24 @@ void PrintReadPropertyData(
value->type.Object_Id.instance); value->type.Object_Id.instance);
/* We don't have anything to put in the data pointer /* We don't have anything to put in the data pointer
* yet, so just leave it null. The key is Key here. */ * yet, so just leave it null. The key is Key here. */
Keylist_Data_Add( Object_List, object_list_element, NULL ); Keylist_Data_Add(Object_List, object_list_element, NULL);
} } else if (rpm_property->propertyIdentifier == PROP_STATE_TEXT) {
else if ( rpm_property->propertyIdentifier == PROP_STATE_TEXT )
{
/* Make sure it fits within 31 chars for original VTS3 limitation. /* Make sure it fits within 31 chars for original VTS3 limitation.
* If longer, take first 15 dash, and last 15 chars. */ * If longer, take first 15 dash, and last 15 chars. */
if ( value->type.Character_String.length > 31 ) if (value->type.Character_String.length > 31) {
{ int iLast15idx =
int iLast15idx = value->type.Character_String.length - 15; value->type.Character_String.length - 15;
value->type.Character_String.value[15] = '-'; value->type.Character_String.value[15] = '-';
memcpy( &value->type.Character_String.value[16], memcpy(&value->type.Character_String.value[16],
&value->type.Character_String.value[iLast15idx], 15 ); &value->type.Character_String.value[iLast15idx],
15);
value->type.Character_String.value[31] = 0; value->type.Character_String.value[31] = 0;
value->type.Character_String.length = 31; value->type.Character_String.length = 31;
} }
} } else if (rpm_property->propertyIdentifier ==
else if ( rpm_property->propertyIdentifier == PROP_SUBORDINATE_LIST) PROP_SUBORDINATE_LIST) {
{ if (value->tag != BACNET_APPLICATION_TAG_OBJECT_ID) {
if ( value->tag != BACNET_APPLICATION_TAG_OBJECT_ID ) { assert(false); /* Something not right here */
assert( false ); /* Something not right here */
break; break;
} }
/* TODO: handle Sequence of { Device ObjID, Object ID }, */ /* TODO: handle Sequence of { Device ObjID, Object ID }, */
@@ -490,15 +463,15 @@ void PrintReadPropertyData(
} }
/* If the object is a Sequence, it needs its own bracketing braces */ /* If the object is a Sequence, it needs its own bracketing braces */
if ( isSequence ) if (isSequence)
fprintf(stdout, "{"); fprintf(stdout, "{");
bacapp_print_value(stdout, value, rpm_property->propertyIdentifier ); bacapp_print_value(stdout, value,
if ( isSequence ) rpm_property->propertyIdentifier);
if (isSequence)
fprintf(stdout, "}"); fprintf(stdout, "}");
if ( ( Walked_List_Index < Walked_List_Length ) || if ((Walked_List_Index < Walked_List_Length) ||
( value->next != NULL ) ) (value->next != NULL)) {
{
/* There are more. */ /* There are more. */
fprintf(stdout, ", "); fprintf(stdout, ", ");
if (!(Walked_List_Index % 4)) if (!(Walked_List_Index % 4))
@@ -510,14 +483,14 @@ void PrintReadPropertyData(
case PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED: case PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED:
case PROP_PROTOCOL_SERVICES_SUPPORTED: case PROP_PROTOCOL_SERVICES_SUPPORTED:
PrettyPrintPropertyValue(stdout, value, rpm_property->propertyIdentifier); PrettyPrintPropertyValue(stdout, value,
rpm_property->propertyIdentifier);
break; break;
default: default:
/* Some properties are presented just as '?' in an EPICS; /* Some properties are presented just as '?' in an EPICS;
* screen these out here, unless ShowValues is true. */ * screen these out here, unless ShowValues is true. */
switch( rpm_property->propertyIdentifier ) switch (rpm_property->propertyIdentifier) {
{
case PROP_DEVICE_ADDRESS_BINDING: case PROP_DEVICE_ADDRESS_BINDING:
case PROP_DAYLIGHT_SAVINGS_STATUS: case PROP_DAYLIGHT_SAVINGS_STATUS:
case PROP_LOCAL_DATE: case PROP_LOCAL_DATE:
@@ -527,22 +500,20 @@ void PrintReadPropertyData(
case PROP_RELIABILITY: case PROP_RELIABILITY:
case PROP_UTC_OFFSET: case PROP_UTC_OFFSET:
case PROP_DATABASE_REVISION: case PROP_DATABASE_REVISION:
if ( !ShowValues ) if (!ShowValues) {
{
fprintf(stdout, "?"); fprintf(stdout, "?");
break; break;
} }
/* Else, fall through and print value: */ /* Else, fall through and print value: */
default: default:
bacapp_print_value(stdout, value, rpm_property->propertyIdentifier); bacapp_print_value(stdout, value,
rpm_property->propertyIdentifier);
break; break;
} }
if ( value->next != NULL ) { if (value->next != NULL) {
/* there's more! */ /* there's more! */
fprintf(stdout, ","); fprintf(stdout, ",");
} } else {
else
{
if (print_brace) { if (print_brace) {
/* Closing brace for this multi-valued array */ /* Closing brace for this multi-valued array */
fprintf(stdout, " }"); fprintf(stdout, " }");
@@ -554,7 +525,7 @@ void PrintReadPropertyData(
old_value = value; old_value = value;
value = value->next; /* next or NULL */ value = value->next; /* next or NULL */
free( old_value ); free(old_value);
} /* End while loop */ } /* End while loop */
} }
@@ -571,40 +542,33 @@ void PrintReadPropertyData(
*/ */
static uint8_t Read_Properties( static uint8_t Read_Properties(
uint32_t device_instance, uint32_t device_instance,
BACNET_OBJECT_ID *pMyObject ) BACNET_OBJECT_ID * pMyObject)
{ {
uint8_t invoke_id = 0; uint8_t invoke_id = 0;
struct special_property_list_t PropertyListStruct; struct special_property_list_t PropertyListStruct;
if ( Property_List_Length == 0 ) if (Property_List_Length == 0) {
{
/* If we failed to get the Properties with RPM, just settle for what we /* If we failed to get the Properties with RPM, just settle for what we
* know is the fixed list of Required (only) properties. * know is the fixed list of Required (only) properties.
* In practice, this should only happen for simple devices that don't * In practice, this should only happen for simple devices that don't
* implement RPM or have really limited MAX_APDU size. * implement RPM or have really limited MAX_APDU size.
*/ */
Device_Objects_Property_List( pMyObject->type, &PropertyListStruct); Device_Objects_Property_List(pMyObject->type, &PropertyListStruct);
pPropList = PropertyListStruct.Required.pList; pPropList = PropertyListStruct.Required.pList;
if ( pPropList != NULL ) if (pPropList != NULL) {
{
Property_List_Length = PropertyListStruct.Required.count; Property_List_Length = PropertyListStruct.Required.count;
} else {
fprintf(stdout, " -- No Properties available for %s \r\n",
bactext_object_type_name(pMyObject->type));
} }
else } else
{
fprintf( stdout, " -- No Properties available for %s \r\n",
bactext_object_type_name( pMyObject->type ) );
}
}
else
pPropList = Property_List; pPropList = Property_List;
if ( (pPropList != NULL ) && ( pPropList[Property_List_Index] != -1) ) if ((pPropList != NULL) && (pPropList[Property_List_Index] != -1)) {
{
int prop = pPropList[Property_List_Index]; int prop = pPropList[Property_List_Index];
int32_t array_index; int32_t array_index;
IsLongArray = false; IsLongArray = false;
if ( Using_Walked_List ) if (Using_Walked_List) {
{
if (Walked_List_Length == 0) { if (Walked_List_Length == 0) {
/* printf(" %s: ", bactext_property_name( prop ) ); */ /* printf(" %s: ", bactext_property_name( prop ) ); */
array_index = 0; array_index = 0;
@@ -612,11 +576,10 @@ static uint8_t Read_Properties(
array_index = Walked_List_Index; array_index = Walked_List_Index;
} }
} else { } else {
printf(" %s: ", bactext_property_name( prop ) ); printf(" %s: ", bactext_property_name(prop));
array_index = BACNET_ARRAY_ALL; array_index = BACNET_ARRAY_ALL;
switch( prop ) switch (prop) {
{
/* These are all potentially long arrays, so they may abort */ /* These are all potentially long arrays, so they may abort */
case PROP_OBJECT_LIST: case PROP_OBJECT_LIST:
case PROP_STATE_TEXT: case PROP_STATE_TEXT:
@@ -628,9 +591,8 @@ static uint8_t Read_Properties(
} }
} }
invoke_id = invoke_id =
Send_Read_Property_Request(device_instance, Send_Read_Property_Request(device_instance, pMyObject->type,
pMyObject->type, pMyObject->instance, pMyObject->instance, prop, array_index);
prop, array_index );
} }
@@ -648,7 +610,7 @@ static uint8_t Read_Properties(
*/ */
EPICS_STATES ProcessRPMData( EPICS_STATES ProcessRPMData(
BACNET_READ_ACCESS_DATA * rpm_data, BACNET_READ_ACCESS_DATA * rpm_data,
EPICS_STATES myState ) EPICS_STATES myState)
{ {
BACNET_READ_ACCESS_DATA *old_rpm_data; BACNET_READ_ACCESS_DATA *old_rpm_data;
BACNET_PROPERTY_REFERENCE *rpm_property; BACNET_PROPERTY_REFERENCE *rpm_property;
@@ -662,16 +624,13 @@ EPICS_STATES ProcessRPMData(
bool bHasObjectList = false; bool bHasObjectList = false;
bool bHasStructuredViewList = false; bool bHasStructuredViewList = false;
while (rpm_data) while (rpm_data) {
{
rpm_property = rpm_data->listOfProperties; rpm_property = rpm_data->listOfProperties;
while (rpm_property) { while (rpm_property) {
/* For the GET_LIST_OF_ALL_RESPONSE case, /* For the GET_LIST_OF_ALL_RESPONSE case,
* just keep what property this was */ * just keep what property this was */
if ( myState == GET_LIST_OF_ALL_RESPONSE ) if (myState == GET_LIST_OF_ALL_RESPONSE) {
{ switch (rpm_property->propertyIdentifier) {
switch ( rpm_property->propertyIdentifier )
{
case PROP_OBJECT_LIST: case PROP_OBJECT_LIST:
bHasObjectList = true; /* Will append below */ bHasObjectList = true; /* Will append below */
break; break;
@@ -679,7 +638,7 @@ EPICS_STATES ProcessRPMData(
bHasStructuredViewList = true; bHasStructuredViewList = true;
break; break;
default: default:
Property_List[ Property_List_Index++ ] = Property_List[Property_List_Index++] =
rpm_property->propertyIdentifier; rpm_property->propertyIdentifier;
Property_List_Length++; Property_List_Length++;
break; break;
@@ -691,12 +650,10 @@ EPICS_STATES ProcessRPMData(
value = value->next; value = value->next;
free(old_value); free(old_value);
} }
} } else {
else printf(" %s: ",
{ bactext_property_name(rpm_property->propertyIdentifier));
printf(" %s: ", bactext_property_name( PrintReadPropertyData(rpm_property);
rpm_property->propertyIdentifier) );
PrintReadPropertyData( rpm_property );
} }
old_rpm_property = rpm_property; old_rpm_property = rpm_property;
rpm_property = rpm_property->next; rpm_property = rpm_property->next;
@@ -708,44 +665,45 @@ EPICS_STATES ProcessRPMData(
} }
/* Now determine the next state */ /* Now determine the next state */
if ( bSuccess && ( myState == GET_ALL_RESPONSE) ) if (bSuccess && (myState == GET_ALL_RESPONSE))
nextState = NEXT_OBJECT; nextState = NEXT_OBJECT;
else if ( bSuccess ) /* and GET_LIST_OF_ALL_RESPONSE */ else if (bSuccess) { /* and GET_LIST_OF_ALL_RESPONSE */
{
/* Now append the properties we waited on. */ /* Now append the properties we waited on. */
if ( bHasStructuredViewList ) { if (bHasStructuredViewList) {
Property_List[ Property_List_Index++ ] = PROP_STRUCTURED_OBJECT_LIST; Property_List[Property_List_Index++] = PROP_STRUCTURED_OBJECT_LIST;
Property_List_Length++; Property_List_Length++;
} }
if ( bHasObjectList ) { if (bHasObjectList) {
Property_List[ Property_List_Index++ ] = PROP_OBJECT_LIST; Property_List[Property_List_Index++] = PROP_OBJECT_LIST;
Property_List_Length++; Property_List_Length++;
} }
/* Now insert the -1 list terminator, but don't count it. */ /* Now insert the -1 list terminator, but don't count it. */
Property_List[ Property_List_Index ] = -1; Property_List[Property_List_Index] = -1;
assert ( Property_List_Length < MAX_PROPS ); assert(Property_List_Length < MAX_PROPS);
Property_List_Index = 0; /* Will start at top of the list */ Property_List_Index = 0; /* Will start at top of the list */
nextState = GET_PROPERTY_REQUEST; nextState = GET_PROPERTY_REQUEST;
} }
return nextState; return nextState;
} }
void PrintUsage() void PrintUsage(
)
{ {
printf("bacepics -- Generates Object and Property List for EPICS \r\n" ); printf("bacepics -- Generates Object and Property List for EPICS \r\n");
printf("Usage: \r\n" ); printf("Usage: \r\n");
printf(" bacepics [-v] device-instance \r\n" ); printf(" bacepics [-v] device-instance \r\n");
printf(" Use the -v option to show values instead of '?' \r\n\r\n" ); printf(" Use the -v option to show values instead of '?' \r\n\r\n");
printf("Insert the output in your EPICS file as the last section: \r\n"); printf("Insert the output in your EPICS file as the last section: \r\n");
printf("\"List of Objects in test device:\" \r\n"); printf("\"List of Objects in test device:\" \r\n");
printf("before the final statement: \r\n"); printf("before the final statement: \r\n");
printf("\"End of BACnet Protocol Implementation Conformance Statement\" \r\n"); printf
("\"End of BACnet Protocol Implementation Conformance Statement\" \r\n");
exit(0); exit(0);
} }
int CheckCommandLineArgs( int CheckCommandLineArgs(
int argc, int argc,
char *argv[] ) char *argv[])
{ {
int i; int i;
bool bFoundTarget = false; bool bFoundTarget = false;
@@ -753,33 +711,30 @@ int CheckCommandLineArgs(
/* print help if not enough arguments */ /* print help if not enough arguments */
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Must provide a device-instance \r\n\r\n" ); fprintf(stderr, "Must provide a device-instance \r\n\r\n");
PrintUsage(); /* Will exit */ PrintUsage(); /* Will exit */
} }
for ( i = 1; i < argc; i++ ) for (i = 1; i < argc; i++) {
{
char *anArg = argv[i]; char *anArg = argv[i];
if ( anArg[0] == '-' ) if (anArg[0] == '-') {
{ if (anArg[1] == 'v')
if ( anArg[1] == 'v' )
ShowValues = true; ShowValues = true;
else else
PrintUsage(); PrintUsage();
} } else {
else
{
/* decode the Target Device Instance parameter */ /* decode the Target Device Instance parameter */
Target_Device_Object_Instance = strtol( anArg, NULL, 0); Target_Device_Object_Instance = strtol(anArg, NULL, 0);
if (Target_Device_Object_Instance > BACNET_MAX_INSTANCE) { if (Target_Device_Object_Instance > BACNET_MAX_INSTANCE) {
fprintf(stderr, "device-instance=%u - it must be less than %u\r\n", fprintf(stderr,
"device-instance=%u - it must be less than %u\r\n",
Target_Device_Object_Instance, BACNET_MAX_INSTANCE + 1); Target_Device_Object_Instance, BACNET_MAX_INSTANCE + 1);
PrintUsage(); PrintUsage();
} }
bFoundTarget = true; bFoundTarget = true;
} }
} }
if ( !bFoundTarget ) { if (!bFoundTarget) {
fprintf(stderr, "Must provide a device-instance \r\n\r\n" ); fprintf(stderr, "Must provide a device-instance \r\n\r\n");
PrintUsage(); /* Will exit */ PrintUsage(); /* Will exit */
} }
@@ -821,7 +776,7 @@ int main(
BACNET_PROPERTY_REFERENCE *rpm_property; BACNET_PROPERTY_REFERENCE *rpm_property;
KEY nextKey; KEY nextKey;
CheckCommandLineArgs( argc, argv ); /* Won't return if there is an issue. */ CheckCommandLineArgs(argc, argv); /* Won't return if there is an issue. */
/* setup my info */ /* setup my info */
Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE); Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
@@ -857,21 +812,21 @@ int main(
} }
/* OK to proceed; see what we are up to now */ /* OK to proceed; see what we are up to now */
switch ( myState ) switch (myState) {
{
case INITIAL_BINDING: case INITIAL_BINDING:
/* returns 0 bytes on timeout */ /* returns 0 bytes on timeout */
pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout); pdu_len =
datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
/* process; normally is some initial error */ /* process; normally is some initial error */
if (pdu_len) { if (pdu_len) {
npdu_handler(&src, &Rx_Buf[0], pdu_len); npdu_handler(&src, &Rx_Buf[0], pdu_len);
} }
/* will wait until the device is bound, or timeout and quit */ /* will wait until the device is bound, or timeout and quit */
found = address_bind_request(Target_Device_Object_Instance, found =
address_bind_request(Target_Device_Object_Instance,
&max_apdu, &Target_Address); &max_apdu, &Target_Address);
if ( !found ) if (!found) {
{
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
elapsed_seconds += (current_seconds - last_seconds); elapsed_seconds += (current_seconds - last_seconds);
if (elapsed_seconds > timeout_seconds) { if (elapsed_seconds > timeout_seconds) {
@@ -880,8 +835,7 @@ int main(
} }
/* else, loop back and try again */ /* else, loop back and try again */
continue; continue;
} } else
else
myState = GET_ALL_REQUEST; myState = GET_ALL_REQUEST;
break; break;
@@ -892,23 +846,22 @@ int main(
/* Update times; aids single-step debugging */ /* Update times; aids single-step debugging */
last_seconds = current_seconds; last_seconds = current_seconds;
rpm_object = calloc(1, sizeof(BACNET_READ_ACCESS_DATA)); rpm_object = calloc(1, sizeof(BACNET_READ_ACCESS_DATA));
assert( rpm_object ); assert(rpm_object);
rpm_object->object_type = myObject.type; rpm_object->object_type = myObject.type;
rpm_object->object_instance = myObject.instance; rpm_object->object_instance = myObject.instance;
rpm_property = calloc(1, sizeof(BACNET_PROPERTY_REFERENCE)); rpm_property = calloc(1, sizeof(BACNET_PROPERTY_REFERENCE));
rpm_object->listOfProperties = rpm_property; rpm_object->listOfProperties = rpm_property;
assert( rpm_property ); assert(rpm_property);
rpm_property->propertyIdentifier = PROP_ALL; rpm_property->propertyIdentifier = PROP_ALL;
if ( myState == GET_LIST_OF_ALL_REQUEST ) if (myState == GET_LIST_OF_ALL_REQUEST)
rpm_property->propertyArrayIndex = 0; /* Get count of arrays */ rpm_property->propertyArrayIndex = 0; /* Get count of arrays */
else else
rpm_property->propertyArrayIndex = -1; /* optional: None */ rpm_property->propertyArrayIndex = -1; /* optional: None */
invoke_id = invoke_id =
Send_Read_Property_Multiple_Request( buffer, MAX_PDU, Send_Read_Property_Multiple_Request(buffer, MAX_PDU,
Target_Device_Object_Instance, rpm_object ); Target_Device_Object_Instance, rpm_object);
if ( invoke_id > 0 ) if (invoke_id > 0) {
{ if (myState == GET_LIST_OF_ALL_REQUEST)
if ( myState == GET_LIST_OF_ALL_REQUEST )
myState = GET_LIST_OF_ALL_RESPONSE; myState = GET_LIST_OF_ALL_RESPONSE;
else else
myState = GET_ALL_RESPONSE; myState = GET_ALL_RESPONSE;
@@ -918,7 +871,8 @@ int main(
case GET_ALL_RESPONSE: case GET_ALL_RESPONSE:
case GET_LIST_OF_ALL_RESPONSE: case GET_LIST_OF_ALL_RESPONSE:
/* returns 0 bytes on timeout */ /* returns 0 bytes on timeout */
pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout); pdu_len =
datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
/* process */ /* process */
if (pdu_len) { if (pdu_len) {
@@ -926,29 +880,28 @@ int main(
} }
if ((Read_Property_Multiple_Data.new_data) && if ((Read_Property_Multiple_Data.new_data) &&
(invoke_id == Read_Property_Multiple_Data.service_data.invoke_id)) { (invoke_id ==
Read_Property_Multiple_Data.service_data.invoke_id)) {
Read_Property_Multiple_Data.new_data = false; Read_Property_Multiple_Data.new_data = false;
myState = ProcessRPMData( Read_Property_Multiple_Data.rpm_data, myState =
myState ); ProcessRPMData(Read_Property_Multiple_Data.rpm_data,
myState);
if (tsm_invoke_id_free(invoke_id)) { if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
} } else {
else { assert(false); /* How can this be? */
assert( false ); /* How can this be? */
invoke_id = 0; invoke_id = 0;
} }
} else if (tsm_invoke_id_free(invoke_id)) { } else if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
if (Error_Detected) /* The normal case for Device Object */ if (Error_Detected) { /* The normal case for Device Object */
{
/* Try again, just to get a list of properties. */ /* Try again, just to get a list of properties. */
if ( myState == GET_ALL_RESPONSE ) if (myState == GET_ALL_RESPONSE)
myState = GET_LIST_OF_ALL_REQUEST; myState = GET_LIST_OF_ALL_REQUEST;
/* Else it may be that RPM is not implemented. */ /* Else it may be that RPM is not implemented. */
else else
myState = GET_PROPERTY_REQUEST; myState = GET_PROPERTY_REQUEST;
} } else
else
myState = GET_ALL_REQUEST; /* Let's try again */ myState = GET_ALL_REQUEST; /* Let's try again */
} else if (tsm_invoke_id_failed(invoke_id)) { } else if (tsm_invoke_id_failed(invoke_id)) {
fprintf(stderr, "\rError: TSM Timeout!\r\n"); fprintf(stderr, "\rError: TSM Timeout!\r\n");
@@ -958,7 +911,7 @@ int main(
} else if (Error_Detected) { } else if (Error_Detected) {
/* Don't think we'll ever actually reach this point. */ /* Don't think we'll ever actually reach this point. */
invoke_id = 0; invoke_id = 0;
myState = NEXT_OBJECT; /* Give up and move on to the next.*/ myState = NEXT_OBJECT; /* Give up and move on to the next. */
} }
break; break;
@@ -968,47 +921,46 @@ int main(
Error_Detected = false; Error_Detected = false;
/* Update times; aids single-step debugging */ /* Update times; aids single-step debugging */
last_seconds = current_seconds; last_seconds = current_seconds;
invoke_id = Read_Properties(Target_Device_Object_Instance, &myObject ); invoke_id =
Read_Properties(Target_Device_Object_Instance, &myObject);
if (invoke_id == 0) { if (invoke_id == 0) {
/* Reached the end of the list. */ /* Reached the end of the list. */
myState = NEXT_OBJECT; /* Move on to the next.*/ myState = NEXT_OBJECT; /* Move on to the next. */
} } else
else
myState = GET_PROPERTY_RESPONSE; myState = GET_PROPERTY_RESPONSE;
break; break;
case GET_PROPERTY_RESPONSE: case GET_PROPERTY_RESPONSE:
/* returns 0 bytes on timeout */ /* returns 0 bytes on timeout */
pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout); pdu_len =
datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
/* process */ /* process */
if (pdu_len) { if (pdu_len) {
npdu_handler(&src, &Rx_Buf[0], pdu_len); npdu_handler(&src, &Rx_Buf[0], pdu_len);
} }
if ( (Read_Property_Multiple_Data.new_data) && if ((Read_Property_Multiple_Data.new_data) &&
(invoke_id == Read_Property_Multiple_Data.service_data.invoke_id)) (invoke_id ==
{ Read_Property_Multiple_Data.service_data.invoke_id)) {
Read_Property_Multiple_Data.new_data = false; 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)) { if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
} } else {
else { assert(false); /* How can this be? */
assert( false ); /* How can this be? */
invoke_id = 0; invoke_id = 0;
} }
/* Advance the property (or Array List) index */ /* Advance the property (or Array List) index */
if ( Using_Walked_List ) if (Using_Walked_List) {
{
Walked_List_Index++; Walked_List_Index++;
if (Walked_List_Index > Walked_List_Length) { if (Walked_List_Index > Walked_List_Length) {
/* go on to next property */ /* go on to next property */
Property_List_Index++; Property_List_Index++;
Using_Walked_List = false; Using_Walked_List = false;
} }
} } else
else
Property_List_Index++; Property_List_Index++;
/* if ( pPropList[Property_List_Index] == PROP_OBJECT_LIST ) */ /* if ( pPropList[Property_List_Index] == PROP_OBJECT_LIST ) */
/* { */ /* { */
@@ -1019,20 +971,18 @@ int main(
/* } */ /* } */
/* } */ /* } */
myState = GET_PROPERTY_REQUEST; /* Go fetch next Property */ myState = GET_PROPERTY_REQUEST; /* Go fetch next Property */
} } else if (tsm_invoke_id_free(invoke_id)) {
else if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
if (Error_Detected) if (Error_Detected) {
{ if (IsLongArray) {
if ( IsLongArray ) {
/* Change to using a Walked List and retry this property */ /* Change to using a Walked List and retry this property */
Using_Walked_List = true; Using_Walked_List = true;
Walked_List_Index = Walked_List_Length = 0; Walked_List_Index = Walked_List_Length = 0;
} } else {
else {
/* OK, skip this one and try the next property. */ /* OK, skip this one and try the next property. */
fprintf( stdout, " -- Failed to get %s \r\n", fprintf(stdout, " -- Failed to get %s \r\n",
bactext_property_name(pPropList[Property_List_Index]) ); bactext_property_name(pPropList
[Property_List_Index]));
Property_List_Index++; Property_List_Index++;
} }
} }
@@ -1045,34 +995,31 @@ int main(
} else if (Error_Detected) { } else if (Error_Detected) {
/* Don't think we'll ever actually reach this point. */ /* Don't think we'll ever actually reach this point. */
invoke_id = 0; invoke_id = 0;
myState = NEXT_OBJECT; /* Give up and move on to the next.*/ myState = NEXT_OBJECT; /* Give up and move on to the next. */
} }
break; break;
case NEXT_OBJECT: case NEXT_OBJECT:
if ( myObject.type == OBJECT_DEVICE ) if (myObject.type == OBJECT_DEVICE) {
{ printf(" -- Found %d Objects \r\n",
printf(" -- Found %d Objects \r\n", Keylist_Count( Object_List ) ); Keylist_Count(Object_List));
Object_List_Index = -1; /* start over (will be incr to 0) */ Object_List_Index = -1; /* start over (will be incr to 0) */
} }
/* Advance to the next object, as long as it's not the Device object */ /* Advance to the next object, as long as it's not the Device object */
do do {
{
Object_List_Index++; Object_List_Index++;
nextKey = Keylist_Key( Object_List, Object_List_Index ); nextKey = Keylist_Key(Object_List, Object_List_Index);
/* If done with all Objects, signal end of this while loop */ /* If done with all Objects, signal end of this while loop */
if ( ( nextKey == 0 ) || ( Object_List_Index >= Object_List_Length ) ) if ((nextKey == 0) ||
{ (Object_List_Index >= Object_List_Length)) {
/* Closing brace for the last Object */ /* Closing brace for the last Object */
printf(" } \r\n"); printf(" } \r\n");
myObject.type = MAX_BACNET_OBJECT_TYPE; myObject.type = MAX_BACNET_OBJECT_TYPE;
} } else {
else
{
/* Closing brace for the previous Object */ /* Closing brace for the previous Object */
printf(" }, \r\n"); printf(" }, \r\n");
myObject.type = KEY_DECODE_TYPE( nextKey ); myObject.type = KEY_DECODE_TYPE(nextKey);
myObject.instance = KEY_DECODE_ID( nextKey ); myObject.instance = KEY_DECODE_ID(nextKey);
/* Opening brace for the new Object */ /* Opening brace for the new Object */
printf(" { \r\n"); printf(" { \r\n");
/* Test code: /* Test code:
@@ -1082,18 +1029,17 @@ int main(
} }
myState = GET_ALL_REQUEST; myState = GET_ALL_REQUEST;
} while ( myObject.type == OBJECT_DEVICE ); } while (myObject.type == OBJECT_DEVICE);
/* Else, don't re-do the Device Object; move to the next object. */ /* Else, don't re-do the Device Object; move to the next object. */
break; break;
default: default:
assert( false ); /* program error; fix this */ assert(false); /* program error; fix this */
break; break;
} }
/* Check for timeouts */ /* Check for timeouts */
if ( !found || ( invoke_id > 0 ) ) if (!found || (invoke_id > 0)) {
{
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
elapsed_seconds += (current_seconds - last_seconds); elapsed_seconds += (current_seconds - last_seconds);
if (elapsed_seconds > timeout_seconds) { if (elapsed_seconds > timeout_seconds) {
@@ -1102,7 +1048,7 @@ int main(
} }
} }
} while ( myObject.type < MAX_BACNET_OBJECT_TYPE ); } while (myObject.type < MAX_BACNET_OBJECT_TYPE);
/* Closing brace for all Objects */ /* Closing brace for all Objects */
printf("} \r\n"); printf("} \r\n");
@@ -1110,5 +1056,4 @@ int main(
return 0; return 0;
} }
/*@}*/ /* End group BACEPICS */ /*@}*//* End group BACEPICS */
bacnet-stack/demo/handler/dlenv.c
+1 -2
View File
@@ -134,9 +134,8 @@ void dlenv_init(
} }
pEnv = getenv("BACNET_INVOKE_ID"); pEnv = getenv("BACNET_INVOKE_ID");
if (pEnv) { if (pEnv) {
tsm_invokeID_set((uint8_t)strtol(pEnv, NULL, 0)); tsm_invokeID_set((uint8_t) strtol(pEnv, NULL, 0));
} }
#if defined(BACDL_BIP) && BBMD_ENABLED #if defined(BACDL_BIP) && BBMD_ENABLED
pEnv = getenv("BACNET_BBMD_PORT"); pEnv = getenv("BACNET_BBMD_PORT");
if (pEnv) { if (pEnv) {
bacnet-stack/demo/handler/h_alarm_ack.c
+3 -2
View File
@@ -109,8 +109,9 @@ void handler_alarm_ack(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"Alarm Ack Operation: Received acknowledge for object id %lu from %s for process id %lu for object %lu\n", "Alarm Ack Operation: Received acknowledge for object id %lu from %s for process id %lu for object %lu\n",
(unsigned long)data.eventObjectIdentifier.instance, data.ackSource.value, (unsigned long) data.eventObjectIdentifier.instance,
(unsigned long)data.ackProcessIdentifier, (unsigned long)data.eventObjectIdentifier.instance); data.ackSource.value, (unsigned long) data.ackProcessIdentifier,
(unsigned long) data.eventObjectIdentifier.instance);
#endif #endif
len = len =
bacnet-stack/demo/handler/h_arf_a.c
+1 -1
View File
@@ -82,7 +82,7 @@ void handler_atomic_read_file_ack(
pFile) != 1) { pFile) != 1) {
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "Failed to write to %s (%lu)!\n", fprintf(stderr, "Failed to write to %s (%lu)!\n",
pFilename, (unsigned long)instance); pFilename, (unsigned long) instance);
#endif #endif
} }
fclose(pFile); fclose(pFile);
bacnet-stack/demo/handler/h_cov.c
+5 -6
View File
@@ -344,9 +344,8 @@ static bool cov_send_request(
value_list[1].next = NULL; value_list[1].next = NULL;
switch (cov_subscription->monitoredObjectIdentifier.type) { switch (cov_subscription->monitoredObjectIdentifier.type) {
case OBJECT_BINARY_INPUT: case OBJECT_BINARY_INPUT:
Binary_Input_Encode_Value_List Binary_Input_Encode_Value_List(cov_subscription->
(cov_subscription->monitoredObjectIdentifier.instance, monitoredObjectIdentifier.instance, &value_list[0]);
&value_list[0]);
break; break;
default: default:
goto COV_FAILED; goto COV_FAILED;
@@ -422,7 +421,7 @@ void handler_cov_task(
COV_Subscriptions[index].lifetime -= elapsed_seconds; COV_Subscriptions[index].lifetime -= elapsed_seconds;
#if 0 #if 0
fprintf(stderr, "COVtask: subscription[%d].lifetime=%lu\n", fprintf(stderr, "COVtask: subscription[%d].lifetime=%lu\n",
index, (unsigned long)COV_Subscriptions[index].lifetime); index, (unsigned long) COV_Subscriptions[index].lifetime);
#endif #endif
} else { } else {
COV_Subscriptions[index].lifetime = 0; COV_Subscriptions[index].lifetime = 0;
@@ -463,8 +462,8 @@ static bool cov_subscribe(
switch (cov_data->monitoredObjectIdentifier.type) { switch (cov_data->monitoredObjectIdentifier.type) {
case OBJECT_BINARY_INPUT: case OBJECT_BINARY_INPUT:
if (Binary_Input_Valid_Instance if (Binary_Input_Valid_Instance(cov_data->
(cov_data->monitoredObjectIdentifier.instance)) { monitoredObjectIdentifier.instance)) {
status = status =
cov_list_subscribe(src, cov_data, error_class, error_code); cov_list_subscribe(src, cov_data, error_class, error_code);
} else { } else {
bacnet-stack/demo/handler/h_iam.c
+3 -3
View File
@@ -61,9 +61,9 @@ void handler_i_am_add(
#endif #endif
if (len != -1) { if (len != -1) {
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, " from %lu, MAC = %d.%d.%d.%d.%d.%d\n", (unsigned long)device_id, fprintf(stderr, " from %lu, MAC = %d.%d.%d.%d.%d.%d\n",
src->mac[0], src->mac[1], src->mac[2], src->mac[3], src->mac[4], (unsigned long) device_id, src->mac[0], src->mac[1], src->mac[2],
src->mac[5]); src->mac[3], src->mac[4], src->mac[5]);
#endif #endif
address_add(device_id, max_apdu, src); address_add(device_id, max_apdu, src);
} else { } else {
bacnet-stack/demo/handler/h_ihave.c
+2 -2
View File
@@ -55,9 +55,9 @@ void handler_i_have(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "I-Have: %s %lu from %s %lu!\r\n", fprintf(stderr, "I-Have: %s %lu from %s %lu!\r\n",
bactext_object_type_name(data.object_id.type), bactext_object_type_name(data.object_id.type),
(unsigned long)data.object_id.instance, (unsigned long) data.object_id.instance,
bactext_object_type_name(data.device_id.type), bactext_object_type_name(data.device_id.type),
(unsigned long)data.device_id.instance); (unsigned long) data.device_id.instance);
#endif #endif
} else { } else {
#if PRINT_ENABLED #if PRINT_ENABLED
bacnet-stack/demo/handler/h_lso.c
+2 -1
View File
@@ -92,7 +92,8 @@ void handler_lso(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"Life Safety Operation: Received operation %d from process id %lu for object %lu\n", "Life Safety Operation: Received operation %d from process id %lu for object %lu\n",
data.operation, (unsigned long)data.processId, (unsigned long)data.targetObject.instance); data.operation, (unsigned long) data.processId,
(unsigned long) data.targetObject.instance);
#endif #endif
len = len =
bacnet-stack/demo/handler/h_npdu.c
+2 -2
View File
@@ -64,14 +64,14 @@ void npdu_handler(
(uint16_t) (pdu_len - apdu_offset)); (uint16_t) (pdu_len - apdu_offset));
} else { } else {
#if PRINT_ENABLED #if PRINT_ENABLED
printf("NPDU: DNET=%u. Discarded!\n", (unsigned)dest.net); printf("NPDU: DNET=%u. Discarded!\n", (unsigned) dest.net);
#endif #endif
} }
} }
} else { } else {
#if PRINT_ENABLED #if PRINT_ENABLED
printf("NPDU: BACnet Protocol Version=%u. Discarded!\n", printf("NPDU: BACnet Protocol Version=%u. Discarded!\n",
(unsigned)pdu[0]); (unsigned) pdu[0]);
#endif #endif
} }
bacnet-stack/demo/handler/h_pt.c
+13 -12
View File
@@ -100,19 +100,20 @@ void ProcessPT(
/* Signal success */ /* Signal success */
iLen += encode_application_unsigned(&IOBufferPT[iLen], MY_ERR_OK); iLen += encode_application_unsigned(&IOBufferPT[iLen], MY_ERR_OK);
/* Followed by the block number */ /* Followed by the block number */
iLen += encode_application_unsigned(&IOBufferPT[iLen], iLen +=
cBlockNumber); encode_application_unsigned(&IOBufferPT[iLen], cBlockNumber);
/* And Then the block contents */ /* And Then the block contents */
iLen += encode_application_unsigned(&IOBufferPT[iLen],
MyData[(int8_t)cBlockNumber].cMyByte1);
iLen += iLen +=
encode_application_unsigned(&IOBufferPT[iLen], encode_application_unsigned(&IOBufferPT[iLen],
MyData[(int8_t)cBlockNumber].cMyByte2); MyData[(int8_t) cBlockNumber].cMyByte1);
iLen +=
encode_application_unsigned(&IOBufferPT[iLen],
MyData[(int8_t) cBlockNumber].cMyByte2);
iLen += iLen +=
encode_application_real(&IOBufferPT[iLen], encode_application_real(&IOBufferPT[iLen],
MyData[(int8_t)cBlockNumber].fMyReal); MyData[(int8_t) cBlockNumber].fMyReal);
characterstring_init_ansi(&bsTemp, characterstring_init_ansi(&bsTemp,
(char *)MyData[(int8_t)cBlockNumber].sMyString); (char *) MyData[(int8_t) cBlockNumber].sMyString);
iLen += iLen +=
encode_application_character_string(&IOBufferPT[iLen], encode_application_character_string(&IOBufferPT[iLen],
&bsTemp); &bsTemp);
@@ -136,7 +137,7 @@ void ProcessPT(
iLen += iLen +=
decode_unsigned(&data->serviceParameters[iLen], len_value_type, decode_unsigned(&data->serviceParameters[iLen], len_value_type,
&ulTemp); &ulTemp);
MyData[(int8_t)cBlockNumber].cMyByte1 = (char) ulTemp; MyData[(int8_t) cBlockNumber].cMyByte1 = (char) ulTemp;
tag_len = tag_len =
decode_tag_number_and_value(&data->serviceParameters[iLen], decode_tag_number_and_value(&data->serviceParameters[iLen],
@@ -149,7 +150,7 @@ void ProcessPT(
iLen += iLen +=
decode_unsigned(&data->serviceParameters[iLen], len_value_type, decode_unsigned(&data->serviceParameters[iLen], len_value_type,
&ulTemp); &ulTemp);
MyData[(int8_t)cBlockNumber].cMyByte2 = (char) ulTemp; MyData[(int8_t) cBlockNumber].cMyByte2 = (char) ulTemp;
tag_len = tag_len =
decode_tag_number_and_value(&data->serviceParameters[iLen], decode_tag_number_and_value(&data->serviceParameters[iLen],
@@ -161,7 +162,7 @@ void ProcessPT(
} }
iLen += iLen +=
decode_real(&data->serviceParameters[iLen], decode_real(&data->serviceParameters[iLen],
&MyData[(int8_t)cBlockNumber].fMyReal); &MyData[(int8_t) cBlockNumber].fMyReal);
tag_len = tag_len =
decode_tag_number_and_value(&data->serviceParameters[iLen], decode_tag_number_and_value(&data->serviceParameters[iLen],
@@ -174,10 +175,10 @@ void ProcessPT(
decode_character_string(&data->serviceParameters[iLen], decode_character_string(&data->serviceParameters[iLen],
len_value_type, &bsTemp); len_value_type, &bsTemp);
/* Only copy as much as we can accept */ /* Only copy as much as we can accept */
strncpy((char *)MyData[(int8_t)cBlockNumber].sMyString, strncpy((char *) MyData[(int8_t) cBlockNumber].sMyString,
characterstring_value(&bsTemp), MY_MAX_STR); characterstring_value(&bsTemp), MY_MAX_STR);
/* Make sure it is nul terminated */ /* Make sure it is nul terminated */
MyData[(int8_t)cBlockNumber].sMyString[MY_MAX_STR] = '\0'; MyData[(int8_t) cBlockNumber].sMyString[MY_MAX_STR] = '\0';
/* Signal success */ /* Signal success */
iLen = encode_application_unsigned(&IOBufferPT[0], MY_ERR_OK); iLen = encode_application_unsigned(&IOBufferPT[0], MY_ERR_OK);
} }
bacnet-stack/demo/handler/h_pt_a.c
+6 -4
View File
@@ -104,7 +104,8 @@ void DecodeBlock(
return; return;
iLen += decode_character_string(&pData[iLen], len_value_type, &bsName); iLen += decode_character_string(&pData[iLen], len_value_type, &bsName);
strncpy((char *)Response.sMyString, characterstring_value(&bsName), MY_MAX_STR); strncpy((char *) Response.sMyString, characterstring_value(&bsName),
MY_MAX_STR);
Response.sMyString[MY_MAX_STR] = '\0'; /* Make sure it is nul terminated */ Response.sMyString[MY_MAX_STR] = '\0'; /* Make sure it is nul terminated */
printf("Private Transfer Read Block Response\n"); printf("Private Transfer Read Block Response\n");
@@ -168,13 +169,14 @@ void ProcessPTA(
cBlockNumber = (char) ulTemp; cBlockNumber = (char) ulTemp;
DecodeBlock(cBlockNumber, &data->serviceParameters[iLen]); DecodeBlock(cBlockNumber, &data->serviceParameters[iLen]);
} else { /* Read error */ } else { /* Read error */
printf("Private Transfer read operation returned error code: %lu\n", printf
(unsigned long)uiErrorCode); ("Private Transfer read operation returned error code: %lu\n",
(unsigned long) uiErrorCode);
return; return;
} }
} else { /* Write I/O block - should just be an OK type message */ } else { /* Write I/O block - should just be an OK type message */
printf("Private Transfer write operation returned error code: %lu\n", printf("Private Transfer write operation returned error code: %lu\n",
(unsigned long)uiErrorCode); (unsigned long) uiErrorCode);
} }
} }
bacnet-stack/demo/handler/h_rd.c
+3 -4
View File
@@ -96,8 +96,8 @@ void handler_reinitialize_device(
goto RD_ABORT; goto RD_ABORT;
} }
/* decode the service request only */ /* decode the service request only */
len = rd_decode_service_request(service_request, service_len, len =
&rd_data.state, rd_decode_service_request(service_request, service_len, &rd_data.state,
&rd_data.password); &rd_data.password);
#if PRINT_ENABLED #if PRINT_ENABLED
if (len > 0) { if (len > 0) {
@@ -143,8 +143,7 @@ void handler_reinitialize_device(
service_data->invoke_id, SERVICE_CONFIRMED_REINITIALIZE_DEVICE, service_data->invoke_id, SERVICE_CONFIRMED_REINITIALIZE_DEVICE,
rd_data.error_class, rd_data.error_code); rd_data.error_class, rd_data.error_code);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr, "ReinitializeDevice: Sending Error.\n");
"ReinitializeDevice: Sending Error.\n");
#endif #endif
} }
} }
bacnet-stack/demo/handler/h_rp.c
+9 -9
View File
@@ -113,26 +113,26 @@ void handler_read_property(
} }
/* assume that there is an error */ /* assume that there is an error */
error = true; error = true;
apdu_len = rp_ack_encode_apdu_init( apdu_len =
&Handler_Transmit_Buffer[npdu_len], rp_ack_encode_apdu_init(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, service_data->invoke_id, &rpdata);
&rpdata);
/* configure our storage */ /* configure our storage */
rpdata.application_data = &Handler_Transmit_Buffer[npdu_len+apdu_len]; rpdata.application_data = &Handler_Transmit_Buffer[npdu_len + apdu_len];
rpdata.application_data_len = rpdata.application_data_len =
sizeof(Handler_Transmit_Buffer) - (npdu_len + apdu_len); sizeof(Handler_Transmit_Buffer) - (npdu_len + apdu_len);
len = Device_Read_Property(&rpdata); len = Device_Read_Property(&rpdata);
if (len >= 0) { if (len >= 0) {
apdu_len += len; apdu_len += len;
len = rp_ack_encode_apdu_object_property_end( len =
&Handler_Transmit_Buffer[npdu_len+apdu_len]); rp_ack_encode_apdu_object_property_end(&Handler_Transmit_Buffer
[npdu_len + apdu_len]);
apdu_len += len; apdu_len += len;
if (apdu_len > service_data->max_resp) { if (apdu_len > service_data->max_resp) {
/* too big for the sender - send an abort */ /* too big for the sender - send an abort */
apdu_len = apdu_len =
abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[npdu_len],
service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, service_data->invoke_id,
true); ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "RP: Message too large. Sending Abort!\n"); fprintf(stderr, "RP: Message too large. Sending Abort!\n");
#endif #endif
bacnet-stack/demo/handler/h_rp_a.c
+10 -15
View File
@@ -62,12 +62,12 @@ static void PrintReadPropertyData(
if (data->array_index == BACNET_ARRAY_ALL) if (data->array_index == BACNET_ARRAY_ALL)
fprintf(stderr, "%s #%lu %s\n", fprintf(stderr, "%s #%lu %s\n",
bactext_object_type_name(data->object_type), bactext_object_type_name(data->object_type),
(unsigned long)data->object_instance, (unsigned long) data->object_instance,
bactext_property_name(data->object_property)); bactext_property_name(data->object_property));
else else
fprintf(stderr, "%s #%lu %s[%d]\n", fprintf(stderr, "%s #%lu %s[%d]\n",
bactext_object_type_name(data->object_type), bactext_object_type_name(data->object_type),
(unsigned long)data->object_instance, (unsigned long) data->object_instance,
bactext_property_name(data->object_property), bactext_property_name(data->object_property),
data->array_index); data->array_index);
#endif #endif
@@ -162,12 +162,11 @@ int rp_ack_fully_decode_service_request(
BACNET_READ_PROPERTY_DATA rp1data; BACNET_READ_PROPERTY_DATA rp1data;
BACNET_PROPERTY_REFERENCE *rp1_property; /* single property */ BACNET_PROPERTY_REFERENCE *rp1_property; /* single property */
BACNET_APPLICATION_DATA_VALUE *value, *old_value; BACNET_APPLICATION_DATA_VALUE *value, *old_value;
uint8_t * vdata; uint8_t *vdata;
int vlen, len; int vlen, len;
decoded_len = rp_ack_decode_service_request(apdu, apdu_len, &rp1data); decoded_len = rp_ack_decode_service_request(apdu, apdu_len, &rp1data);
if ( decoded_len > 0 ) if (decoded_len > 0) {
{
/* Then we have to transfer to the BACNET_READ_ACCESS_DATA structure /* Then we have to transfer to the BACNET_READ_ACCESS_DATA structure
* and decode the value(s) portion * and decode the value(s) portion
*/ */
@@ -175,7 +174,7 @@ int rp_ack_fully_decode_service_request(
read_access_data->object_instance = rp1data.object_instance; read_access_data->object_instance = rp1data.object_instance;
rp1_property = calloc(1, sizeof(BACNET_PROPERTY_REFERENCE)); rp1_property = calloc(1, sizeof(BACNET_PROPERTY_REFERENCE));
read_access_data->listOfProperties = rp1_property; read_access_data->listOfProperties = rp1_property;
if ( rp1_property == NULL ) if (rp1_property == NULL)
return -1; /* can't proceed if calloc failed. */ return -1; /* can't proceed if calloc failed. */
rp1_property->propertyIdentifier = rp1data.object_property; rp1_property->propertyIdentifier = rp1data.object_property;
rp1_property->propertyArrayIndex = rp1data.array_index; rp1_property->propertyArrayIndex = rp1data.array_index;
@@ -196,9 +195,7 @@ int rp_ack_fully_decode_service_request(
bacapp_decode_context_data(vdata, vlen, value, bacapp_decode_context_data(vdata, vlen, value,
rp1_property->propertyIdentifier); rp1_property->propertyIdentifier);
} else { } else {
len = len = bacapp_decode_application_data(vdata, vlen, value);
bacapp_decode_application_data(vdata, vlen,
value);
} }
decoded_len += len; decoded_len += len;
vlen -= len; vlen -= len;
@@ -212,16 +209,14 @@ int rp_ack_fully_decode_service_request(
} else { } else {
/* nothing decoded and no closing tag, so malformed */ /* nothing decoded and no closing tag, so malformed */
if (len == 0) { if (len == 0) {
free( value ); free(value);
free( rp1_property ); free(rp1_property);
read_access_data->listOfProperties = NULL; read_access_data->listOfProperties = NULL;
return -1; return -1;
} }
if ( vlen > 0 ) /* If more values */ if (vlen > 0) { /* If more values */
{
old_value = value; old_value = value;
value = value = calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE));
calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE));
old_value->next = value; old_value->next = value;
} }
} }
bacnet-stack/demo/handler/h_rpm.c
+2 -2
View File
@@ -76,7 +76,7 @@ static BACNET_PROPERTY_ID RPM_Object_Property(
} }
} }
return (BACNET_PROPERTY_ID)property; return (BACNET_PROPERTY_ID) property;
} }
static unsigned RPM_Object_Property_Count( static unsigned RPM_Object_Property_Count(
@@ -133,7 +133,7 @@ static int RPM_Encode_Property(
rpdata.application_data_len = sizeof(Temp_Buf); rpdata.application_data_len = sizeof(Temp_Buf);
len = Device_Read_Property(&rpdata); len = Device_Read_Property(&rpdata);
if (len < 0) { if (len < 0) {
if ( len == -2 ) { if (len == -2) {
return 0; /* Ie, Abort */ return 0; /* Ie, Abort */
} }
/* error was returned - encode that for the response */ /* error was returned - encode that for the response */
bacnet-stack/demo/handler/h_rpm_a.c
+9 -9
View File
@@ -71,7 +71,7 @@ int rpm_ack_decode_service_request(
BACNET_APPLICATION_DATA_VALUE *value; BACNET_APPLICATION_DATA_VALUE *value;
BACNET_APPLICATION_DATA_VALUE *old_value; BACNET_APPLICATION_DATA_VALUE *old_value;
assert( read_access_data != NULL ); assert(read_access_data != NULL);
rpm_object = read_access_data; rpm_object = read_access_data;
old_rpm_object = rpm_object; old_rpm_object = rpm_object;
while (rpm_object && apdu_len) { while (rpm_object && apdu_len) {
@@ -211,7 +211,7 @@ static void PrintReadPropertyMultipleData(
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stdout, "%s #%lu\r\n", fprintf(stdout, "%s #%lu\r\n",
bactext_object_type_name(rpm_data->object_type), bactext_object_type_name(rpm_data->object_type),
(unsigned long)rpm_data->object_instance); (unsigned long) rpm_data->object_instance);
fprintf(stdout, "{\r\n"); fprintf(stdout, "{\r\n");
#endif #endif
listOfProperties = rpm_data->listOfProperties; listOfProperties = rpm_data->listOfProperties;
@@ -219,11 +219,11 @@ static void PrintReadPropertyMultipleData(
#if PRINT_ENABLED #if PRINT_ENABLED
if (listOfProperties->propertyIdentifier < 512) { if (listOfProperties->propertyIdentifier < 512) {
fprintf(stdout, " %s: ", fprintf(stdout, " %s: ",
bactext_property_name(listOfProperties-> bactext_property_name
propertyIdentifier)); (listOfProperties->propertyIdentifier));
} else { } else {
fprintf(stdout, " proprietary %u: ", fprintf(stdout, " proprietary %u: ",
(unsigned)listOfProperties->propertyIdentifier); (unsigned) listOfProperties->propertyIdentifier);
} }
#endif #endif
if (listOfProperties->propertyArrayIndex != BACNET_ARRAY_ALL) { if (listOfProperties->propertyArrayIndex != BACNET_ARRAY_ALL) {
@@ -261,10 +261,10 @@ static void PrintReadPropertyMultipleData(
#if PRINT_ENABLED #if PRINT_ENABLED
/* AccessError */ /* AccessError */
fprintf(stdout, "BACnet Error: %s: %s\r\n", fprintf(stdout, "BACnet Error: %s: %s\r\n",
bactext_error_class_name((int) listOfProperties-> bactext_error_class_name((int) listOfProperties->error.
error.error_class), error_class),
bactext_error_code_name((int) listOfProperties-> bactext_error_code_name((int) listOfProperties->error.
error.error_code)); error_code));
#endif #endif
} }
listOfProperties = listOfProperties->next; listOfProperties = listOfProperties->next;
bacnet-stack/demo/handler/h_rr.c
+8 -8
View File
@@ -62,20 +62,20 @@ int Encode_RR_payload(
if ((info_fn_ptr != NULL) && (info_fn_ptr(pRequest, &PropInfo) != false)) { if ((info_fn_ptr != NULL) && (info_fn_ptr(pRequest, &PropInfo) != false)) {
/* We try and do some of the more generic error checking here to cut down on duplication of effort */ /* We try and do some of the more generic error checking here to cut down on duplication of effort */
if((pRequest->RequestType == RR_BY_POSITION) && (pRequest->Range.RefIndex == 0)) {/* First index is 1 so can't accept 0 */ if ((pRequest->RequestType == RR_BY_POSITION) && (pRequest->Range.RefIndex == 0)) { /* First index is 1 so can't accept 0 */
pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */ pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */
} else if(((PropInfo.RequestTypes & RR_ARRAY_OF_LISTS) == 0) && (pRequest->array_index != 0) && (pRequest->array_index != BACNET_ARRAY_ALL)) { } else if (((PropInfo.RequestTypes & RR_ARRAY_OF_LISTS) == 0) &&
(pRequest->array_index != 0) &&
(pRequest->array_index != BACNET_ARRAY_ALL)) {
/* Array access attempted on a non array property */ /* Array access attempted on a non array property */
pRequest->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; pRequest->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
} } else if ((pRequest->RequestType != RR_READ_ALL) &&
else if((pRequest->RequestType != RR_READ_ALL) && ((PropInfo.RequestTypes & pRequest->RequestType) == 0)) { ((PropInfo.RequestTypes & pRequest->RequestType) == 0)) {
/* By Time or By Sequence not supported - By Position is always required */ /* By Time or By Sequence not supported - By Position is always required */
pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */ pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */
} } else if ((pRequest->Count == 0) && (pRequest->RequestType != RR_READ_ALL)) { /* Count cannot be zero */
else if((pRequest->Count == 0) && (pRequest->RequestType != RR_READ_ALL)) { /* Count cannot be zero */
pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */ pRequest->error_code = ERROR_CODE_OTHER; /* I couldn't see anything more appropriate so... */
} } else if (PropInfo.Handler != NULL) {
else if(PropInfo.Handler != NULL) {
apdu_len = PropInfo.Handler(apdu, pRequest); apdu_len = PropInfo.Handler(apdu, pRequest);
} }
} else { } else {
bacnet-stack/demo/handler/h_ucov.c
+2 -1
View File
@@ -103,7 +103,8 @@ void handler_ucov_notification(
fprintf(stderr, "UCOV: "); fprintf(stderr, "UCOV: ");
if (pProperty_value->propertyIdentifier < 512) { if (pProperty_value->propertyIdentifier < 512) {
fprintf(stderr, "%s ", fprintf(stderr, "%s ",
bactext_property_name(pProperty_value->propertyIdentifier)); bactext_property_name(pProperty_value->
propertyIdentifier));
} else { } else {
fprintf(stderr, "proprietary %u ", fprintf(stderr, "proprietary %u ",
pProperty_value->propertyIdentifier); pProperty_value->propertyIdentifier);
bacnet-stack/demo/handler/h_wp.c
+17 -11
View File
@@ -97,8 +97,10 @@ void handler_write_property(
if (len > 0) if (len > 0)
fprintf(stderr, fprintf(stderr,
"WP: type=%lu instance=%lu property=%lu priority=%lu index=%ld\n", "WP: type=%lu instance=%lu property=%lu priority=%lu index=%ld\n",
(unsigned long)wp_data.object_type, (unsigned long)wp_data.object_instance, (unsigned long) wp_data.object_type,
(unsigned long)wp_data.object_property, (unsigned long)wp_data.priority, (long)wp_data.array_index); (unsigned long) wp_data.object_instance,
(unsigned long) wp_data.object_property,
(unsigned long) wp_data.priority, (long) wp_data.array_index);
else else
fprintf(stderr, "WP: Unable to decode Request!\n"); fprintf(stderr, "WP: Unable to decode Request!\n");
#endif #endif
@@ -149,7 +151,7 @@ void handler_write_property(
*/ */
bool WPValidateString( bool WPValidateString(
BACNET_APPLICATION_DATA_VALUE *pValue, BACNET_APPLICATION_DATA_VALUE * pValue,
int iMaxLen, int iMaxLen,
bool bEmptyAllowed, bool bEmptyAllowed,
BACNET_ERROR_CLASS * pErrorClass, BACNET_ERROR_CLASS * pErrorClass,
@@ -164,11 +166,15 @@ bool WPValidateString(
bResult = false; bResult = false;
*pErrorClass = ERROR_CLASS_PROPERTY; *pErrorClass = ERROR_CLASS_PROPERTY;
if(pValue->tag == BACNET_APPLICATION_TAG_CHARACTER_STRING) { if (pValue->tag == BACNET_APPLICATION_TAG_CHARACTER_STRING) {
if(characterstring_encoding(&pValue->type.Character_String) == CHARACTER_ANSI_X34) { if (characterstring_encoding(&pValue->type.Character_String) ==
if((bEmptyAllowed == false) && (characterstring_length(&pValue->type.Character_String) == 0)) { CHARACTER_ANSI_X34) {
if ((bEmptyAllowed == false) &&
(characterstring_length(&pValue->type.Character_String) ==
0)) {
*pErrorCode = ERROR_CODE_VALUE_OUT_OF_RANGE; *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; *pErrorClass = ERROR_CLASS_RESOURCES;
*pErrorCode = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY; *pErrorCode = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;
} else } else
@@ -178,7 +184,7 @@ bool WPValidateString(
} else } else
*pErrorCode = ERROR_CODE_INVALID_DATA_TYPE; *pErrorCode = ERROR_CODE_INVALID_DATA_TYPE;
return(bResult); return (bResult);
} }
/** Perform simple validation of type of Write Property argument based /** Perform simple validation of type of Write Property argument based
@@ -187,7 +193,7 @@ bool WPValidateString(
*/ */
bool WPValidateArgType( bool WPValidateArgType(
BACNET_APPLICATION_DATA_VALUE *pValue, BACNET_APPLICATION_DATA_VALUE * pValue,
uint8_t ucExpectedTag, uint8_t ucExpectedTag,
BACNET_ERROR_CLASS * pErrorClass, BACNET_ERROR_CLASS * pErrorClass,
BACNET_ERROR_CODE * pErrorCode) BACNET_ERROR_CODE * pErrorCode)
@@ -199,11 +205,11 @@ bool WPValidateArgType(
* response if validation fails. * response if validation fails.
*/ */
bResult = true; bResult = true;
if(pValue->tag != ucExpectedTag) { if (pValue->tag != ucExpectedTag) {
bResult = false; bResult = false;
*pErrorClass = ERROR_CLASS_PROPERTY; *pErrorClass = ERROR_CLASS_PROPERTY;
*pErrorCode = ERROR_CODE_INVALID_DATA_TYPE; *pErrorCode = ERROR_CODE_INVALID_DATA_TYPE;
} }
return(bResult); return (bResult);
} }
bacnet-stack/demo/handler/objects.c
+2 -2
View File
@@ -94,7 +94,7 @@ OBJECT_DEVICE_T *objects_device_new(
} else { } else {
fprintf(stderr, fprintf(stderr,
"Objects: Unable to allocate device %lu buffer\n", "Objects: Unable to allocate device %lu buffer\n",
(unsigned long)device_instance); (unsigned long) device_instance);
} }
} }
} }
@@ -112,7 +112,7 @@ OBJECT_DEVICE_T *objects_device_delete(
pDevice = Keylist_Data_Delete_By_Index(Device_List, index); pDevice = Keylist_Data_Delete_By_Index(Device_List, index);
if (pDevice) { if (pDevice) {
fprintf(stderr, "Objects: removing device %lu", fprintf(stderr, "Objects: removing device %lu",
(unsigned long)pDevice->Object_Identifier.instance); (unsigned long) pDevice->Object_Identifier.instance);
if (pDevice->Object_List) { if (pDevice->Object_List) {
do { do {
pObject = pObject =
bacnet-stack/demo/handler/s_cov.c
+3 -5
View File
@@ -124,10 +124,9 @@ uint8_t Send_COV_Subscribe(
npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address, npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest, &my_address,
&npdu_data); &npdu_data);
/* encode the APDU portion of the packet */ /* encode the APDU portion of the packet */
len = cov_subscribe_encode_adpu( len =
&Handler_Transmit_Buffer[pdu_len], cov_subscribe_encode_adpu(&Handler_Transmit_Buffer[pdu_len],
invoke_id, invoke_id, cov_data);
cov_data);
pdu_len += len; pdu_len += len;
/* will it fit in the sender? /* will it fit in the sender?
note: if there is a bottleneck router in between note: if there is a bottleneck router in between
@@ -158,4 +157,3 @@ uint8_t Send_COV_Subscribe(
return invoke_id; return invoke_id;
} }
bacnet-stack/demo/handler/s_iam.c
+4 -7
View File
@@ -75,7 +75,7 @@ int iam_encode_pdu(
* @param buffer [in] The buffer to use for building and sending the message. * @param buffer [in] The buffer to use for building and sending the message.
*/ */
void Send_I_Am( void Send_I_Am(
uint8_t * buffer ) uint8_t * buffer)
{ {
int pdu_len = 0; int pdu_len = 0;
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
@@ -126,15 +126,13 @@ int iam_unicast_encode_pdu(
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
/* The destination will be the same as the src, so copy it over. */ /* The destination will be the same as the src, so copy it over. */
memcpy( dest, src, sizeof( BACNET_ADDRESS ) ); memcpy(dest, src, sizeof(BACNET_ADDRESS));
dest->net = 0; dest->net = 0;
datalink_get_my_address(&my_address); datalink_get_my_address(&my_address);
/* encode the NPDU portion of the packet */ /* encode the NPDU portion of the packet */
npdu_encode_npdu_data(npdu_data, false, MESSAGE_PRIORITY_NORMAL); npdu_encode_npdu_data(npdu_data, false, MESSAGE_PRIORITY_NORMAL);
npdu_len = npdu_len = npdu_encode_pdu(&buffer[0], dest, &my_address, npdu_data);
npdu_encode_pdu(&buffer[0], dest, &my_address,
npdu_data);
/* encode the APDU portion of the packet */ /* encode the APDU portion of the packet */
apdu_len = apdu_len =
iam_encode_apdu(&buffer[npdu_len], Device_Object_Instance_Number(), iam_encode_apdu(&buffer[npdu_len], Device_Object_Instance_Number(),
@@ -157,7 +155,7 @@ int iam_unicast_encode_pdu(
*/ */
void Send_I_Am_Unicast( void Send_I_Am_Unicast(
uint8_t * buffer, uint8_t * buffer,
BACNET_ADDRESS * src ) BACNET_ADDRESS * src)
{ {
int pdu_len = 0; int pdu_len = 0;
BACNET_ADDRESS dest; BACNET_ADDRESS dest;
@@ -186,4 +184,3 @@ void Send_I_Am_Unicast(
fprintf(stderr, "Failed to Send I-Am Reply (%s)!\n", strerror(errno)); fprintf(stderr, "Failed to Send I-Am Reply (%s)!\n", strerror(errno));
#endif #endif
} }
bacnet-stack/demo/handler/s_wp.c
+2 -3
View File
@@ -155,9 +155,8 @@ uint8_t Send_Write_Property_Request(
#if PRINT_ENABLED_DEBUG #if PRINT_ENABLED_DEBUG
fprintf(stderr, "WriteProperty service: " "%s tag=%d\n", fprintf(stderr, "WriteProperty service: " "%s tag=%d\n",
(object_value->context_specific ? "context" : "application"), (object_value->context_specific ? "context" : "application"),
(int) (object_value-> (int) (object_value->context_specific ? object_value->
context_specific ? object_value->context_tag : object_value-> context_tag : object_value->tag));
tag));
#endif #endif
len = bacapp_encode_data(&application_data[apdu_len], object_value); len = bacapp_encode_data(&application_data[apdu_len], object_value);
if ((len + apdu_len) < MAX_APDU) { if ((len + apdu_len) < MAX_APDU) {
bacnet-stack/demo/mstpcap/main.c
+10 -8
View File
@@ -144,8 +144,7 @@ static void packet_statistics(
if (dst > MSTP_Statistics[src].max_master) { if (dst > MSTP_Statistics[src].max_master) {
MSTP_Statistics[src].max_master = dst; MSTP_Statistics[src].max_master = dst;
} }
if ((old_frame == FRAME_TYPE_POLL_FOR_MASTER) && if ((old_frame == FRAME_TYPE_POLL_FOR_MASTER) && (old_src == src)) {
(old_src == src)) {
/* Tusage_timeout */ /* Tusage_timeout */
delta = timeval_diff_ms(&old_tv, tv); delta = timeval_diff_ms(&old_tv, tv);
if (delta > MSTP_Statistics[src].tusage_timeout) { if (delta > MSTP_Statistics[src].tusage_timeout) {
@@ -212,9 +211,8 @@ static void packet_statistics_save(
fprintf(stdout, "\r\n"); fprintf(stdout, "\r\n");
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
/* check for masters or slaves */ /* check for masters or slaves */
if ((MSTP_Statistics[i].token_count) || if ((MSTP_Statistics[i].token_count) || (MSTP_Statistics[i].der_reply)
(MSTP_Statistics[i].der_reply) || || (MSTP_Statistics[i].pfm_count)) {
(MSTP_Statistics[i].pfm_count)) {
fprintf(stdout, "%u\t%u", i, fprintf(stdout, "%u\t%u", i,
(unsigned) MSTP_Statistics[i].max_master); (unsigned) MSTP_Statistics[i].max_master);
fprintf(stdout, "\t%lu\t%lu\t%lu\t%lu", fprintf(stdout, "\t%lu\t%lu\t%lu\t%lu",
@@ -379,6 +377,7 @@ size_t data_write(
} }
return fwrite(ptr, size, nitems, pFile); return fwrite(ptr, size, nitems, pFile);
} }
size_t data_write_header( size_t data_write_header(
const void *ptr, const void *ptr,
size_t size, size_t size,
@@ -425,9 +424,12 @@ static void write_global_header(
/* create a new file. */ /* create a new file. */
pFile = fopen(filename, "wb"); pFile = fopen(filename, "wb");
if (pFile) { if (pFile) {
(void) data_write_header(&magic_number, sizeof(magic_number), 1, pipe_enable); (void) data_write_header(&magic_number, sizeof(magic_number), 1,
(void) data_write_header(&version_major, sizeof(version_major), 1, pipe_enable); pipe_enable);
(void) data_write_header(&version_minor, sizeof(version_minor), 1, pipe_enable); (void) data_write_header(&version_major, sizeof(version_major), 1,
pipe_enable);
(void) data_write_header(&version_minor, sizeof(version_minor), 1,
pipe_enable);
(void) data_write_header(&thiszone, sizeof(thiszone), 1, pipe_enable); (void) data_write_header(&thiszone, sizeof(thiszone), 1, pipe_enable);
(void) data_write_header(&sigfigs, sizeof(sigfigs), 1, pipe_enable); (void) data_write_header(&sigfigs, sizeof(sigfigs), 1, pipe_enable);
(void) data_write_header(&snaplen, sizeof(snaplen), 1, pipe_enable); (void) data_write_header(&snaplen, sizeof(snaplen), 1, pipe_enable);
bacnet-stack/demo/object/ai.c
+5 -8
View File
@@ -160,7 +160,7 @@ char *Analog_Input_Name(
index = Analog_Input_Instance_To_Index(object_instance); index = Analog_Input_Instance_To_Index(object_instance);
if (index < MAX_ANALOG_INPUTS) { if (index < MAX_ANALOG_INPUTS) {
sprintf(text_string, "ANALOG INPUT %lu", (unsigned long)index); sprintf(text_string, "ANALOG INPUT %lu", (unsigned long) index);
return text_string; return text_string;
} }
@@ -170,15 +170,14 @@ char *Analog_Input_Name(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object has already exists */ /* assumption - object has already exists */
int Analog_Input_Read_Property( int Analog_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -242,8 +241,7 @@ int Analog_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -284,8 +282,7 @@ void testAnalogInput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/ao.c
+22 -23
View File
@@ -259,7 +259,8 @@ char *Analog_Output_Name(
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
if (object_instance < MAX_ANALOG_OUTPUTS) { if (object_instance < MAX_ANALOG_OUTPUTS) {
sprintf(text_string, "ANALOG OUTPUT %lu", (unsigned long)object_instance); sprintf(text_string, "ANALOG OUTPUT %lu",
(unsigned long) object_instance);
return text_string; return text_string;
} }
@@ -268,7 +269,7 @@ char *Analog_Output_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Output_Read_Property( int Analog_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -280,8 +281,7 @@ int Analog_Output_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -320,7 +320,8 @@ int Analog_Output_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Analog_Output_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Output_Instance_To_Index(rpdata->object_instance);
state = Analog_Output_Out_Of_Service[object_index]; state = Analog_Output_Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -361,12 +362,13 @@ int Analog_Output_Read_Property(
object_index = object_index =
Analog_Output_Instance_To_Index(rpdata->object_instance); Analog_Output_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Analog_Output_Level[object_index][rpdata->array_index - 1] == if (Analog_Output_Level[object_index][rpdata->array_index -
AO_LEVEL_NULL) 1] == AO_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Analog_Output_Level[object_index][rpdata->array_index - 1]; Analog_Output_Level[object_index][rpdata->
array_index - 1];
apdu_len = apdu_len =
encode_application_real(&apdu[0], real_value); encode_application_real(&apdu[0], real_value);
} }
@@ -388,8 +390,7 @@ int Analog_Output_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -435,17 +436,17 @@ bool Analog_Output_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = AO_LEVEL_NULL; level = AO_LEVEL_NULL;
object_index = object_index =
Analog_Output_Instance_To_Index(wp_data->object_instance); Analog_Output_Instance_To_Index(wp_data->
object_instance);
status = status =
Analog_Output_Present_Value_Relinquish Analog_Output_Present_Value_Relinquish(wp_data->
(wp_data->object_instance, wp_data->priority); object_instance, wp_data->priority);
if (!status) { if (!status) {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
@@ -454,10 +455,9 @@ bool Analog_Output_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Analog_Output_Instance_To_Index(wp_data->object_instance); Analog_Output_Instance_To_Index(wp_data->object_instance);
@@ -502,8 +502,7 @@ void testAnalogOutput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/av.c
+24 -23
View File
@@ -207,7 +207,8 @@ char *Analog_Value_Name(
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
if (object_instance < MAX_ANALOG_VALUES) { if (object_instance < MAX_ANALOG_VALUES) {
sprintf(text_string, "ANALOG VALUE %lu", (unsigned long)object_instance); sprintf(text_string, "ANALOG VALUE %lu",
(unsigned long) object_instance);
return text_string; return text_string;
} }
@@ -216,7 +217,7 @@ char *Analog_Value_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Value_Read_Property( int Analog_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -228,8 +229,7 @@ int Analog_Value_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -268,7 +268,8 @@ int Analog_Value_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
state = Analog_Value_Out_Of_Service[object_index]; state = Analog_Value_Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -283,7 +284,8 @@ int Analog_Value_Read_Property(
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
for (i = 0; i < BACNET_MAX_PRIORITY; i++) { for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */ /* FIXME: check if we have room before adding it to APDU */
if (Analog_Value_Level[object_index][i] == if (Analog_Value_Level[object_index][i] ==
@@ -306,14 +308,16 @@ int Analog_Value_Read_Property(
} }
} }
} else { } else {
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Analog_Value_Level[object_index][rpdata->array_index - 1] == if (Analog_Value_Level[object_index][rpdata->array_index -
ANALOG_LEVEL_NULL) 1] == ANALOG_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Analog_Value_Level[object_index][rpdata->array_index - 1]; Analog_Value_Level[object_index][rpdata->
array_index - 1];
apdu_len = apdu_len =
encode_application_real(&apdu[0], real_value); encode_application_real(&apdu[0], real_value);
} }
@@ -335,8 +339,7 @@ int Analog_Value_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -383,14 +386,14 @@ bool Analog_Value_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = ANALOG_LEVEL_NULL; level = ANALOG_LEVEL_NULL;
object_index = object_index =
Analog_Value_Instance_To_Index(wp_data->object_instance); Analog_Value_Instance_To_Index(wp_data->
object_instance);
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) { if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--; priority--;
@@ -410,10 +413,9 @@ bool Analog_Value_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Analog_Value_Instance_To_Index(wp_data->object_instance); Analog_Value_Instance_To_Index(wp_data->object_instance);
@@ -457,8 +459,7 @@ void testAnalog_Value(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/bacfile.c
+10 -12
View File
@@ -185,7 +185,7 @@ static unsigned bacfile_file_size(
/* return the number of bytes used, or -1 on error */ /* return the number of bytes used, or -1 on error */
int bacfile_read_property( int bacfile_read_property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
char text_string[32] = { "" }; char text_string[32] = { "" };
@@ -194,8 +194,7 @@ int bacfile_read_property(
BACNET_TIME btime; BACNET_TIME btime;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -207,7 +206,8 @@ int bacfile_read_property(
rpdata->object_instance); rpdata->object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
sprintf(text_string, "FILE %lu", (unsigned long)rpdata->object_instance); sprintf(text_string, "FILE %lu",
(unsigned long) rpdata->object_instance);
characterstring_init_ansi(&char_string, text_string); characterstring_init_ansi(&char_string, text_string);
apdu_len = apdu_len =
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
@@ -302,10 +302,9 @@ bool bacfile_write_property(
property shall be logical TRUE only if no changes have been property shall be logical TRUE only if no changes have been
made to the file data by internal processes or through File made to the file data by internal processes or through File
Access Services since the last time the object was archived. */ Access Services since the last time the object was archived. */
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (value.type.Boolean) { if (value.type.Boolean) {
/* FIXME: do something to wp_data->object_instance */ /* FIXME: do something to wp_data->object_instance */
@@ -318,10 +317,9 @@ bool bacfile_write_property(
/* If the file size can be changed by writing to the file, /* If the file size can be changed by writing to the file,
and File_Access_Method is STREAM_ACCESS, then this property and File_Access_Method is STREAM_ACCESS, then this property
shall be writable. */ shall be writable. */
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* FIXME: do something with value.type.Unsigned /* FIXME: do something with value.type.Unsigned
to wp_data->object_instance */ to wp_data->object_instance */
bacnet-stack/demo/object/bi.c
+12 -16
View File
@@ -287,7 +287,8 @@ char *Binary_Input_Name(
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
if (object_instance < MAX_BINARY_INPUTS) { if (object_instance < MAX_BINARY_INPUTS) {
sprintf(text_string, "BINARY INPUT %lu", (unsigned long)object_instance); sprintf(text_string, "BINARY INPUT %lu",
(unsigned long) object_instance);
return text_string; return text_string;
} }
@@ -297,7 +298,7 @@ char *Binary_Input_Name(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object already exists, and has been bounds checked */ /* assumption - object already exists, and has been bounds checked */
int Binary_Input_Read_Property( int Binary_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -305,8 +306,7 @@ int Binary_Input_Read_Property(
BACNET_POLARITY polarity = POLARITY_NORMAL; BACNET_POLARITY polarity = POLARITY_NORMAL;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -370,8 +370,7 @@ int Binary_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -396,10 +395,9 @@ bool Binary_Input_Write_Property(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_ENUMERATED, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (value.type.Enumerated <= MAX_BINARY_PV) { if (value.type.Enumerated <= MAX_BINARY_PV) {
Binary_Input_Present_Value_Set(wp_data->object_instance, Binary_Input_Present_Value_Set(wp_data->object_instance,
@@ -412,10 +410,9 @@ bool Binary_Input_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
Binary_Input_Out_Of_Service_Set(wp_data->object_instance, Binary_Input_Out_Of_Service_Set(wp_data->object_instance,
value.type.Boolean); value.type.Boolean);
@@ -457,8 +454,7 @@ void testBinaryInput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/bo.c
+24 -24
View File
@@ -183,7 +183,8 @@ char *Binary_Output_Name(
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
if (object_instance < MAX_BINARY_OUTPUTS) { if (object_instance < MAX_BINARY_OUTPUTS) {
sprintf(text_string, "BINARY OUTPUT %lu", (unsigned long)object_instance); sprintf(text_string, "BINARY OUTPUT %lu",
(unsigned long) object_instance);
return text_string; return text_string;
} }
@@ -192,7 +193,7 @@ char *Binary_Output_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Output_Read_Property( int Binary_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -205,8 +206,7 @@ int Binary_Output_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -231,7 +231,8 @@ int Binary_Output_Read_Property(
encode_application_enumerated(&apdu[0], OBJECT_BINARY_OUTPUT); encode_application_enumerated(&apdu[0], OBJECT_BINARY_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Binary_Output_Present_Value(rpdata->object_instance); present_value =
Binary_Output_Present_Value(rpdata->object_instance);
apdu_len = encode_application_enumerated(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -249,7 +250,8 @@ int Binary_Output_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Binary_Output_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Output_Instance_To_Index(rpdata->object_instance);
state = Binary_Output_Out_Of_Service[object_index]; state = Binary_Output_Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -290,12 +292,13 @@ int Binary_Output_Read_Property(
object_index = object_index =
Binary_Output_Instance_To_Index(rpdata->object_instance); Binary_Output_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Binary_Output_Level[object_index][rpdata->array_index - 1] == if (Binary_Output_Level[object_index][rpdata->array_index -
BINARY_NULL) 1] == BINARY_NULL)
apdu_len = encode_application_null(&apdu[apdu_len]); apdu_len = encode_application_null(&apdu[apdu_len]);
else { else {
present_value = present_value =
Binary_Output_Level[object_index][rpdata->array_index - 1]; Binary_Output_Level[object_index][rpdata->
array_index - 1];
apdu_len = apdu_len =
encode_application_enumerated(&apdu[apdu_len], encode_application_enumerated(&apdu[apdu_len],
present_value); present_value);
@@ -329,8 +332,7 @@ int Binary_Output_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -369,8 +371,8 @@ bool Binary_Output_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV) value.type.Enumerated; level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index = object_index =
Binary_Output_Instance_To_Index Binary_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority--; priority--;
Binary_Output_Level[object_index][priority] = level; Binary_Output_Level[object_index][priority] = level;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
@@ -390,14 +392,14 @@ bool Binary_Output_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = BINARY_NULL; level = BINARY_NULL;
object_index = object_index =
Binary_Output_Instance_To_Index(wp_data->object_instance); Binary_Output_Instance_To_Index(wp_data->
object_instance);
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) { if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--; priority--;
@@ -417,10 +419,9 @@ bool Binary_Output_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Binary_Output_Instance_To_Index(wp_data->object_instance); Binary_Output_Instance_To_Index(wp_data->object_instance);
@@ -465,8 +466,7 @@ void testBinaryOutput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/bv.c
+30 -27
View File
@@ -180,7 +180,8 @@ char *Binary_Value_Name(
static char text_string[32] = ""; /* okay for single thread */ static char text_string[32] = ""; /* okay for single thread */
if (object_instance < MAX_BINARY_VALUES) { if (object_instance < MAX_BINARY_VALUES) {
sprintf(text_string, "BINARY VALUE %lu", (unsigned long)object_instance); sprintf(text_string, "BINARY VALUE %lu",
(unsigned long) object_instance);
return text_string; return text_string;
} }
@@ -189,7 +190,7 @@ char *Binary_Value_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Value_Read_Property( int Binary_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -201,8 +202,7 @@ int Binary_Value_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -227,7 +227,8 @@ int Binary_Value_Read_Property(
encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE); encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Binary_Value_Present_Value(rpdata->object_instance); present_value =
Binary_Value_Present_Value(rpdata->object_instance);
apdu_len = encode_application_enumerated(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -245,7 +246,8 @@ int Binary_Value_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Binary_Value_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Value_Instance_To_Index(rpdata->object_instance);
state = Binary_Value_Out_Of_Service[object_index]; state = Binary_Value_Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -257,7 +259,8 @@ int Binary_Value_Read_Property(
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
object_index = Binary_Value_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Value_Instance_To_Index(rpdata->object_instance);
for (i = 0; i < BACNET_MAX_PRIORITY; i++) { for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */ /* FIXME: check if we have room before adding it to APDU */
if (Binary_Value_Level[object_index][i] == BINARY_NULL) if (Binary_Value_Level[object_index][i] == BINARY_NULL)
@@ -279,14 +282,16 @@ int Binary_Value_Read_Property(
} }
} }
} else { } else {
object_index = Binary_Value_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Value_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Binary_Value_Level[object_index][rpdata->array_index] == if (Binary_Value_Level[object_index][rpdata->
BINARY_NULL) array_index] == BINARY_NULL)
apdu_len = encode_application_null(&apdu[apdu_len]); apdu_len = encode_application_null(&apdu[apdu_len]);
else { else {
present_value = present_value =
Binary_Value_Level[object_index][rpdata->array_index]; Binary_Value_Level[object_index][rpdata->
array_index];
apdu_len = apdu_len =
encode_application_enumerated(&apdu[apdu_len], encode_application_enumerated(&apdu[apdu_len],
present_value); present_value);
@@ -310,8 +315,7 @@ int Binary_Value_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -350,8 +354,8 @@ bool Binary_Value_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV) value.type.Enumerated; level = (BACNET_BINARY_PV) value.type.Enumerated;
object_index = object_index =
Binary_Value_Instance_To_Index Binary_Value_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority--; priority--;
Binary_Value_Level[object_index][priority] = level; Binary_Value_Level[object_index][priority] = level;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
@@ -371,14 +375,14 @@ bool Binary_Value_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = BINARY_NULL; level = BINARY_NULL;
object_index = object_index =
Binary_Value_Instance_To_Index(wp_data->object_instance); Binary_Value_Instance_To_Index(wp_data->
object_instance);
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) { if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--; priority--;
@@ -398,12 +402,12 @@ bool Binary_Value_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = Binary_Value_Instance_To_Index(wp_data->object_instance); object_index =
Binary_Value_Instance_To_Index(wp_data->object_instance);
Binary_Value_Out_Of_Service[object_index] = value.type.Boolean; Binary_Value_Out_Of_Service[object_index] = value.type.Boolean;
} }
break; break;
@@ -444,8 +448,7 @@ void testBinary_Value(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/device.c
+177 -272
View File
@@ -70,7 +70,7 @@ long int timezone;
/* forward prototypes */ /* forward prototypes */
static int Device_Read_Property_Local( static int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
static bool Device_Write_Property_Local( static bool Device_Write_Property_Local(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
@@ -95,154 +95,76 @@ static struct object_functions {
rpm_property_lists_function Object_RPM_List; rpm_property_lists_function Object_RPM_List;
rr_info_function Object_RR_Info; rr_info_function Object_RR_Info;
object_iterate_function Object_Iterator; object_iterate_function Object_Iterator;
} Object_Table[] = } Object_Table[] = {
{ {
{OBJECT_DEVICE, OBJECT_DEVICE, NULL, Device_Count, Device_Index_To_Instance,
NULL, Device_Valid_Object_Instance_Number, Device_Name,
Device_Count, Device_Read_Property_Local, Device_Write_Property_Local,
Device_Index_To_Instance, Device_Property_Lists, DeviceGetRRInfo, NULL}, {
Device_Valid_Object_Instance_Number, OBJECT_ANALOG_INPUT, Analog_Input_Init, Analog_Input_Count,
Device_Name, Analog_Input_Index_To_Instance, Analog_Input_Valid_Instance,
Device_Read_Property_Local, Analog_Input_Name, Analog_Input_Read_Property, NULL,
Device_Write_Property_Local, Analog_Input_Property_Lists, NULL, NULL}, {
Device_Property_Lists, OBJECT_ANALOG_OUTPUT, Analog_Output_Init, Analog_Output_Count,
DeviceGetRRInfo, Analog_Output_Index_To_Instance, Analog_Output_Valid_Instance,
NULL}, Analog_Output_Name, Analog_Output_Read_Property,
{OBJECT_ANALOG_INPUT, Analog_Output_Write_Property, Analog_Output_Property_Lists,
Analog_Input_Init, NULL, NULL}, {
Analog_Input_Count, OBJECT_ANALOG_VALUE, Analog_Value_Init, Analog_Value_Count,
Analog_Input_Index_To_Instance, Analog_Value_Index_To_Instance, Analog_Value_Valid_Instance,
Analog_Input_Valid_Instance, Analog_Value_Name, Analog_Value_Read_Property,
Analog_Input_Name, Analog_Value_Write_Property, Analog_Value_Property_Lists, NULL,
Analog_Input_Read_Property, NULL}, {
NULL, OBJECT_BINARY_INPUT, Binary_Input_Init, Binary_Input_Count,
Analog_Input_Property_Lists, Binary_Input_Index_To_Instance, Binary_Input_Valid_Instance,
NULL, Binary_Input_Name, Binary_Input_Read_Property, NULL,
NULL}, Binary_Input_Property_Lists, NULL, NULL}, {
{OBJECT_ANALOG_OUTPUT, OBJECT_BINARY_OUTPUT, Binary_Output_Init, Binary_Output_Count,
Analog_Output_Init, Binary_Output_Index_To_Instance, Binary_Output_Valid_Instance,
Analog_Output_Count, Binary_Output_Name, Binary_Output_Read_Property,
Analog_Output_Index_To_Instance, Binary_Output_Write_Property, Binary_Output_Property_Lists,
Analog_Output_Valid_Instance, NULL, NULL}, {
Analog_Output_Name, OBJECT_BINARY_VALUE, Binary_Value_Init, Binary_Value_Count,
Analog_Output_Read_Property, Binary_Value_Index_To_Instance, Binary_Value_Valid_Instance,
Analog_Output_Write_Property, Binary_Value_Name, Binary_Value_Read_Property,
Analog_Output_Property_Lists, Binary_Value_Write_Property, Binary_Value_Property_Lists, NULL,
NULL, NULL}, {
NULL}, OBJECT_LIFE_SAFETY_POINT, Life_Safety_Point_Init,
{OBJECT_ANALOG_VALUE, Life_Safety_Point_Count, Life_Safety_Point_Index_To_Instance,
Analog_Value_Init, Life_Safety_Point_Valid_Instance, Life_Safety_Point_Name,
Analog_Value_Count,
Analog_Value_Index_To_Instance,
Analog_Value_Valid_Instance,
Analog_Value_Name,
Analog_Value_Read_Property,
Analog_Value_Write_Property,
Analog_Value_Property_Lists,
NULL,
NULL},
{OBJECT_BINARY_INPUT,
Binary_Input_Init,
Binary_Input_Count,
Binary_Input_Index_To_Instance,
Binary_Input_Valid_Instance,
Binary_Input_Name,
Binary_Input_Read_Property,
NULL,
Binary_Input_Property_Lists,
NULL,
NULL},
{OBJECT_BINARY_OUTPUT,
Binary_Output_Init,
Binary_Output_Count,
Binary_Output_Index_To_Instance,
Binary_Output_Valid_Instance,
Binary_Output_Name,
Binary_Output_Read_Property,
Binary_Output_Write_Property,
Binary_Output_Property_Lists,
NULL,
NULL},
{OBJECT_BINARY_VALUE,
Binary_Value_Init,
Binary_Value_Count,
Binary_Value_Index_To_Instance,
Binary_Value_Valid_Instance,
Binary_Value_Name,
Binary_Value_Read_Property,
Binary_Value_Write_Property,
Binary_Value_Property_Lists,
NULL,
NULL},
{OBJECT_LIFE_SAFETY_POINT,
Life_Safety_Point_Init,
Life_Safety_Point_Count,
Life_Safety_Point_Index_To_Instance,
Life_Safety_Point_Valid_Instance,
Life_Safety_Point_Name,
Life_Safety_Point_Read_Property, Life_Safety_Point_Read_Property,
Life_Safety_Point_Write_Property, Life_Safety_Point_Write_Property,
Life_Safety_Point_Property_Lists, Life_Safety_Point_Property_Lists, NULL, NULL}, {
NULL, OBJECT_LOAD_CONTROL, Load_Control_Init, Load_Control_Count,
NULL}, Load_Control_Index_To_Instance, Load_Control_Valid_Instance,
{OBJECT_LOAD_CONTROL, Load_Control_Name, Load_Control_Read_Property,
Load_Control_Init, Load_Control_Write_Property, Load_Control_Property_Lists, NULL,
Load_Control_Count, NULL}, {
Load_Control_Index_To_Instance, OBJECT_MULTI_STATE_OUTPUT, Multistate_Output_Init,
Load_Control_Valid_Instance, Multistate_Output_Count, Multistate_Output_Index_To_Instance,
Load_Control_Name, Multistate_Output_Valid_Instance, Multistate_Output_Name,
Load_Control_Read_Property,
Load_Control_Write_Property,
Load_Control_Property_Lists,
NULL,
NULL},
{OBJECT_MULTI_STATE_OUTPUT,
Multistate_Output_Init,
Multistate_Output_Count,
Multistate_Output_Index_To_Instance,
Multistate_Output_Valid_Instance,
Multistate_Output_Name,
Multistate_Output_Read_Property, Multistate_Output_Read_Property,
Multistate_Output_Write_Property, Multistate_Output_Write_Property,
Multistate_Output_Property_Lists, Multistate_Output_Property_Lists, NULL, NULL}, {
NULL, OBJECT_MULTI_STATE_INPUT, Multistate_Input_Init,
NULL}, Multistate_Input_Count, Multistate_Input_Index_To_Instance,
{OBJECT_MULTI_STATE_INPUT, Multistate_Input_Valid_Instance, Multistate_Input_Name,
Multistate_Input_Init,
Multistate_Input_Count,
Multistate_Input_Index_To_Instance,
Multistate_Input_Valid_Instance,
Multistate_Input_Name,
Multistate_Input_Read_Property, Multistate_Input_Read_Property,
Multistate_Input_Write_Property, Multistate_Input_Write_Property,
Multistate_Input_Property_Lists, Multistate_Input_Property_Lists, NULL, NULL}, {
NULL, OBJECT_TRENDLOG, Trend_Log_Init, Trend_Log_Count,
NULL}, Trend_Log_Index_To_Instance, Trend_Log_Valid_Instance,
{OBJECT_TRENDLOG, Trend_Log_Name, Trend_Log_Read_Property,
Trend_Log_Init, Trend_Log_Write_Property, Trend_Log_Property_Lists,
Trend_Log_Count, TrendLogGetRRInfo, NULL},
Trend_Log_Index_To_Instance,
Trend_Log_Valid_Instance,
Trend_Log_Name,
Trend_Log_Read_Property,
Trend_Log_Write_Property,
Trend_Log_Property_Lists,
TrendLogGetRRInfo,
NULL},
#if defined(BACFILE) #if defined(BACFILE)
{OBJECT_FILE, {
bacfile_init, OBJECT_FILE, bacfile_init, bacfile_count, bacfile_index_to_instance,
bacfile_count, bacfile_valid_instance, bacfile_name, bacfile_read_property,
bacfile_index_to_instance, bacfile_write_property, BACfile_Property_Lists, NULL},
bacfile_valid_instance,
bacfile_name,
bacfile_read_property,
bacfile_write_property,
BACfile_Property_Lists,
NULL},
#endif #endif
{
{MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
}; };
/** Glue function to let the Device object, when called by a handler, /** Glue function to let the Device object, when called by a handler,
@@ -252,7 +174,7 @@ static struct object_functions {
* @return Pointer to the group of object helper functions that implement this * @return Pointer to the group of object helper functions that implement this
* type of Object. * type of Object.
*/ */
static struct object_functions * Device_Objects_Find_Functions( static struct object_functions *Device_Objects_Find_Functions(
BACNET_OBJECT_TYPE Object_Type) BACNET_OBJECT_TYPE Object_Type)
{ {
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
@@ -261,13 +183,13 @@ static struct object_functions * Device_Objects_Find_Functions(
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
/* handle each object type */ /* handle each object type */
if (pObject->Object_Type == Object_Type) { if (pObject->Object_Type == Object_Type) {
return(pObject); return (pObject);
} }
pObject++; pObject++;
} }
return(NULL); return (NULL);
} }
/** Try to find a rr_info_function helper function for the requested object type. /** Try to find a rr_info_function helper function for the requested object type.
@@ -281,12 +203,11 @@ static struct object_functions * Device_Objects_Find_Functions(
*/ */
rr_info_function Device_Objects_RR_Info( rr_info_function Device_Objects_RR_Info(
BACNET_OBJECT_TYPE object_type) BACNET_OBJECT_TYPE object_type)
{ {
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
return(pObject != NULL ? pObject->Object_RR_Info : NULL); return (pObject != NULL ? pObject->Object_RR_Info : NULL);
} }
static unsigned property_list_count( static unsigned property_list_count(
@@ -332,21 +253,22 @@ void Device_Objects_Property_List(
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_RPM_List != NULL)) { if ((pObject != NULL) && (pObject->Object_RPM_List != NULL)) {
pObject->Object_RPM_List( pObject->Object_RPM_List(&pPropertyList->Required.pList,
&pPropertyList->Required.pList, &pPropertyList->Optional.pList, &pPropertyList->Proprietary.pList);
&pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList);
} }
/* Fetch the counts if available otherwise zero them */ /* Fetch the counts if available otherwise zero them */
pPropertyList->Required.count = pPropertyList->Required.pList == NULL pPropertyList->Required.count =
? 0 : property_list_count(pPropertyList->Required.pList); pPropertyList->Required.pList ==
NULL ? 0 : property_list_count(pPropertyList->Required.pList);
pPropertyList->Optional.count = pPropertyList->Optional.pList == NULL pPropertyList->Optional.count =
? 0 : property_list_count(pPropertyList->Optional.pList); pPropertyList->Optional.pList ==
NULL ? 0 : property_list_count(pPropertyList->Optional.pList);
pPropertyList->Proprietary.count = pPropertyList->Proprietary.pList == NULL pPropertyList->Proprietary.count =
? 0 : property_list_count(pPropertyList->Proprietary.pList); pPropertyList->Proprietary.pList ==
NULL ? 0 : property_list_count(pPropertyList->Proprietary.pList);
return; return;
} }
@@ -365,7 +287,7 @@ void Device_Objects_Property_List(
* @return True if succeeds (password is correct), else False. * @return True if succeeds (password is correct), else False.
*/ */
bool Device_Reinitialize( bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data) BACNET_REINITIALIZE_DEVICE_DATA * rd_data)
{ {
bool status = false; bool status = false;
@@ -517,7 +439,8 @@ static uint32_t Database_Revision = 0;
/* Slave_Address_Binding */ /* Slave_Address_Binding */
/* Profile_Name */ /* Profile_Name */
unsigned Device_Count(void) unsigned Device_Count(
void)
{ {
return 1; return 1;
} }
@@ -551,8 +474,7 @@ bool Device_Set_Object_Instance_Number(
/* Make the change and update the database revision */ /* Make the change and update the database revision */
Object_Instance_Number = object_id; Object_Instance_Number = object_id;
Device_Inc_Database_Revision(); Device_Inc_Database_Revision();
} } else
else
status = false; status = false;
return status; return status;
@@ -616,8 +538,8 @@ int Device_Set_System_Status(
/* We limit the options available depending on whether the source is /* We limit the options available depending on whether the source is
* internal or external. */ * internal or external. */
if(local) { if (local) {
switch(status) { switch (status) {
case STATUS_OPERATIONAL: case STATUS_OPERATIONAL:
case STATUS_OPERATIONAL_READ_ONLY: case STATUS_OPERATIONAL_READ_ONLY:
case STATUS_DOWNLOAD_REQUIRED: case STATUS_DOWNLOAD_REQUIRED:
@@ -636,7 +558,7 @@ int Device_Set_System_Status(
break; break;
} }
} else { } else {
switch(status) { switch (status) {
/* Allow these for the moment as a way to easily alter /* Allow these for the moment as a way to easily alter
* overall device operation. The lack of password protection * overall device operation. The lack of password protection
* or other authentication makes allowing writes to this * or other authentication makes allowing writes to this
@@ -670,7 +592,7 @@ int Device_Set_System_Status(
} }
} }
return(result); return (result);
} }
const char *Device_Vendor_Name( const char *Device_Vendor_Name(
@@ -884,20 +806,21 @@ bool Device_Object_List_Identifier(
if (object_index < count) { if (object_index < count) {
/* Use the iterator function if available otherwise /* Use the iterator function if available otherwise
* look for the index to instance to get the ID */ * look for the index to instance to get the ID */
if(pObject->Object_Iterator) { if (pObject->Object_Iterator) {
/* First find the first object */ /* First find the first object */
temp_index = pObject->Object_Iterator(~0); temp_index = pObject->Object_Iterator(~0);
/* Then step through the objects to find the nth */ /* Then step through the objects to find the nth */
while(object_index != 0) { while (object_index != 0) {
temp_index = pObject->Object_Iterator(temp_index); temp_index = pObject->Object_Iterator(temp_index);
object_index--; object_index--;
} }
/* set the object_index up before falling through to next bit */ /* set the object_index up before falling through to next bit */
object_index = temp_index; object_index = temp_index;
} }
if(pObject->Object_Index_To_Instance) { if (pObject->Object_Index_To_Instance) {
*object_type = pObject->Object_Type; *object_type = pObject->Object_Type;
*instance = pObject->Object_Index_To_Instance(object_index); *instance =
pObject->Object_Index_To_Instance(object_index);
status = true; status = true;
break; break;
} }
@@ -969,14 +892,15 @@ char *Device_Valid_Object_Id(
return name; return name;
} }
static void Update_Current_Time(void) static void Update_Current_Time(
void)
{ {
struct tm *tblock = NULL; struct tm *tblock = NULL;
#if defined(_MSC_VER) #if defined(_MSC_VER)
time_t tTemp; time_t tTemp;
#else #else
struct timeval tv; struct timeval tv;
#endif #endif
/* /*
struct tm struct tm
@@ -990,43 +914,33 @@ int tm_wday Day of week [0,6] (Sunday =0).
int tm_yday Day of year [0,365]. int tm_yday Day of year [0,365].
int tm_isdst Daylight Savings flag. int tm_isdst Daylight Savings flag.
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER)
time(&tTemp); time(&tTemp);
tblock = localtime(&tTemp); tblock = localtime(&tTemp);
#else #else
if (gettimeofday(&tv, NULL) == 0) { if (gettimeofday(&tv, NULL) == 0) {
tblock = localtime(&tv.tv_sec); tblock = localtime(&tv.tv_sec);
} }
#endif #endif
if (tblock) { if (tblock) {
datetime_set_date( datetime_set_date(&Local_Date, (uint16_t) tblock->tm_year + 1900,
&Local_Date, (uint8_t) tblock->tm_mon + 1, (uint8_t) tblock->tm_mday);
(uint16_t) tblock->tm_year+1900, #if !defined(_MSC_VER)
(uint8_t) tblock->tm_mon+1, datetime_set_time(&Local_Time, (uint8_t) tblock->tm_hour,
(uint8_t) tblock->tm_mday); (uint8_t) tblock->tm_min, (uint8_t) tblock->tm_sec,
#if !defined(_MSC_VER) (uint8_t) (tv.tv_usec / 10000));
datetime_set_time( #else
&Local_Time, datetime_set_time(&Local_Time, (uint8_t) tblock->tm_hour,
(uint8_t) tblock->tm_hour, (uint8_t) tblock->tm_min, (uint8_t) tblock->tm_sec, 0);
(uint8_t) tblock->tm_min, #endif
(uint8_t) tblock->tm_sec,
(uint8_t)(tv.tv_usec / 10000));
#else
datetime_set_time(
&Local_Time,
(uint8_t) tblock->tm_hour,
(uint8_t) tblock->tm_min,
(uint8_t) tblock->tm_sec,
0);
#endif
if (tblock->tm_isdst) { if (tblock->tm_isdst) {
Daylight_Savings_Status = true; Daylight_Savings_Status = true;
} else { } else {
Daylight_Savings_Status = false; Daylight_Savings_Status = false;
} }
/* note: timezone is declared in <time.h> stdlib. */ /* note: timezone is declared in <time.h> stdlib. */
UTC_Offset = timezone/60; UTC_Offset = timezone / 60;
} else { } else {
datetime_date_wildcard_set(&Local_Date); datetime_date_wildcard_set(&Local_Date);
datetime_time_wildcard_set(&Local_Time); datetime_time_wildcard_set(&Local_Time);
@@ -1037,7 +951,7 @@ int tm_isdst Daylight Savings flag.
/* return the length of the apdu encoded or -1 for error or /* return the length of the apdu encoded or -1 for error or
-2 for abort message */ -2 for abort message */
static int Device_Read_Property_Local( static int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
int len = 0; /* apdu len intermediate value */ int len = 0; /* apdu len intermediate value */
@@ -1051,8 +965,7 @@ static int Device_Read_Property_Local(
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
bool found = false; bool found = false;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -1162,8 +1075,7 @@ static int Device_Read_Property_Local(
pObject = &Object_Table[0]; pObject = &Object_Table[0];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if ((pObject->Object_Count) && if ((pObject->Object_Count) && (pObject->Object_Count() > 0)) {
(pObject->Object_Count() > 0)) {
bitstring_set_bit(&bit_string, pObject->Object_Type, true); bitstring_set_bit(&bit_string, pObject->Object_Type, true);
} }
pObject++; pObject++;
@@ -1181,9 +1093,8 @@ static int Device_Read_Property_Local(
/* your maximum APDU size. */ /* your maximum APDU size. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
for (i = 1; i <= count; i++) { for (i = 1; i <= count; i++) {
found = Device_Object_List_Identifier( found =
i, Device_Object_List_Identifier(i, &object_type,
&object_type,
&instance); &instance);
if (found) { if (found) {
len = len =
@@ -1206,10 +1117,9 @@ static int Device_Read_Property_Local(
} }
} }
} else { } else {
found = Device_Object_List_Identifier( found =
rpdata->array_index, Device_Object_List_Identifier(rpdata->array_index,
&object_type, &object_type, &instance);
&instance);
if (found) { if (found) {
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], object_type, encode_application_object_id(&apdu[0], object_type,
@@ -1265,8 +1175,7 @@ static int Device_Read_Property_Local(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -1285,7 +1194,7 @@ static int Device_Read_Property_Local(
* @return The length of the APDU on success, else -1 * @return The length of the APDU on success, else -1
*/ */
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = -1;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
@@ -1329,13 +1238,13 @@ static bool Device_Write_Property_Local(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_OBJECT_ID, WPValidateArgType(&value, BACNET_APPLICATION_TAG_OBJECT_ID,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) && 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 */ /* FIXME: we could send an I-Am broadcast to let the world know */
} else { } else {
status = false; status = false;
@@ -1345,41 +1254,37 @@ static bool Device_Write_Property_Local(
} }
break; break;
case PROP_NUMBER_OF_APDU_RETRIES: case PROP_NUMBER_OF_APDU_RETRIES:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* FIXME: bounds check? */ /* FIXME: bounds check? */
apdu_retries_set((uint8_t) value.type.Unsigned_Int); apdu_retries_set((uint8_t) value.type.Unsigned_Int);
} }
break; break;
case PROP_APDU_TIMEOUT: case PROP_APDU_TIMEOUT:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* FIXME: bounds check? */ /* FIXME: bounds check? */
apdu_timeout_set((uint16_t) value.type.Unsigned_Int); apdu_timeout_set((uint16_t) value.type.Unsigned_Int);
} }
break; break;
case PROP_VENDOR_IDENTIFIER: case PROP_VENDOR_IDENTIFIER:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* FIXME: bounds check? */ /* FIXME: bounds check? */
Device_Set_Vendor_Identifier((uint16_t) value. Device_Set_Vendor_Identifier((uint16_t) value.type.
type.Unsigned_Int); Unsigned_Int);
} }
break; break;
case PROP_SYSTEM_STATUS: case PROP_SYSTEM_STATUS:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_ENUMERATED, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
temp = Device_Set_System_Status((BACNET_DEVICE_STATUS) temp = Device_Set_System_Status((BACNET_DEVICE_STATUS)
value.type.Enumerated, false); value.type.Enumerated, false);
@@ -1389,62 +1294,63 @@ static bool Device_Write_Property_Local(
if (temp == -1) { if (temp == -1) {
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} else { } else {
wp_data->error_code = ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED; wp_data->error_code =
ERROR_CODE_OPTIONAL_FUNCTIONALITY_NOT_SUPPORTED;
} }
} }
} }
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
status = WPValidateString(&value, status =
MAX_DEV_NAME_LEN, WPValidateString(&value, MAX_DEV_NAME_LEN, false,
false, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_class,
&wp_data->error_code);
if (status) { if (status) {
Device_Set_Object_Name(characterstring_value(&value.type.Character_String), characterstring_length(&value.type.Character_String)); Device_Set_Object_Name(characterstring_value(&value.type.
Character_String),
characterstring_length(&value.type.Character_String));
} }
break; break;
case PROP_LOCATION: case PROP_LOCATION:
status = WPValidateString(&value, status =
MAX_DEV_LOC_LEN, WPValidateString(&value, MAX_DEV_LOC_LEN, true,
true,
&wp_data->error_class, &wp_data->error_code); &wp_data->error_class, &wp_data->error_code);
if (status) { if (status) {
Device_Set_Location(characterstring_value(&value.type.Character_String), characterstring_length(&value.type.Character_String)); Device_Set_Location(characterstring_value(&value.type.
Character_String),
characterstring_length(&value.type.Character_String));
} }
break; break;
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
status = WPValidateString(&value, status =
MAX_DEV_DESC_LEN, WPValidateString(&value, MAX_DEV_DESC_LEN, true,
true, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_class,
&wp_data->error_code);
if (status) { if (status) {
Device_Set_Description(characterstring_value(&value.type.Character_String), characterstring_length(&value.type.Character_String)); Device_Set_Description(characterstring_value(&value.type.
Character_String),
characterstring_length(&value.type.Character_String));
} }
break; break;
case PROP_MODEL_NAME: case PROP_MODEL_NAME:
status = WPValidateString(&value, status =
MAX_DEV_MOD_LEN, WPValidateString(&value, MAX_DEV_MOD_LEN, true,
true, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_class,
&wp_data->error_code);
if (status) { if (status) {
Device_Set_Model_Name(characterstring_value(&value.type.Character_String), characterstring_length(&value.type.Character_String)); Device_Set_Model_Name(characterstring_value(&value.type.
Character_String),
characterstring_length(&value.type.Character_String));
} }
break; break;
#if defined(BACDL_MSTP) #if defined(BACDL_MSTP)
case PROP_MAX_INFO_FRAMES: case PROP_MAX_INFO_FRAMES:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (value.type.Unsigned_Int <= 255) { if (value.type.Unsigned_Int <= 255) {
dlmstp_set_max_info_frames((uint8_t) value. dlmstp_set_max_info_frames((uint8_t) value.type.
type.Unsigned_Int); Unsigned_Int);
} else { } else {
status = false; status = false;
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
@@ -1453,10 +1359,9 @@ static bool Device_Write_Property_Local(
} }
break; break;
case PROP_MAX_MASTER: case PROP_MAX_MASTER:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if ((value.type.Unsigned_Int > 0) && if ((value.type.Unsigned_Int > 0) &&
(value.type.Unsigned_Int <= 127)) { (value.type.Unsigned_Int <= 127)) {
@@ -1515,7 +1420,7 @@ bool Device_Write_Property(
wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE; wp_data->error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE;
} }
return(status); return (status);
} }
@@ -1537,12 +1442,12 @@ void Device_Init(
} }
bool DeviceGetRRInfo( bool DeviceGetRRInfo(
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */ BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */
RR_PROP_INFO *pInfo) /* Where to put the response */ RR_PROP_INFO * pInfo)
{ { /* Where to put the response */
bool status = false; /* return value */ bool status = false; /* return value */
switch(pRequest->object_property) { switch (pRequest->object_property) {
case PROP_VT_CLASSES_SUPPORTED: case PROP_VT_CLASSES_SUPPORTED:
case PROP_ACTIVE_VT_SESSIONS: case PROP_ACTIVE_VT_SESSIONS:
case PROP_LIST_OF_SESSION_KEYS: case PROP_LIST_OF_SESSION_KEYS:
bacnet-stack/demo/object/lc.c
+23 -30
View File
@@ -680,7 +680,7 @@ void Load_Control_State_Machine_Handler(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Load_Control_Read_Property( int Load_Control_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -692,8 +692,7 @@ int Load_Control_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -980,23 +979,22 @@ bool Load_Control_Write_Property(
break; break;
case PROP_START_TIME: case PROP_START_TIME:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_DATE, WPValidateArgType(&value, BACNET_APPLICATION_TAG_DATE,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (!status) { if (!status) {
/* don't continue if we don't have a valid date */ /* don't continue if we don't have a valid date */
break; break;
} }
/* Hold the date until we are sure the time is also there */ /* Hold the date until we are sure the time is also there */
TempDate = value.type.Date; TempDate = value.type.Date;
len = bacapp_decode_application_data(wp_data->application_data + len, len =
bacapp_decode_application_data(wp_data->application_data + len,
wp_data->application_data_len - len, &value); wp_data->application_data_len - len, &value);
if (len) { if (len) {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_TIME, WPValidateArgType(&value, BACNET_APPLICATION_TAG_TIME,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* Write time and date and set written flag */ /* Write time and date and set written flag */
Start_Time[object_index].date = TempDate; Start_Time[object_index].date = TempDate;
@@ -1011,10 +1009,9 @@ bool Load_Control_Write_Property(
break; break;
case PROP_SHED_DURATION: case PROP_SHED_DURATION:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
Shed_Duration[object_index] = value.type.Unsigned_Int; Shed_Duration[object_index] = value.type.Unsigned_Int;
Load_Control_Request_Written[object_index] = true; Load_Control_Request_Written[object_index] = true;
@@ -1022,10 +1019,9 @@ bool Load_Control_Write_Property(
break; break;
case PROP_DUTY_WINDOW: case PROP_DUTY_WINDOW:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
Duty_Window[object_index] = value.type.Unsigned_Int; Duty_Window[object_index] = value.type.Unsigned_Int;
Load_Control_Request_Written[object_index] = true; Load_Control_Request_Written[object_index] = true;
@@ -1033,10 +1029,9 @@ bool Load_Control_Write_Property(
break; break;
case PROP_SHED_LEVELS: case PROP_SHED_LEVELS:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
/* re-write the size of the array? */ /* re-write the size of the array? */
if (wp_data->array_index == 0) { if (wp_data->array_index == 0) {
@@ -1059,10 +1054,9 @@ bool Load_Control_Write_Property(
break; break;
case PROP_ENABLE: case PROP_ENABLE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
Load_Control_Enable[object_index] = value.type.Boolean; Load_Control_Enable[object_index] = value.type.Boolean;
} }
@@ -1485,8 +1479,7 @@ void testLoadControl(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/lo.c
+28 -30
View File
@@ -152,7 +152,7 @@ int Lighting_Output_Decode_Lighting_Command(
apdu_len += len; apdu_len += len;
len = len =
decode_enumerated(&apdu[apdu_len], len_value_type, decode_enumerated(&apdu[apdu_len], len_value_type,
(uint32_t *)&data->operation); (uint32_t *) & data->operation);
apdu_len += len; apdu_len += len;
/* Tag 1: level - OPTIONAL */ /* Tag 1: level - OPTIONAL */
if (decode_is_context_tag(&apdu[apdu_len], 1)) { if (decode_is_context_tag(&apdu[apdu_len], 1)) {
@@ -162,7 +162,7 @@ int Lighting_Output_Decode_Lighting_Command(
apdu_len += len; apdu_len += len;
len = decode_real(&apdu[apdu_len], &real_value); len = decode_real(&apdu[apdu_len], &real_value);
apdu_len += len; apdu_len += len;
data->level = (uint8_t)real_value; data->level = (uint8_t) real_value;
/* FIXME: are we going to flag errors in decoding values here? */ /* FIXME: are we going to flag errors in decoding values here? */
} }
/* FIXME: finish me! */ /* FIXME: finish me! */
@@ -359,7 +359,7 @@ char *Lighting_Output_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Lighting_Output_Read_Property( int Lighting_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -371,8 +371,7 @@ int Lighting_Output_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -398,11 +397,13 @@ int Lighting_Output_Read_Property(
OBJECT_LIGHTING_OUTPUT); OBJECT_LIGHTING_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
real_value = Lighting_Output_Present_Value(rpdata->object_instance); real_value =
Lighting_Output_Present_Value(rpdata->object_instance);
apdu_len = encode_application_real(&apdu[0], real_value); apdu_len = encode_application_real(&apdu[0], real_value);
break; break;
case PROP_PROGRESS_VALUE: case PROP_PROGRESS_VALUE:
real_value = Lighting_Output_Progress_Value(rpdata->object_instance); real_value =
Lighting_Output_Progress_Value(rpdata->object_instance);
apdu_len = encode_application_real(&apdu[0], real_value); apdu_len = encode_application_real(&apdu[0], real_value);
break; break;
case PROP_LIGHTING_COMMAND: case PROP_LIGHTING_COMMAND:
@@ -423,7 +424,8 @@ int Lighting_Output_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Lighting_Output_Instance_To_Index(rpdata->object_instance); object_index =
Lighting_Output_Instance_To_Index(rpdata->object_instance);
state = Lighting_Output_Out_Of_Service[object_index]; state = Lighting_Output_Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -465,13 +467,13 @@ int Lighting_Output_Read_Property(
object_index = object_index =
Lighting_Output_Instance_To_Index(rpdata->object_instance); Lighting_Output_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Lighting_Output_Level[object_index][rpdata->array_index - 1] == if (Lighting_Output_Level[object_index][rpdata->
LIGHTING_LEVEL_NULL) array_index - 1] == LIGHTING_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Lighting_Output_Level[object_index][rpdata->array_index - Lighting_Output_Level[object_index][rpdata->
1]; array_index - 1];
apdu_len = apdu_len =
encode_application_real(&apdu[0], real_value); encode_application_real(&apdu[0], real_value);
} }
@@ -494,8 +496,7 @@ int Lighting_Output_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -541,18 +542,17 @@ bool Lighting_Output_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = LIGHTING_LEVEL_NULL; level = LIGHTING_LEVEL_NULL;
object_index = object_index =
Lighting_Output_Instance_To_Index Lighting_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
status = status =
Lighting_Output_Present_Value_Relinquish Lighting_Output_Present_Value_Relinquish(wp_data->
(wp_data->object_instance, wp_data->priority); object_instance, wp_data->priority);
if (wp_data->priority == 6) { if (wp_data->priority == 6) {
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
algorithm and may not be used for other purposes in any algorithm and may not be used for other purposes in any
@@ -574,14 +574,13 @@ bool Lighting_Output_Write_Property(
&Lighting_Command[wp_data->object_instance]); &Lighting_Command[wp_data->object_instance]);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Lighting_Output_Instance_To_Index Lighting_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
Lighting_Output_Out_Of_Service[object_index] = Lighting_Output_Out_Of_Service[object_index] =
value.type.Boolean; value.type.Boolean;
} }
@@ -623,8 +622,7 @@ void testLightingOutput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/lsp.c
+16 -20
View File
@@ -188,7 +188,7 @@ char *Life_Safety_Point_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Life_Safety_Point_Read_Property( int Life_Safety_Point_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -203,8 +203,7 @@ int Life_Safety_Point_Read_Property(
BACNET_RELIABILITY reliability = RELIABILITY_NO_FAULT_DETECTED; BACNET_RELIABILITY reliability = RELIABILITY_NO_FAULT_DETECTED;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -228,7 +227,8 @@ int Life_Safety_Point_Read_Property(
OBJECT_LIFE_SAFETY_POINT); OBJECT_LIFE_SAFETY_POINT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Life_Safety_Point_Present_Value(rpdata->object_instance); present_value =
Life_Safety_Point_Present_Value(rpdata->object_instance);
apdu_len = encode_application_enumerated(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -286,8 +286,7 @@ int Life_Safety_Point_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -313,15 +312,14 @@ bool Life_Safety_Point_Write_Property(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_MODE: case PROP_MODE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_ENUMERATED, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (value.type.Enumerated <= MAX_LIFE_SAFETY_MODE) { if (value.type.Enumerated <= MAX_LIFE_SAFETY_MODE) {
object_index = object_index =
Life_Safety_Point_Instance_To_Index Life_Safety_Point_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
Life_Safety_Point_Mode[object_index] = Life_Safety_Point_Mode[object_index] =
value.type.Enumerated; value.type.Enumerated;
} else { } else {
@@ -332,14 +330,13 @@ bool Life_Safety_Point_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Life_Safety_Point_Instance_To_Index Life_Safety_Point_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
Life_Safety_Point_Out_Of_Service[object_index] = Life_Safety_Point_Out_Of_Service[object_index] =
value.type.Boolean; value.type.Boolean;
} }
@@ -381,8 +378,7 @@ void testLifeSafetyPoint(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/ms-input.c
+26 -26
View File
@@ -318,7 +318,7 @@ bool Multistate_Input_State_Text_Set(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Multistate_Input_Read_Property( int Multistate_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -330,8 +330,7 @@ int Multistate_Input_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -362,7 +361,8 @@ int Multistate_Input_Read_Property(
OBJECT_MULTI_STATE_INPUT); OBJECT_MULTI_STATE_INPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Multistate_Input_Present_Value(rpdata->object_instance); present_value =
Multistate_Input_Present_Value(rpdata->object_instance);
apdu_len = encode_application_unsigned(&apdu[0], present_value); apdu_len = encode_application_unsigned(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -380,7 +380,8 @@ int Multistate_Input_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Multistate_Input_Instance_To_Index(rpdata->object_instance); object_index =
Multistate_Input_Instance_To_Index(rpdata->object_instance);
state = Out_Of_Service[object_index]; state = Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
@@ -399,10 +400,12 @@ int Multistate_Input_Read_Property(
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
object_index = 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++) { for (i = 0; i < MULTISTATE_NUMBER_OF_STATES; i++) {
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Multistate_Input_State_Text(rpdata->object_instance, i)); Multistate_Input_State_Text(rpdata->object_instance,
i));
/* FIXME: this might go beyond MAX_APDU length! */ /* FIXME: this might go beyond MAX_APDU length! */
len = len =
encode_application_character_string(&apdu[apdu_len], encode_application_character_string(&apdu[apdu_len],
@@ -419,11 +422,12 @@ int Multistate_Input_Read_Property(
} }
} else { } else {
object_index = 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) { if (rpdata->array_index <= MULTISTATE_NUMBER_OF_STATES) {
characterstring_init_ansi(&char_string, characterstring_init_ansi(&char_string,
Multistate_Input_State_Text(rpdata->object_instance, Multistate_Input_State_Text(rpdata->object_instance,
rpdata->array_index-1)); rpdata->array_index - 1));
apdu_len = apdu_len =
encode_application_character_string(&apdu[0], encode_application_character_string(&apdu[0],
&char_string); &char_string);
@@ -441,8 +445,7 @@ int Multistate_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_STATE_TEXT) &&
(rpdata->object_property != PROP_STATE_TEXT) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -469,15 +472,14 @@ bool Multistate_Input_Write_Property(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_UNSIGNED_INT, WPValidateArgType(&value, BACNET_APPLICATION_TAG_UNSIGNED_INT,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (Out_Of_Service[object_index]) { if (Out_Of_Service[object_index]) {
status = Multistate_Input_Present_Value_Set( status =
wp_data->object_instance, Multistate_Input_Present_Value_Set(wp_data->
value.type.Unsigned_Int); object_instance, value.type.Unsigned_Int);
if (!status) { if (!status) {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
@@ -490,14 +492,13 @@ bool Multistate_Input_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Multistate_Input_Instance_To_Index Multistate_Input_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
Out_Of_Service[object_index] = value.type.Boolean; Out_Of_Service[object_index] = value.type.Boolean;
} }
break; break;
@@ -538,8 +539,7 @@ void testMultistateInput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/mso.c
+26 -28
View File
@@ -195,7 +195,7 @@ char *Multistate_Output_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Multistate_Output_Read_Property( int Multistate_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -207,8 +207,7 @@ int Multistate_Output_Read_Property(
bool state = false; bool state = false;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -234,7 +233,8 @@ int Multistate_Output_Read_Property(
OBJECT_MULTI_STATE_OUTPUT); OBJECT_MULTI_STATE_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Multistate_Output_Present_Value(rpdata->object_instance); present_value =
Multistate_Output_Present_Value(rpdata->object_instance);
apdu_len = encode_application_unsigned(&apdu[0], present_value); apdu_len = encode_application_unsigned(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -266,7 +266,8 @@ int Multistate_Output_Read_Property(
/* into one packet. */ /* into one packet. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
object_index = 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++) { for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */ /* FIXME: check if we have room before adding it to APDU */
if (Multistate_Output_Level[object_index][i] == if (Multistate_Output_Level[object_index][i] ==
@@ -291,15 +292,16 @@ int Multistate_Output_Read_Property(
} }
} else { } else {
object_index = 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 (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Multistate_Output_Level[object_index][rpdata->array_index - if (Multistate_Output_Level[object_index][rpdata->
1] == MULTISTATE_NULL) array_index - 1] == MULTISTATE_NULL)
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
present_value = present_value =
Multistate_Output_Level[object_index][rpdata->array_index - Multistate_Output_Level[object_index][rpdata->
1]; array_index - 1];
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], encode_application_unsigned(&apdu[0],
present_value); present_value);
@@ -329,8 +331,7 @@ int Multistate_Output_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -369,8 +370,8 @@ bool Multistate_Output_Write_Property(
(value.type.Unsigned_Int <= MULTISTATE_NUMBER_OF_STATES)) { (value.type.Unsigned_Int <= MULTISTATE_NUMBER_OF_STATES)) {
level = value.type.Unsigned_Int; level = value.type.Unsigned_Int;
object_index = object_index =
Multistate_Output_Instance_To_Index Multistate_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority--; priority--;
Multistate_Output_Level[object_index][priority] = Multistate_Output_Level[object_index][priority] =
(uint8_t) level; (uint8_t) level;
@@ -391,15 +392,14 @@ bool Multistate_Output_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = MULTISTATE_NULL; level = MULTISTATE_NULL;
object_index = object_index =
Multistate_Output_Instance_To_Index Multistate_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) { if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--; priority--;
@@ -420,14 +420,13 @@ bool Multistate_Output_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Multistate_Output_Instance_To_Index Multistate_Output_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
Multistate_Output_Out_Of_Service[object_index] = Multistate_Output_Out_Of_Service[object_index] =
value.type.Boolean; value.type.Boolean;
} }
@@ -469,8 +468,7 @@ void testMultistateOutput(
ct_test(pTest, len != 0); ct_test(pTest, len != 0);
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value); len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID); ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
len = len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
ct_test(pTest, decoded_type == rpdata.object_type); ct_test(pTest, decoded_type == rpdata.object_type);
ct_test(pTest, decoded_instance == rpdata.object_instance); ct_test(pTest, decoded_instance == rpdata.object_instance);
bacnet-stack/demo/object/trendlog.c
+416 -295
View File
File diff suppressed because it is too large Load Diff
bacnet-stack/demo/readrange/main.c
+55 -28
View File
@@ -281,13 +281,15 @@ int main(
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) { if (current_seconds != last_seconds) {
putchar('.'); /* Just to show that time is passing... */ putchar('.'); /* Just to show that time is passing... */
tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000)); tsm_timer_milliseconds(((current_seconds -
last_seconds) * 1000));
address_cache_timer(current_seconds - last_seconds); address_cache_timer(current_seconds - last_seconds);
trend_log_timer(current_seconds - last_seconds); trend_log_timer(current_seconds - last_seconds);
last_seconds = current_seconds; last_seconds = current_seconds;
/* Change the analog input PVs for testing purposes */ /* Change the analog input PVs for testing purposes */
for(iCount = 0; iCount < Analog_Input_Count(); iCount++) { for (iCount = 0; iCount < Analog_Input_Count(); iCount++) {
Analog_Input_Present_Value_Set(iCount, iSecondsRun * (iCount + 1)); Analog_Input_Present_Value_Set(iCount,
iSecondsRun * (iCount + 1));
} }
iSecondsRun++; iSecondsRun++;
@@ -326,7 +328,8 @@ int main(
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) { if (current_seconds != last_seconds) {
tsm_timer_milliseconds(((current_seconds - last_seconds) * 1000)); tsm_timer_milliseconds(((current_seconds -
last_seconds) * 1000));
address_cache_timer(current_seconds - last_seconds); address_cache_timer(current_seconds - last_seconds);
trend_log_timer(current_seconds - last_seconds); trend_log_timer(current_seconds - last_seconds);
last_seconds = current_seconds; last_seconds = current_seconds;
@@ -346,8 +349,10 @@ int main(
Request.Range.RefIndex = 1; Request.Range.RefIndex = 1;
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -356,8 +361,10 @@ int main(
Request.Range.RefSeqNum = 3; Request.Range.RefSeqNum = 3;
Request.Count = -2; Request.Count = -2;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -374,8 +381,10 @@ int main(
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -384,8 +393,10 @@ int main(
Request.Range.RefIndex = 1; Request.Range.RefIndex = 1;
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 1; Request.array_index = 1;
break; break;
@@ -394,8 +405,10 @@ int main(
Request.Range.RefSeqNum = 1; Request.Range.RefSeqNum = 1;
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -412,24 +425,30 @@ int main(
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 1; Request.array_index = 1;
break; break;
case 6: /* Pass - should try to return all entries */ case 6: /* Pass - should try to return all entries */
Request.RequestType = RR_READ_ALL; Request.RequestType = RR_READ_ALL;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
case 7: /* Fail - array not supported */ case 7: /* Fail - array not supported */
Request.RequestType = RR_READ_ALL; Request.RequestType = RR_READ_ALL;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 1; Request.array_index = 1;
break; break;
@@ -438,8 +457,10 @@ int main(
Request.Range.RefIndex = 1; Request.Range.RefIndex = 1;
Request.Count = 1; Request.Count = 1;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -448,8 +469,10 @@ int main(
Request.Range.RefIndex = 1; Request.Range.RefIndex = 1;
Request.Count = 2; Request.Count = 2;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -458,8 +481,10 @@ int main(
Request.Range.RefIndex = 2; Request.Range.RefIndex = 2;
Request.Count = 2; Request.Count = 2;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
@@ -468,8 +493,10 @@ int main(
Request.Range.RefIndex = 2; Request.Range.RefIndex = 2;
Request.Count = 10; Request.Count = 10;
Request.object_type = OBJECT_DEVICE; Request.object_type = OBJECT_DEVICE;
Request.object_instance = Target_Device_Object_Instance; Request.object_instance =
Request.object_property = PROP_DEVICE_ADDRESS_BINDING; Target_Device_Object_Instance;
Request.object_property =
PROP_DEVICE_ADDRESS_BINDING;
Request.array_index = 0; Request.array_index = 0;
break; break;
} }
bacnet-stack/demo/server/main.c
+1 -1
View File
@@ -184,4 +184,4 @@ int main(
} }
} }
/* @} */ /* End group ServerDemo */ /* @} *//* End group ServerDemo */
bacnet-stack/demo/ucov/main.c
+1 -2
View File
@@ -160,8 +160,7 @@ int main(
} }
if (cov_data.monitoredObjectIdentifier.type >= MAX_BACNET_OBJECT_TYPE) { if (cov_data.monitoredObjectIdentifier.type >= MAX_BACNET_OBJECT_TYPE) {
fprintf(stderr, "object-type=%u - it must be less than %u\r\n", fprintf(stderr, "object-type=%u - it must be less than %u\r\n",
cov_data.monitoredObjectIdentifier.type, cov_data.monitoredObjectIdentifier.type, MAX_BACNET_OBJECT_TYPE);
MAX_BACNET_OBJECT_TYPE);
return 1; return 1;
} }
if (cov_data.monitoredObjectIdentifier.instance > BACNET_MAX_INSTANCE) { if (cov_data.monitoredObjectIdentifier.instance > BACNET_MAX_INSTANCE) {
bacnet-stack/include/address.h
+2 -2
View File
@@ -95,8 +95,8 @@ extern "C" {
unsigned apdu_len); unsigned apdu_len);
int rr_address_list_encode( int rr_address_list_encode(
uint8_t *apdu, uint8_t * apdu,
BACNET_READ_RANGE_DATA *pRequest); BACNET_READ_RANGE_DATA * pRequest);
void address_set_device_TTL( void address_set_device_TTL(
uint32_t device_id, uint32_t device_id,
bacnet-stack/include/ai.h
+1 -1
View File
@@ -69,7 +69,7 @@ extern "C" {
uint32_t instance); uint32_t instance);
int Analog_Input_Read_Property( int Analog_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Analog_Input_Write_Property( bool Analog_Input_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/ao.h
+1 -1
View File
@@ -86,7 +86,7 @@ extern "C" {
void); void);
int Analog_Output_Read_Property( int Analog_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Analog_Output_Write_Property( bool Analog_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/apdu.h
+2 -2
View File
@@ -163,8 +163,8 @@ extern "C" {
*/ */
bool apdu_service_supported_to_index( bool apdu_service_supported_to_index(
BACNET_SERVICES_SUPPORTED service_supported, BACNET_SERVICES_SUPPORTED service_supported,
size_t *index, size_t * index,
bool *bIsConfirmed ); bool * bIsConfirmed);
void apdu_set_error_handler( void apdu_set_error_handler(
bacnet-stack/include/av.h
+1 -1
View File
@@ -49,7 +49,7 @@ extern "C" {
uint32_t object_instance); uint32_t object_instance);
int Analog_Value_Read_Property( int Analog_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Analog_Value_Write_Property( bool Analog_Value_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/bacfile.h
+1 -1
View File
@@ -81,7 +81,7 @@ extern "C" {
/* handling for read property service */ /* handling for read property service */
int bacfile_read_property( int bacfile_read_property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
/* handling for write property service */ /* handling for write property service */
bool bacfile_write_property( bool bacfile_write_property(
bacnet-stack/include/bi.h
+1 -1
View File
@@ -84,7 +84,7 @@ extern "C" {
BACNET_PROPERTY_VALUE * value_list); BACNET_PROPERTY_VALUE * value_list);
int Binary_Input_Read_Property( int Binary_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Binary_Input_Write_Property( bool Binary_Input_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/bip.h
-2
View File
@@ -122,7 +122,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DLBIP BACnet/IP DataLink Network Layer /** @defgroup DLBIP BACnet/IP DataLink Network Layer
* @ingroup DataLink * @ingroup DataLink
* Implementation of the Network Layer using BACnet/IP as the transport, as * Implementation of the Network Layer using BACnet/IP as the transport, as
@@ -131,5 +130,4 @@ extern "C" {
* DataLink level by serving as the implementation of the function templates. * DataLink level by serving as the implementation of the function templates.
* *
*/ */
#endif #endif
bacnet-stack/include/bo.h
+1 -1
View File
@@ -79,7 +79,7 @@ extern "C" {
char *new_name); char *new_name);
int Binary_Output_Read_Property( int Binary_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Binary_Output_Write_Property( bool Binary_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/bv.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
void); void);
int Binary_Value_Read_Property( int Binary_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Binary_Value_Write_Property( bool Binary_Value_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/cov.h
-2
View File
@@ -126,7 +126,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DSCOV Data Sharing - Change of Value Service (DS-COV) /** @defgroup DSCOV Data Sharing - Change of Value Service (DS-COV)
* @ingroup DataShare * @ingroup DataShare
* 13.1 Change of Value Reporting <br> * 13.1 Change of Value Reporting <br>
@@ -140,5 +139,4 @@ extern "C" {
* devices or to operators or logging devices. Any object, proprietary or * devices or to operators or logging devices. Any object, proprietary or
* standard, may support COV reporting at the implementor's option. * standard, may support COV reporting at the implementor's option.
*/ */
#endif #endif
bacnet-stack/include/datalink.h
+1 -5
View File
@@ -118,7 +118,6 @@ extern "C" {
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif #endif
/** @defgroup DataLink The BACnet Network (DataLink) Layer /** @defgroup DataLink The BACnet Network (DataLink) Layer
* <b>6 THE NETWORK LAYER </b><br> * <b>6 THE NETWORK LAYER </b><br>
* The purpose of the BACnet network layer is to provide the means by which * The purpose of the BACnet network layer is to provide the means by which
@@ -140,13 +139,10 @@ extern "C" {
* chosen at runtime from among these choices. * chosen at runtime from among these choices.
* - Clause 10 POINT-TO-POINT (PTP) and Clause 11 EIA/CEA-709.1 ("LonTalk") LAN * - Clause 10 POINT-TO-POINT (PTP) and Clause 11 EIA/CEA-709.1 ("LonTalk") LAN
* are not currently supported by this project. * are not currently supported by this project.
*/ *//** @defgroup DLTemplates DataLink Template Functions
/** @defgroup DLTemplates DataLink Template Functions
* @ingroup DataLink * @ingroup DataLink
* Most of the functions in this group are function templates which are assigned * 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 * to a specific DataLink network layer implementation either at compile time or
* at runtime. * at runtime.
*/ */
#endif #endif
bacnet-stack/include/dcc.h
+1 -5
View File
@@ -97,14 +97,11 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup RDMS Remote Device Management Services BIBBs /** @defgroup RDMS Remote Device Management Services BIBBs
* These device management BIBBs prescribe the BACnet capabilities required * These device management BIBBs prescribe the BACnet capabilities required
* to interoperably perform the device management functions enumerated in * to interoperably perform the device management functions enumerated in
* 22.2.1.5 for the BACnet devices defined therein. * 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 * @ingroup RDMS
* 16.1 DeviceCommunicationControl Service <br> * 16.1 DeviceCommunicationControl Service <br>
* The DeviceCommunicationControl service is used by a client BACnet-user to * The DeviceCommunicationControl service is used by a client BACnet-user to
@@ -118,5 +115,4 @@ extern "C" {
* DeviceCommunicationControl or, if supported, ReinitializeDevice service, * DeviceCommunicationControl or, if supported, ReinitializeDevice service,
* not by time. * not by time.
*/ */
#endif #endif
bacnet-stack/include/device.h
+11 -16
View File
@@ -106,7 +106,7 @@ typedef bool(
* == 1) to indicate no more objects found. * == 1) to indicate no more objects found.
*/ */
typedef unsigned ( typedef unsigned (
*object_iterate_function)( *object_iterate_function) (
unsigned current_index); unsigned current_index);
@@ -118,9 +118,10 @@ extern "C" {
void); void);
bool Device_Reinitialize( bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data); BACNET_REINITIALIZE_DEVICE_DATA * rd_data);
BACNET_REINITIALIZED_STATE Device_Reinitialized_State(void); BACNET_REINITIALIZED_STATE Device_Reinitialized_State(
void);
rr_info_function Device_Objects_RR_Info( rr_info_function Device_Objects_RR_Info(
BACNET_OBJECT_TYPE object_type); BACNET_OBJECT_TYPE object_type);
@@ -146,7 +147,8 @@ extern "C" {
int *object_type, int *object_type,
uint32_t * instance); uint32_t * instance);
unsigned Device_Count(void); unsigned Device_Count(
void);
uint32_t Device_Index_To_Instance( uint32_t Device_Index_To_Instance(
unsigned index); unsigned index);
char *Device_Name( char *Device_Name(
@@ -221,19 +223,18 @@ extern "C" {
uint32_t object_instance); uint32_t object_instance);
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Device_Write_Property( bool Device_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bool DeviceGetRRInfo( bool DeviceGetRRInfo(
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */ BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */
RR_PROP_INFO *pInfo); /* Where to put the information */ RR_PROP_INFO * pInfo); /* Where to put the information */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup ObjFrmwk Object Framework /** @defgroup ObjFrmwk Object Framework
* The modules in this section describe the BACnet-stack's framework for * The modules in this section describe the BACnet-stack's framework for
* BACnet-defined Objects (Device, Analog Input, etc). There are two submodules * BACnet-defined Objects (Device, Analog Input, etc). There are two submodules
@@ -243,15 +244,11 @@ extern "C" {
* - The interface between the implemented Objects and the BAC-stack services, * - The interface between the implemented Objects and the BAC-stack services,
* specifically the handlers, which are mediated through function calls to * specifically the handlers, which are mediated through function calls to
* the Device object. * the Device object.
*/ *//** @defgroup ObjHelpers Object Helper Functions
/** @defgroup ObjHelpers Object Helper Functions
* @ingroup ObjFrmwk * @ingroup ObjFrmwk
* This section describes the function templates for the helper functions that * This section describes the function templates for the helper functions that
* provide common object support. * provide common object support.
*/ *//** @defgroup ObjIntf Handler-to-Object Interface Functions
/** @defgroup ObjIntf Handler-to-Object Interface Functions
* @ingroup ObjFrmwk * @ingroup ObjFrmwk
* This section describes the fairly limited set of functions that link the * 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 * BAC-stack handlers to the BACnet Object instances. All of these calls are
@@ -266,6 +263,4 @@ extern "C" {
* eg Object_Read_Property() for the RP handler. * eg Object_Read_Property() for the RP handler.
* *
*/ */
#endif #endif
bacnet-stack/include/event.h
+2 -8
View File
@@ -209,14 +209,11 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup ALMEVNT Alarm and Event Management BIBBs /** @defgroup ALMEVNT Alarm and Event Management BIBBs
* These BIBBs prescribe the BACnet capabilities required to interoperably * These BIBBs prescribe the BACnet capabilities required to interoperably
* perform the alarm and event management functions enumerated in 22.2.1.2 * perform the alarm and event management functions enumerated in 22.2.1.2
* for the BACnet devices defined therein. * for the BACnet devices defined therein.
*/ *//** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
/** @defgroup EVNOTFCN Alarm and Event-Notification (AE-N)
* @ingroup ALMEVNT * @ingroup ALMEVNT
* 13.6 ConfirmedCOVNotification Service <br> * 13.6 ConfirmedCOVNotification Service <br>
* The ConfirmedCOVNotification service is used to notify subscribers about * The ConfirmedCOVNotification service is used to notify subscribers about
@@ -233,9 +230,7 @@ extern "C" {
* For unsubscribed notifications, the algorithm for determining when to issue * 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, * this service is a local matter and may be based on a change of value,
* periodic updating, or some other criteria. * periodic updating, or some other criteria.
*/ *//** @defgroup ALMACK Alarm and Event-ACK (AE-ACK)
/** @defgroup ALMACK Alarm and Event-ACK (AE-ACK)
* @ingroup ALMEVNT * @ingroup ALMEVNT
* 13.5 AcknowledgeAlarm Service <br> * 13.5 AcknowledgeAlarm Service <br>
* In some systems a device may need to know that an operator has seen the alarm * In some systems a device may need to know that an operator has seen the alarm
@@ -246,5 +241,4 @@ extern "C" {
* This service may be used in conjunction with either the * This service may be used in conjunction with either the
* ConfirmedEventNotification service or the UnconfirmedEventNotification service. * ConfirmedEventNotification service or the UnconfirmedEventNotification service.
*/ */
#endif /* BACNET_EVENT_H_ */ #endif /* BACNET_EVENT_H_ */
bacnet-stack/include/handlers.h
+2 -5
View File
@@ -98,14 +98,14 @@ extern "C" {
BACNET_CONFIRMED_SERVICE_DATA * service_data); BACNET_CONFIRMED_SERVICE_DATA * service_data);
bool WPValidateString( bool WPValidateString(
BACNET_APPLICATION_DATA_VALUE *pValue, BACNET_APPLICATION_DATA_VALUE * pValue,
int iMaxLen, int iMaxLen,
bool bEmptyAllowed, bool bEmptyAllowed,
BACNET_ERROR_CLASS * pErrorClass, BACNET_ERROR_CLASS * pErrorClass,
BACNET_ERROR_CODE * pErrorCode); BACNET_ERROR_CODE * pErrorCode);
bool WPValidateArgType( bool WPValidateArgType(
BACNET_APPLICATION_DATA_VALUE *pValue, BACNET_APPLICATION_DATA_VALUE * pValue,
uint8_t ucExpectedType, uint8_t ucExpectedType,
BACNET_ERROR_CLASS * pErrorClass, BACNET_ERROR_CLASS * pErrorClass,
BACNET_ERROR_CODE * pErrorCode); BACNET_ERROR_CODE * pErrorCode);
@@ -256,10 +256,7 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup MISCHNDLR Miscellaneous Handler Utilities /** @defgroup MISCHNDLR Miscellaneous Handler Utilities
* Various utilities and functions to support the Handlers. * Various utilities and functions to support the Handlers.
*/ */
#endif #endif
bacnet-stack/include/lc.h
+1 -1
View File
@@ -56,7 +56,7 @@ extern "C" {
void); void);
int Load_Control_Read_Property( int Load_Control_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Load_Control_Write_Property( bool Load_Control_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/lo.h
+1 -1
View File
@@ -58,7 +58,7 @@ extern "C" {
/* ReadProperty service support */ /* ReadProperty service support */
int Lighting_Output_Read_Property( int Lighting_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
/* WriteProperty service support */ /* WriteProperty service support */
bool Lighting_Output_Write_Property( bool Lighting_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/lsp.h
+1 -1
View File
@@ -52,7 +52,7 @@ extern "C" {
void); void);
int Life_Safety_Point_Read_Property( int Life_Safety_Point_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Life_Safety_Point_Write_Property( bool Life_Safety_Point_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/ms-input.h
+1 -1
View File
@@ -51,7 +51,7 @@ extern "C" {
uint32_t instance); uint32_t instance);
int Multistate_Input_Read_Property( int Multistate_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Multistate_Input_Write_Property( bool Multistate_Input_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/mso.h
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
void); void);
int Multistate_Output_Read_Property( int Multistate_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Multistate_Output_Write_Property( bool Multistate_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
bacnet-stack/include/rd.h
+2 -4
View File
@@ -44,9 +44,9 @@ typedef struct BACnet_Reinitialize_Device_Data {
BACNET_ERROR_CODE error_code; BACNET_ERROR_CODE error_code;
} BACNET_REINITIALIZE_DEVICE_DATA; } BACNET_REINITIALIZE_DEVICE_DATA;
typedef bool ( typedef bool(
*reinitialize_device_function) ( *reinitialize_device_function) (
BACNET_REINITIALIZE_DEVICE_DATA *rd_data); BACNET_REINITIALIZE_DEVICE_DATA * rd_data);
#ifdef __cplusplus #ifdef __cplusplus
@@ -83,7 +83,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DMRD Device Management-ReinitializeDevice (DM-RD) /** @defgroup DMRD Device Management-ReinitializeDevice (DM-RD)
* @ingroup RDMS * @ingroup RDMS
* 16.4 ReinitializeDevice Service <br> * 16.4 ReinitializeDevice Service <br>
@@ -98,5 +97,4 @@ extern "C" {
* to executing the service. * to executing the service.
* *
*/ */
#endif #endif
bacnet-stack/include/readrange.h
+9 -8
View File
@@ -112,9 +112,10 @@ typedef enum {
information in it. The function is responsible for applying the request information in it. The function is responsible for applying the request
to the property in question and returning the response. */ to the property in question and returning the response. */
typedef int (*rr_handler_function) ( typedef int (
uint8_t *apdu, *rr_handler_function) (
BACNET_READ_RANGE_DATA *pRequest); uint8_t * apdu,
BACNET_READ_RANGE_DATA * pRequest);
/** Structure to return the type of requests a given object property can /** Structure to return the type of requests a given object property can
* accept and the address of the function to handle the request */ * accept and the address of the function to handle the request */
@@ -122,7 +123,7 @@ typedef int (*rr_handler_function) (
typedef struct rrpropertyinfo { typedef struct rrpropertyinfo {
int RequestTypes; int RequestTypes;
rr_handler_function Handler; rr_handler_function Handler;
} RR_PROP_INFO; } RR_PROP_INFO;
/** Function template for ReadRange information retrieval function. /** Function template for ReadRange information retrieval function.
* A function template; @see device.c for assignment to object types. * A function template; @see device.c for assignment to object types.
@@ -131,9 +132,10 @@ typedef struct rrpropertyinfo {
* @param pInfo [out] Where to write the response to. * @param pInfo [out] Where to write the response to.
* @return True on success, False on error or failure. * @return True on success, False on error or failure.
*/ */
typedef bool (*rr_info_function) ( typedef bool(
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */ *rr_info_function) (
RR_PROP_INFO *pInfo); /* Where to write the response to */ BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */
RR_PROP_INFO * pInfo); /* Where to write the response to */
int rr_encode_apdu( int rr_encode_apdu(
uint8_t * apdu, uint8_t * apdu,
@@ -176,4 +178,3 @@ uint8_t Send_ReadRange_Request(
*/ */
#endif #endif
bacnet-stack/include/ringbuf.h
+5 -5
View File
@@ -55,9 +55,9 @@ typedef struct ring_buffer_t RING_BUFFER;
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
unsigned Ringbuf_Count ( unsigned Ringbuf_Count(
RING_BUFFER const *b); RING_BUFFER const *b);
bool Ringbuf_Full ( bool Ringbuf_Full(
RING_BUFFER const *b); RING_BUFFER const *b);
bool Ringbuf_Empty( bool Ringbuf_Empty(
RING_BUFFER const *b); RING_BUFFER const *b);
@@ -67,13 +67,13 @@ extern "C" {
RING_BUFFER * b); RING_BUFFER * b);
bool Ringbuf_Put( bool Ringbuf_Put(
RING_BUFFER * b, /* ring buffer structure */ RING_BUFFER * b, /* ring buffer structure */
uint8_t *data_element); /* one element to add to the ring */ uint8_t * data_element); /* one element to add to the ring */
uint8_t *Ringbuf_Alloc( uint8_t *Ringbuf_Alloc(
RING_BUFFER *b); RING_BUFFER * b);
/* Note: element_count must be a power of two */ /* Note: element_count must be a power of two */
void Ringbuf_Init( void Ringbuf_Init(
RING_BUFFER * b, /* ring buffer structure */ RING_BUFFER * b, /* ring buffer structure */
uint8_t *data, /* data block or array of data */ uint8_t * data, /* data block or array of data */
unsigned element_size, /* size of one element in the data block */ unsigned element_size, /* size of one element in the data block */
unsigned element_count); /* number of elements in the data block */ unsigned element_count); /* number of elements in the data block */
bacnet-stack/include/rp.h
+3 -7
View File
@@ -64,7 +64,7 @@ struct BACnet_Read_Access_Data;
*/ */
typedef int ( typedef int (
*read_property_function) ( *read_property_function) (
BACNET_READ_PROPERTY_DATA *rp_data); BACNET_READ_PROPERTY_DATA * rp_data);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -106,7 +106,7 @@ extern "C" {
int rp_ack_fully_decode_service_request( int rp_ack_fully_decode_service_request(
uint8_t * apdu, uint8_t * apdu,
int apdu_len, int apdu_len,
struct BACnet_Read_Access_Data * read_access_data); struct BACnet_Read_Access_Data *read_access_data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
@@ -131,19 +131,15 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DataShare Data Sharing BIBBs /** @defgroup DataShare Data Sharing BIBBs
* These BIBBs prescribe the BACnet capabilities required to interoperably * These BIBBs prescribe the BACnet capabilities required to interoperably
* perform the data sharing functions enumerated in 22.2.1.1 for the BACnet * perform the data sharing functions enumerated in 22.2.1.1 for the BACnet
* devices defined therein. * devices defined therein.
*/ *//** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
/** @defgroup DSRP Data Sharing -Read Property Service (DS-RP)
* @ingroup DataShare * @ingroup DataShare
* 15.5 ReadProperty Service <br> * 15.5 ReadProperty Service <br>
* The ReadProperty service is used by a client BACnet-user to request the * The ReadProperty service is used by a client BACnet-user to request the
* value of one property of one BACnet Object. This service allows read access * value of one property of one BACnet Object. This service allows read access
* to any property of any object, whether a BACnet-defined object or not. * to any property of any object, whether a BACnet-defined object or not.
*/ */
#endif #endif
bacnet-stack/include/rpm.h
+1 -3
View File
@@ -79,7 +79,7 @@ struct special_property_list_t {
typedef void ( typedef void (
*rpm_object_property_lists_function) ( *rpm_object_property_lists_function) (
BACNET_OBJECT_TYPE object_type, BACNET_OBJECT_TYPE object_type,
struct special_property_list_t *pPropertyList); struct special_property_list_t * pPropertyList);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -201,7 +201,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DSRPM Data Sharing -Read Property Multiple Service (DS-RPM) /** @defgroup DSRPM Data Sharing -Read Property Multiple Service (DS-RPM)
* @ingroup DataShare * @ingroup DataShare
* 15.7 ReadPropertyMultiple Service <br> * 15.7 ReadPropertyMultiple Service <br>
@@ -214,5 +213,4 @@ extern "C" {
* A 'Read Access Specification' with the property identifier ALL can be used to * A 'Read Access Specification' with the property identifier ALL can be used to
* learn the implemented properties of an object along with their values. * learn the implemented properties of an object along with their values.
*/ */
#endif #endif
bacnet-stack/include/trendlog.h
+22 -22
View File
@@ -38,17 +38,17 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* Error code for Trend Log storage */ /* Error code for Trend Log storage */
typedef struct tl_error { typedef struct tl_error {
uint16_t usClass; uint16_t usClass;
uint16_t usCode; uint16_t usCode;
} TL_ERROR; } TL_ERROR;
/* Bit string of up to 32 bits for Trend Log storage */ /* Bit string of up to 32 bits for Trend Log storage */
typedef struct tl_bits { typedef struct tl_bits {
uint8_t ucLen; /* bytes used in upper nibble/bits free in lower nibble */ uint8_t ucLen; /* bytes used in upper nibble/bits free in lower nibble */
uint8_t ucStore[4]; uint8_t ucStore[4];
} TL_BITS; } TL_BITS;
/* Storage structure for Trend Log data /* Storage structure for Trend Log data
* *
@@ -60,7 +60,7 @@ typedef struct tl_bits {
* logging capacity as possible every little byte counts! * logging capacity as possible every little byte counts!
*/ */
typedef struct tl_data_record { typedef struct tl_data_record {
time_t tTimeStamp; /* When the event occurred */ time_t tTimeStamp; /* When the event occurred */
uint8_t ucRecType; /* What type of Event */ uint8_t ucRecType; /* What type of Event */
uint8_t ucStatus; /* Optional Status for read value in b0-b2, b7 = 1 if status is used */ uint8_t ucStatus; /* Optional Status for read value in b0-b2, b7 = 1 if status is used */
@@ -75,7 +75,7 @@ typedef struct tl_data_record {
TL_ERROR Error; /* Two part error class/code combo */ TL_ERROR Error; /* Two part error class/code combo */
float fTime; /* Interval value for change of time - seconds */ float fTime; /* Interval value for change of time - seconds */
} Datum; } Datum;
} TL_DATA_REC; } TL_DATA_REC;
#define TL_T_START_WILD 1 /* Start time is wild carded */ #define TL_T_START_WILD 1 /* Start time is wild carded */
#define TL_T_STOP_WILD 2 /* Stop Time is wild carded */ #define TL_T_STOP_WILD 2 /* Stop Time is wild carded */
@@ -84,7 +84,7 @@ typedef struct tl_data_record {
/* Structure containing config and status info for a Trend Log */ /* Structure containing config and status info for a Trend Log */
typedef struct tl_log_info { typedef struct tl_log_info {
bool bEnable; /* Trend log is active when this is true */ bool bEnable; /* Trend log is active when this is true */
BACNET_DATE_TIME StartTime; /* BACnet format start time */ BACNET_DATE_TIME StartTime; /* BACnet format start time */
time_t tStartTime; /* Local time working copy of start time */ time_t tStartTime; /* Local time working copy of start time */
@@ -102,7 +102,7 @@ typedef struct tl_log_info {
bool bTrigger; /* Set to 1 to cause a reading to be taken */ bool bTrigger; /* Set to 1 to cause a reading to be taken */
int iIndex; /* Current insertion point */ int iIndex; /* Current insertion point */
time_t tLastDataTime; time_t tLastDataTime;
} TL_LOG_INFO; } TL_LOG_INFO;
/* /*
* Data types associated with a BACnet Log Record. We use these for managing the * Data types associated with a BACnet Log Record. We use these for managing the
@@ -143,7 +143,7 @@ typedef struct tl_log_info {
uint32_t object_instance); uint32_t object_instance);
int Trend_Log_Read_Property( int Trend_Log_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Trend_Log_Write_Property( bool Trend_Log_Write_Property(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
@@ -159,36 +159,36 @@ typedef struct tl_log_info {
int iLog); int iLog);
time_t TL_BAC_Time_To_Local( time_t TL_BAC_Time_To_Local(
BACNET_DATE_TIME *SourceTime); BACNET_DATE_TIME * SourceTime);
void TL_Local_Time_To_BAC( void TL_Local_Time_To_BAC(
BACNET_DATE_TIME *DestTime, BACNET_DATE_TIME * DestTime,
time_t SourceTime); time_t SourceTime);
int TL_encode_entry( int TL_encode_entry(
uint8_t *apdu, uint8_t * apdu,
int iLog, int iLog,
int iEntry); int iEntry);
int TL_encode_by_position( int TL_encode_by_position(
uint8_t *apdu, uint8_t * apdu,
BACNET_READ_RANGE_DATA *pRequest); BACNET_READ_RANGE_DATA * pRequest);
int TL_encode_by_sequence( int TL_encode_by_sequence(
uint8_t *apdu, uint8_t * apdu,
BACNET_READ_RANGE_DATA *pRequest); BACNET_READ_RANGE_DATA * pRequest);
int TL_encode_by_time( int TL_encode_by_time(
uint8_t *apdu, uint8_t * apdu,
BACNET_READ_RANGE_DATA *pRequest); BACNET_READ_RANGE_DATA * pRequest);
bool TrendLogGetRRInfo( bool TrendLogGetRRInfo(
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */ BACNET_READ_RANGE_DATA * pRequest, /* Info on the request */
RR_PROP_INFO *pInfo); /* Where to put the information */ RR_PROP_INFO * pInfo); /* Where to put the information */
int rr_trend_log_encode( int rr_trend_log_encode(
uint8_t *apdu, uint8_t * apdu,
BACNET_READ_RANGE_DATA *pRequest); BACNET_READ_RANGE_DATA * pRequest);
void trend_log_timer( void trend_log_timer(
uint16_t uSeconds); uint16_t uSeconds);
bacnet-stack/include/tsm.h
+2 -1
View File
@@ -106,7 +106,8 @@ extern "C" {
/* use these in tandem */ /* use these in tandem */
uint8_t tsm_next_free_invokeID( uint8_t tsm_next_free_invokeID(
void); void);
void tsm_invokeID_set(uint8_t invokeID); void tsm_invokeID_set(
uint8_t invokeID);
/* returns the same invoke ID that was given */ /* returns the same invoke ID that was given */
void tsm_set_confirmed_unsegmented_transaction( void tsm_set_confirmed_unsegmented_transaction(
uint8_t invokeID, uint8_t invokeID,
bacnet-stack/include/whohas.h
-1
View File
@@ -76,7 +76,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DMDOB Device Management-Dynamic Object Binding (DM-DOB) /** @defgroup DMDOB Device Management-Dynamic Object Binding (DM-DOB)
* @ingroup RDMS * @ingroup RDMS
* 16.9 Who-Has and I-Have Services <br> * 16.9 Who-Has and I-Have Services <br>
bacnet-stack/include/whois.h
-2
View File
@@ -67,7 +67,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DMDDB Device Management-Dynamic Device Binding (DM-DDB) /** @defgroup DMDDB Device Management-Dynamic Device Binding (DM-DDB)
* @ingroup RDMS * @ingroup RDMS
* 16.10 Who-Is and I-Am Services <br> * 16.10 Who-Is and I-Am Services <br>
@@ -87,5 +86,4 @@ extern "C" {
* issuing the request is on the local network, or from the NPCI if the device * issuing the request is on the local network, or from the NPCI if the device
* is on a remote network. * is on a remote network.
*/ */
#endif #endif
bacnet-stack/include/wp.h
-2
View File
@@ -102,7 +102,6 @@ extern "C" {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
/** @defgroup DSWP Data Sharing - Write Property Service (DS-WP) /** @defgroup DSWP Data Sharing - Write Property Service (DS-WP)
* @ingroup DataShare * @ingroup DataShare
* 15.9 WriteProperty Service <br> * 15.9 WriteProperty Service <br>
@@ -114,5 +113,4 @@ extern "C" {
* to modify a restricted property shall result in the return of an error of * to modify a restricted property shall result in the return of an error of
* 'Error Class' PROPERTY and 'Error Code' WRITE_ACCESS_DENIED. * 'Error Class' PROPERTY and 'Error Code' WRITE_ACCESS_DENIED.
*/ */
#endif #endif
bacnet-stack/ports/at91sam7s/ai.c
+3 -5
View File
@@ -143,15 +143,14 @@ void Analog_Input_Present_Value_Set(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object has already exists */ /* assumption - object has already exists */
int Analog_Input_Read_Property( int Analog_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -205,8 +204,7 @@ int Analog_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/at91sam7s/av.c
+10 -9
View File
@@ -181,7 +181,7 @@ char *Analog_Value_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Value_Read_Property( int Analog_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -195,8 +195,7 @@ int Analog_Value_Read_Property(
#endif #endif
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -236,7 +235,8 @@ int Analog_Value_Read_Property(
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
#if 0 #if 0
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
state = Analog_Value_Out_Of_Service[object_index]; state = Analog_Value_Out_Of_Service[object_index];
#endif #endif
apdu_len = encode_application_boolean(&apdu[0], false); apdu_len = encode_application_boolean(&apdu[0], false);
@@ -253,7 +253,8 @@ int Analog_Value_Read_Property(
/* if no index was specified, then try to encode the entire list */ /* if no index was specified, then try to encode the entire list */
/* into one packet. */ /* into one packet. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
for (i = 0; i < BACNET_MAX_PRIORITY; i++) { for (i = 0; i < BACNET_MAX_PRIORITY; i++) {
/* FIXME: check if we have room before adding it to APDU */ /* FIXME: check if we have room before adding it to APDU */
if (Present_Value[object_index][i] == ANALOG_LEVEL_NULL) if (Present_Value[object_index][i] == ANALOG_LEVEL_NULL)
@@ -282,7 +283,8 @@ int Analog_Value_Read_Property(
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Present_Value[object_index][rpdata->array_index - 1]; Present_Value[object_index][rpdata->array_index -
1];
apdu_len = apdu_len =
encode_application_real(&apdu[0], real_value); encode_application_real(&apdu[0], real_value);
} }
@@ -353,8 +355,8 @@ bool Analog_Value_Write_Property(
(value.type.Real >= 0.0) && (value.type.Real <= 100.0)) { (value.type.Real >= 0.0) && (value.type.Real <= 100.0)) {
level = (uint8_t) value.type.Real; level = (uint8_t) value.type.Real;
object_index = object_index =
Analog_Value_Instance_To_Index Analog_Value_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority--; priority--;
Present_Value[object_index] = level; Present_Value[object_index] = level;
/* Note: you could set the physical output here if we /* Note: you could set the physical output here if we
@@ -420,4 +422,3 @@ bool Analog_Value_Write_Property(
return status; return status;
} }
bacnet-stack/ports/at91sam7s/bi.c
+3 -6
View File
@@ -160,7 +160,7 @@ char *Binary_Input_Name(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object already exists, and has been bounds checked */ /* assumption - object already exists, and has been bounds checked */
int Binary_Input_Read_Property( int Binary_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -169,8 +169,7 @@ int Binary_Input_Read_Property(
BACNET_BINARY_PV value = BINARY_INACTIVE; BACNET_BINARY_PV value = BINARY_INACTIVE;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -224,8 +223,7 @@ int Binary_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -233,4 +231,3 @@ int Binary_Input_Read_Property(
return apdu_len; return apdu_len;
} }
bacnet-stack/ports/at91sam7s/bv.c
+7 -9
View File
@@ -154,7 +154,7 @@ char *Binary_Value_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Value_Read_Property( int Binary_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -164,8 +164,7 @@ int Binary_Value_Read_Property(
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -190,7 +189,8 @@ int Binary_Value_Read_Property(
encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE); encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Binary_Value_Present_Value(rpdata->object_instance); present_value =
Binary_Value_Present_Value(rpdata->object_instance);
apdu_len = encode_application_enumerated(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -221,8 +221,7 @@ int Binary_Value_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -266,8 +265,8 @@ bool Binary_Value_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = value.type.Enumerated; level = value.type.Enumerated;
object_index = object_index =
Binary_Value_Instance_To_Index Binary_Value_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
priority--; priority--;
/* NOTE: this Binary value has no priority array */ /* NOTE: this Binary value has no priority array */
Present_Value[object_index] = level; Present_Value[object_index] = level;
@@ -312,4 +311,3 @@ bool Binary_Value_Write_Property(
return status; return status;
} }
bacnet-stack/ports/at91sam7s/device.c
+50 -78
View File
@@ -51,12 +51,11 @@
static uint32_t Object_Instance_Number = 12345; static uint32_t Object_Instance_Number = 12345;
static char My_Object_Name[32] = "ARM7 Device"; static char My_Object_Name[32] = "ARM7 Device";
static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL;
static BACNET_REINITIALIZED_STATE Reinitialize_State = static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_IDLE;
BACNET_REINIT_IDLE;
/* forward prototypes */ /* forward prototypes */
int Device_Read_Property_Local( int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Device_Write_Property_Local( bool Device_Write_Property_Local(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
@@ -70,55 +69,30 @@ static struct object_functions {
read_property_function Object_Read_Property; read_property_function Object_Read_Property;
write_property_function Object_Write_Property; write_property_function Object_Write_Property;
rpm_property_lists_function Object_RPM_List; rpm_property_lists_function Object_RPM_List;
} Object_Table[] = } Object_Table[] = {
{ {
{OBJECT_DEVICE, OBJECT_DEVICE, NULL, /* don't init - recursive! */
NULL,/* don't init - recursive! */ Device_Count, Device_Index_To_Instance,
Device_Count, Device_Valid_Object_Instance_Number, Device_Name,
Device_Index_To_Instance, Device_Read_Property_Local, Device_Write_Property_Local,
Device_Valid_Object_Instance_Number, Device_Property_Lists}, {
Device_Name, OBJECT_ANALOG_INPUT, Analog_Input_Init, Analog_Input_Count,
Device_Read_Property_Local, Analog_Input_Index_To_Instance, Analog_Input_Valid_Instance,
Device_Write_Property_Local, Analog_Input_Name, Analog_Input_Read_Property, NULL,
Device_Property_Lists}, Analog_Input_Property_Lists}, {
{OBJECT_ANALOG_INPUT, OBJECT_ANALOG_VALUE, Analog_Value_Init, Analog_Value_Count,
Analog_Input_Init, Analog_Value_Index_To_Instance, Analog_Value_Valid_Instance,
Analog_Input_Count, Analog_Value_Name, Analog_Value_Read_Property,
Analog_Input_Index_To_Instance, Analog_Value_Write_Property, Analog_Value_Property_Lists}, {
Analog_Input_Valid_Instance, OBJECT_BINARY_INPUT, Binary_Input_Init, Binary_Input_Count,
Analog_Input_Name, Binary_Input_Index_To_Instance, Binary_Input_Valid_Instance,
Analog_Input_Read_Property, Binary_Input_Name, Binary_Input_Read_Property, NULL,
NULL, Binary_Input_Property_Lists}, {
Analog_Input_Property_Lists}, OBJECT_BINARY_VALUE, Binary_Value_Init, Binary_Value_Count,
{OBJECT_ANALOG_VALUE, Binary_Value_Index_To_Instance, Binary_Value_Valid_Instance,
Analog_Value_Init, Binary_Value_Name, Binary_Value_Read_Property,
Analog_Value_Count, Binary_Value_Write_Property, Binary_Value_Property_Lists}, {
Analog_Value_Index_To_Instance, MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
Analog_Value_Valid_Instance,
Analog_Value_Name,
Analog_Value_Read_Property,
Analog_Value_Write_Property,
Analog_Value_Property_Lists},
{OBJECT_BINARY_INPUT,
Binary_Input_Init,
Binary_Input_Count,
Binary_Input_Index_To_Instance,
Binary_Input_Valid_Instance,
Binary_Input_Name,
Binary_Input_Read_Property,
NULL,
Binary_Input_Property_Lists},
{OBJECT_BINARY_VALUE,
Binary_Value_Init,
Binary_Value_Count,
Binary_Value_Index_To_Instance,
Binary_Value_Valid_Instance,
Binary_Value_Name,
Binary_Value_Read_Property,
Binary_Value_Write_Property,
Binary_Value_Property_Lists},
{MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
}; };
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
@@ -176,7 +150,7 @@ void Device_Property_Lists(
/* Encodes the property APDU and returns the length, /* Encodes the property APDU and returns the length,
or sets the error, and returns -1 */ or sets the error, and returns -1 */
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = -1;
unsigned index = 0; unsigned index = 0;
@@ -294,10 +268,8 @@ void Device_Objects_Property_List(
pObject = &Object_Table[index]; pObject = &Object_Table[index];
} }
if (found && object_property_list) { if (found && object_property_list) {
object_property_list( object_property_list(&pPropertyList->Required.pList,
&pPropertyList->Required.pList, &pPropertyList->Optional.pList, &pPropertyList->Proprietary.pList);
&pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList);
} }
/* fill the count */ /* fill the count */
if (pPropertyList->Required.pList) { if (pPropertyList->Required.pList) {
@@ -363,8 +335,7 @@ bool Device_Object_List_Identifier(
/* initialize the default return values */ /* initialize the default return values */
pObject = &Object_Table[0]; pObject = &Object_Table[0];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if (pObject->Object_Count && if (pObject->Object_Count && pObject->Object_Index_To_Instance) {
pObject->Object_Index_To_Instance) {
object_index -= count; object_index -= count;
count = pObject->Object_Count(); count = pObject->Object_Count();
if (object_index < count) { if (object_index < count) {
@@ -425,8 +396,7 @@ char *Device_Valid_Object_Id(
pObject = &Object_Table[0]; pObject = &Object_Table[0];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if ((pObject->Object_Type == object_type) && if ((pObject->Object_Type == object_type) && (pObject->Object_Name)) {
(pObject->Object_Name)) {
name = pObject->Object_Name(object_instance); name = pObject->Object_Name(object_instance);
break; break;
} }
@@ -437,7 +407,8 @@ char *Device_Valid_Object_Id(
return name; return name;
} }
unsigned Device_Count(void) unsigned Device_Count(
void)
{ {
return 1; return 1;
} }
@@ -459,7 +430,7 @@ char *Device_Name(
} }
bool Device_Reinitialize( bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data) BACNET_REINITIALIZE_DEVICE_DATA * rd_data)
{ {
bool status = false; bool status = false;
@@ -588,7 +559,7 @@ uint32_t Device_Database_Revision(
/* return the length of the apdu encoded or -1 for error */ /* return the length of the apdu encoded or -1 for error */
int Device_Read_Property_Local( int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
int len = 0; /* apdu len intermediate value */ int len = 0; /* apdu len intermediate value */
@@ -604,8 +575,7 @@ int Device_Read_Property_Local(
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
bool found = false; bool found = false;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -702,8 +672,7 @@ int Device_Read_Property_Local(
i = 0; i = 0;
pObject = &Object_Table[i]; pObject = &Object_Table[i];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if ((pObject->Object_Count) && if ((pObject->Object_Count) && (pObject->Object_Count() > 0)) {
(pObject->Object_Count() > 0)) {
bitstring_set_bit(&bit_string, pObject->Object_Type, true); bitstring_set_bit(&bit_string, pObject->Object_Type, true);
} }
i++; i++;
@@ -722,7 +691,8 @@ int Device_Read_Property_Local(
/* your maximum APDU size. */ /* your maximum APDU size. */
else if (rpdata->array_index == BACNET_ARRAY_ALL) { else if (rpdata->array_index == BACNET_ARRAY_ALL) {
for (i = 1; i <= count; i++) { for (i = 1; i <= count; i++) {
found = Device_Object_List_Identifier(i, &object_type, found =
Device_Object_List_Identifier(i, &object_type,
&instance); &instance);
if (found) { if (found) {
len = len =
@@ -733,7 +703,8 @@ int Device_Read_Property_Local(
/* can we all fit into the APDU? */ /* can we all fit into the APDU? */
if ((apdu_len + len) >= MAX_APDU) { if ((apdu_len + len) >= MAX_APDU) {
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; rpdata->error_code =
ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = -1;
break; break;
} }
@@ -746,8 +717,8 @@ int Device_Read_Property_Local(
} }
} }
} else { } else {
if (Device_Object_List_Identifier(rpdata->array_index, &object_type, if (Device_Object_List_Identifier(rpdata->array_index,
&instance)) &object_type, &instance))
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], object_type, encode_application_object_id(&apdu[0], object_type,
instance); instance);
@@ -825,8 +796,7 @@ int Device_Read_Property_Local(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -858,8 +828,8 @@ bool Device_Write_Property_Local(
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) && if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
(Device_Set_Object_Instance_Number(value.type. (Device_Set_Object_Instance_Number(value.type.Object_Id.
Object_Id.instance))) { instance))) {
/* we could send an I-Am broadcast to let the world know */ /* we could send an I-Am broadcast to let the world know */
status = true; status = true;
} else { } else {
@@ -918,11 +888,13 @@ bool Device_Write_Property_Local(
the device. */ the device. */
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY; wp_data->error_code =
ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;
} }
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED; wp_data->error_code =
ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED;
} }
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
bacnet-stack/ports/at91sam7s/main.c
+1 -2
View File
@@ -147,8 +147,7 @@ static inline void bacnet_init(
/* set up our confirmed service unrecognized service handler - required! */ /* set up our confirmed service unrecognized service handler - required! */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
(handler_unrecognized_service); (handler_unrecognized_service);
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS, handler_who_has);
handler_who_has);
/* we need to handle who-is to support dynamic device binding */ /* we need to handle who-is to support dynamic device binding */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is); apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
/* Set the handlers for any confirmed services that we support. */ /* Set the handlers for any confirmed services that we support. */
bacnet-stack/ports/atmega168/ai.c
+1 -2
View File
@@ -155,8 +155,7 @@ int Analog_Input_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/atmega168/av.c
+1 -2
View File
@@ -152,8 +152,7 @@ int Analog_Value_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/atmega168/bv.c
+3 -4
View File
@@ -169,8 +169,7 @@ int Binary_Value_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -207,8 +206,8 @@ bool Binary_Value_Write_Property(
if ((value.type.Enumerated == BINARY_ACTIVE) || if ((value.type.Enumerated == BINARY_ACTIVE) ||
(value.type.Enumerated == BINARY_INACTIVE)) { (value.type.Enumerated == BINARY_INACTIVE)) {
object_index = object_index =
Binary_Value_Instance_To_Index Binary_Value_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
/* NOTE: this Binary value has no priority array */ /* NOTE: this Binary value has no priority array */
Present_Value[object_index] = Present_Value[object_index] =
(BACNET_BINARY_PV) value.type.Enumerated; (BACNET_BINARY_PV) value.type.Enumerated;
bacnet-stack/ports/atmega168/device.c
+3 -4
View File
@@ -337,8 +337,7 @@ int Device_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (property != PROP_OBJECT_LIST) &&
(property != PROP_OBJECT_LIST) &&
(array_index != BACNET_ARRAY_ALL)) { (array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -372,8 +371,8 @@ bool Device_Write_Property(
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) && if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
(Device_Set_Object_Instance_Number(value.type. (Device_Set_Object_Instance_Number(value.type.Object_Id.
Object_Id.instance))) { instance))) {
/* we could send an I-Am broadcast to let the world know */ /* we could send an I-Am broadcast to let the world know */
status = true; status = true;
} else { } else {
bacnet-stack/ports/atmega168/device.h
+3 -3
View File
@@ -165,9 +165,9 @@ extern "C" {
bool DeviceGetRRInfo( bool DeviceGetRRInfo(
uint32_t Object, /* Which particular object - obviously not important for device object */ uint32_t Object, /* Which particular object - obviously not important for device object */
BACNET_PROPERTY_ID Property, /* Which property */ BACNET_PROPERTY_ID Property, /* Which property */
RR_PROP_INFO *pInfo, /* Where to put the information */ RR_PROP_INFO * pInfo, /* Where to put the information */
BACNET_ERROR_CLASS *error_class, BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE *error_code); BACNET_ERROR_CODE * error_code);
#ifdef __cplusplus #ifdef __cplusplus
bacnet-stack/ports/atmega8/ai.c
+1 -2
View File
@@ -153,8 +153,7 @@ int Analog_Input_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/atmega8/av.c
+1 -2
View File
@@ -152,8 +152,7 @@ int Analog_Value_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/atmega8/bv.c
+3 -4
View File
@@ -169,8 +169,7 @@ int Binary_Value_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (array_index != BACNET_ARRAY_ALL)) {
(array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
@@ -207,8 +206,8 @@ bool Binary_Value_Write_Property(
if ((value.type.Enumerated == BINARY_ACTIVE) || if ((value.type.Enumerated == BINARY_ACTIVE) ||
(value.type.Enumerated == BINARY_INACTIVE)) { (value.type.Enumerated == BINARY_INACTIVE)) {
object_index = object_index =
Binary_Value_Instance_To_Index Binary_Value_Instance_To_Index(wp_data->
(wp_data->object_instance); object_instance);
/* NOTE: this Binary value has no priority array */ /* NOTE: this Binary value has no priority array */
Present_Value[object_index] = Present_Value[object_index] =
(BACNET_BINARY_PV) value.type.Enumerated; (BACNET_BINARY_PV) value.type.Enumerated;
bacnet-stack/ports/atmega8/device.c
+1 -2
View File
@@ -328,8 +328,7 @@ int Device_Encode_Property_APDU(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (property != PROP_OBJECT_LIST) &&
(property != PROP_OBJECT_LIST) &&
(array_index != BACNET_ARRAY_ALL)) { (array_index != BACNET_ARRAY_ALL)) {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; *error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
bacnet-stack/ports/bdk-atxx4-mstp/ai.c
+3 -5
View File
@@ -146,14 +146,13 @@ void Analog_Input_Present_Value_Set(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object already exists */ /* assumption - object already exists */
int Analog_Input_Read_Property( int Analog_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
uint8_t *apdu = NULL; uint8_t *apdu = NULL;
if ((rpdata == NULL) || if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
(rpdata->application_data == NULL) ||
(rpdata->application_data_len == 0)) { (rpdata->application_data_len == 0)) {
return 0; return 0;
} }
@@ -190,8 +189,7 @@ int Analog_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/bdk-atxx4-mstp/av.c
+15 -14
View File
@@ -196,7 +196,7 @@ char *Analog_Value_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Analog_Value_Read_Property( int Analog_Value_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -233,7 +233,8 @@ int Analog_Value_Read_Property(
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
#if 0 #if 0
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
state = Analog_Value_Out_Of_Service[object_index]; state = Analog_Value_Out_Of_Service[object_index];
#endif #endif
apdu_len = encode_application_boolean(&apdu[0], false); apdu_len = encode_application_boolean(&apdu[0], false);
@@ -272,14 +273,16 @@ int Analog_Value_Read_Property(
} }
} }
} else { } else {
object_index = Analog_Value_Instance_To_Index(rpdata->object_instance); object_index =
Analog_Value_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
if (Present_Value[object_index][rpdata->array_index - 1] == if (Present_Value[object_index][rpdata->array_index - 1] ==
ANALOG_LEVEL_NULL) ANALOG_LEVEL_NULL)
apdu_len = encode_application_null(&apdu[0]); apdu_len = encode_application_null(&apdu[0]);
else { else {
real_value = real_value =
Present_Value[object_index][rpdata->array_index - 1]; Present_Value[object_index][rpdata->array_index -
1];
apdu_len = apdu_len =
encode_application_real(&apdu[0], real_value); encode_application_real(&apdu[0], real_value);
} }
@@ -336,13 +339,12 @@ bool Analog_Value_Write_Property(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_REAL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_REAL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
status = Analog_Value_Present_Value_Set( status =
wp_data->object_instance, Analog_Value_Present_Value_Set(wp_data->object_instance,
value.type.Real, wp_data->priority); value.type.Real, wp_data->priority);
if (!status) { if (!status) {
if (wp_data->priority == 6) { if (wp_data->priority == 6) {
@@ -370,10 +372,9 @@ bool Analog_Value_Write_Property(
break; break;
#if 0 #if 0
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
object_index = object_index =
Analog_Value_Instance_To_Index(wp_data->object_instance); Analog_Value_Instance_To_Index(wp_data->object_instance);
bacnet-stack/ports/bdk-atxx4-mstp/bi.c
+2 -3
View File
@@ -173,7 +173,7 @@ char *Binary_Input_Name(
/* return apdu length, or -1 on error */ /* return apdu length, or -1 on error */
/* assumption - object already exists, and has been bounds checked */ /* assumption - object already exists, and has been bounds checked */
int Binary_Input_Read_Property( int Binary_Input_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -219,8 +219,7 @@ int Binary_Input_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->array_index != BACNET_ARRAY_ALL)) {
(rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
apdu_len = -1; apdu_len = -1;
bacnet-stack/ports/bdk-atxx4-mstp/bo.c
+30 -36
View File
@@ -201,8 +201,8 @@ static void Binary_Output_Level_Sync(
bool Binary_Output_Present_Value_Set( bool Binary_Output_Present_Value_Set(
uint32_t instance, uint32_t instance,
BACNET_BINARY_PV binary_value, BACNET_BINARY_PV binary_value,
unsigned priority) /* 0..15 */ unsigned priority)
{ { /* 0..15 */
bool status = false; bool status = false;
if (instance < MAX_BINARY_OUTPUTS) { if (instance < MAX_BINARY_OUTPUTS) {
@@ -239,8 +239,7 @@ void Binary_Output_Out_Of_Service_Set(
if (instance < MAX_BINARY_OUTPUTS) { if (instance < MAX_BINARY_OUTPUTS) {
Out_Of_Service[instance] = flag; Out_Of_Service[instance] = flag;
seeprom_bytes_write(NV_SEEPROM_BINARY_OUTPUT(instance, seeprom_bytes_write(NV_SEEPROM_BINARY_OUTPUT(instance,
NV_SEEPROM_BO_OUT_OF_SERVICE), &Out_Of_Service[instance], NV_SEEPROM_BO_OUT_OF_SERVICE), &Out_Of_Service[instance], 1);
1);
} }
} }
@@ -260,7 +259,7 @@ char *Binary_Output_Name(
/* return apdu len, or -1 on error */ /* return apdu len, or -1 on error */
int Binary_Output_Read_Property( int Binary_Output_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int len = 0; int len = 0;
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
@@ -280,7 +279,8 @@ int Binary_Output_Read_Property(
switch (rpdata->object_property) { switch (rpdata->object_property) {
/* object id, object name, object type are handled in Device object */ /* object id, object name, object type are handled in Device object */
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
present_value = Binary_Output_Present_Value(rpdata->object_instance); present_value =
Binary_Output_Present_Value(rpdata->object_instance);
apdu_len = encode_application_enumerated(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
@@ -298,12 +298,14 @@ int Binary_Output_Read_Property(
encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL); encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
object_index = Binary_Output_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Output_Instance_To_Index(rpdata->object_instance);
state = Out_Of_Service[object_index]; state = Out_Of_Service[object_index];
apdu_len = encode_application_boolean(&apdu[0], state); apdu_len = encode_application_boolean(&apdu[0], state);
break; break;
case PROP_POLARITY: case PROP_POLARITY:
object_index = Binary_Output_Instance_To_Index(rpdata->object_instance); object_index =
Binary_Output_Instance_To_Index(rpdata->object_instance);
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], encode_application_enumerated(&apdu[0],
Polarity[object_index]); Polarity[object_index]);
@@ -343,7 +345,8 @@ int Binary_Output_Read_Property(
Binary_Output_Instance_To_Index(rpdata->object_instance); Binary_Output_Instance_To_Index(rpdata->object_instance);
if (rpdata->array_index <= BACNET_MAX_PRIORITY) { if (rpdata->array_index <= BACNET_MAX_PRIORITY) {
present_value = present_value =
Binary_Output_Level[object_index][rpdata->array_index - 1]; Binary_Output_Level[object_index][rpdata->array_index -
1];
if (present_value == BINARY_NULL) { if (present_value == BINARY_NULL) {
apdu_len = encode_application_null(&apdu[apdu_len]); apdu_len = encode_application_null(&apdu[apdu_len]);
} else { } else {
@@ -379,8 +382,7 @@ int Binary_Output_Read_Property(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->object_property != PROP_PRIORITY_ARRAY) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -408,10 +410,9 @@ bool Binary_Output_Write_Property(
/* FIXME: len == 0: unable to decode? */ /* FIXME: len == 0: unable to decode? */
switch (wp_data->object_property) { switch (wp_data->object_property) {
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_ENUMERATED, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
priority = wp_data->priority; priority = wp_data->priority;
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
@@ -422,8 +423,7 @@ bool Binary_Output_Write_Property(
(value.type.Enumerated <= MAX_BINARY_PV)) { (value.type.Enumerated <= MAX_BINARY_PV)) {
level = (BACNET_BINARY_PV) value.type.Enumerated; level = (BACNET_BINARY_PV) value.type.Enumerated;
priority--; priority--;
Binary_Output_Present_Value_Set( Binary_Output_Present_Value_Set(wp_data->object_instance,
wp_data->object_instance,
level, priority); level, priority);
} else if (priority == 6) { } else if (priority == 6) {
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
@@ -438,18 +438,16 @@ bool Binary_Output_Write_Property(
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
} }
} else { } else {
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_NULL, WPValidateArgType(&value, BACNET_APPLICATION_TAG_NULL,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
level = BINARY_NULL; level = BINARY_NULL;
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITY)) { if (priority && (priority <= BACNET_MAX_PRIORITY)) {
priority--; priority--;
Binary_Output_Present_Value_Set( Binary_Output_Present_Value_Set(wp_data->
wp_data->object_instance, object_instance, level, priority);
level, priority);
} else if (priority == 6) { } else if (priority == 6) {
status = false; status = false;
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
@@ -466,26 +464,22 @@ bool Binary_Output_Write_Property(
} }
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
Binary_Output_Out_Of_Service_Set( Binary_Output_Out_Of_Service_Set(wp_data->object_instance,
wp_data->object_instance,
value.type.Boolean); value.type.Boolean);
Binary_Output_Level_Sync(wp_data->object_instance); Binary_Output_Level_Sync(wp_data->object_instance);
} }
break; break;
case PROP_POLARITY: case PROP_POLARITY:
status = WPValidateArgType(&value, status =
BACNET_APPLICATION_TAG_ENUMERATED, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_class, &wp_data->error_code);
&wp_data->error_code);
if (status) { if (status) {
if (value.type.Enumerated < MAX_POLARITY) { if (value.type.Enumerated < MAX_POLARITY) {
Binary_Output_Polarity_Set( Binary_Output_Polarity_Set(wp_data->object_instance,
wp_data->object_instance,
value.type.Enumerated); value.type.Enumerated);
Binary_Output_Level_Sync(wp_data->object_instance); Binary_Output_Level_Sync(wp_data->object_instance);
} else { } else {
bacnet-stack/ports/bdk-atxx4-mstp/device.c
+73 -103
View File
@@ -48,7 +48,7 @@
/* forward prototype */ /* forward prototype */
int Device_Read_Property_Local( int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata); BACNET_READ_PROPERTY_DATA * rpdata);
bool Device_Write_Property_Local( bool Device_Write_Property_Local(
BACNET_WRITE_PROPERTY_DATA * wp_data); BACNET_WRITE_PROPERTY_DATA * wp_data);
@@ -62,55 +62,30 @@ static struct object_functions {
read_property_function Object_Read_Property; read_property_function Object_Read_Property;
write_property_function Object_Write_Property; write_property_function Object_Write_Property;
rpm_property_lists_function Object_RPM_List; rpm_property_lists_function Object_RPM_List;
} Object_Table[] = } Object_Table[] = {
{ {
{OBJECT_DEVICE, OBJECT_DEVICE, NULL, /* don't init - recursive! */
NULL,/* don't init - recursive! */ Device_Count, Device_Index_To_Instance,
Device_Count, Device_Valid_Object_Instance_Number, Device_Name,
Device_Index_To_Instance, Device_Read_Property_Local, Device_Write_Property_Local,
Device_Valid_Object_Instance_Number, Device_Property_Lists}, {
Device_Name, OBJECT_ANALOG_INPUT, Analog_Input_Init, Analog_Input_Count,
Device_Read_Property_Local, Analog_Input_Index_To_Instance, Analog_Input_Valid_Instance,
Device_Write_Property_Local, Analog_Input_Name, Analog_Input_Read_Property, NULL,
Device_Property_Lists}, Analog_Input_Property_Lists}, {
{OBJECT_ANALOG_INPUT, OBJECT_ANALOG_VALUE, Analog_Value_Init, Analog_Value_Count,
Analog_Input_Init, Analog_Value_Index_To_Instance, Analog_Value_Valid_Instance,
Analog_Input_Count, Analog_Value_Name, Analog_Value_Read_Property,
Analog_Input_Index_To_Instance, Analog_Value_Write_Property, Analog_Value_Property_Lists}, {
Analog_Input_Valid_Instance, OBJECT_BINARY_INPUT, Binary_Input_Init, Binary_Input_Count,
Analog_Input_Name, Binary_Input_Index_To_Instance, Binary_Input_Valid_Instance,
Analog_Input_Read_Property, Binary_Input_Name, Binary_Input_Read_Property, NULL,
NULL, Binary_Input_Property_Lists}, {
Analog_Input_Property_Lists}, OBJECT_BINARY_OUTPUT, Binary_Output_Init, Binary_Output_Count,
{OBJECT_ANALOG_VALUE, Binary_Output_Index_To_Instance, Binary_Output_Valid_Instance,
Analog_Value_Init, Binary_Output_Name, Binary_Output_Read_Property,
Analog_Value_Count, Binary_Output_Write_Property, Binary_Output_Property_Lists}, {
Analog_Value_Index_To_Instance, MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
Analog_Value_Valid_Instance,
Analog_Value_Name,
Analog_Value_Read_Property,
Analog_Value_Write_Property,
Analog_Value_Property_Lists},
{OBJECT_BINARY_INPUT,
Binary_Input_Init,
Binary_Input_Count,
Binary_Input_Index_To_Instance,
Binary_Input_Valid_Instance,
Binary_Input_Name,
Binary_Input_Read_Property,
NULL,
Binary_Input_Property_Lists},
{OBJECT_BINARY_OUTPUT,
Binary_Output_Init,
Binary_Output_Count,
Binary_Output_Index_To_Instance,
Binary_Output_Valid_Instance,
Binary_Output_Name,
Binary_Output_Read_Property,
Binary_Output_Write_Property,
Binary_Output_Property_Lists},
{MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
}; };
/* note: you really only need to define variables for /* note: you really only need to define variables for
@@ -120,8 +95,7 @@ static struct object_functions {
static uint32_t Object_Instance_Number; static uint32_t Object_Instance_Number;
static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL;
static BACNET_REINITIALIZED_STATE Reinitialize_State = static BACNET_REINITIALIZED_STATE Reinitialize_State = BACNET_REINIT_IDLE;
BACNET_REINIT_IDLE;
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Device_Properties_Required[] = { static const int Device_Properties_Required[] = {
@@ -159,7 +133,7 @@ static const int Device_Properties_Proprietary[] = {
-1 -1
}; };
static struct object_functions * Device_Objects_Find_Functions( static struct object_functions *Device_Objects_Find_Functions(
BACNET_OBJECT_TYPE Object_Type) BACNET_OBJECT_TYPE Object_Type)
{ {
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
@@ -168,18 +142,18 @@ static struct object_functions * Device_Objects_Find_Functions(
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
/* handle each object type */ /* handle each object type */
if (pObject->Object_Type == Object_Type) { if (pObject->Object_Type == Object_Type) {
return(pObject); return (pObject);
} }
pObject++; pObject++;
} }
return(NULL); return (NULL);
} }
static int Read_Property_Common( static int Read_Property_Common(
struct object_functions *pObject, struct object_functions *pObject,
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = -1;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
@@ -199,8 +173,7 @@ static int Read_Property_Common(
rpdata->object_instance = Object_Instance_Number; rpdata->object_instance = Object_Instance_Number;
} }
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], encode_application_object_id(&apdu[0], rpdata->object_type,
rpdata->object_type,
rpdata->object_instance); rpdata->object_instance);
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
@@ -212,8 +185,8 @@ static int Read_Property_Common(
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = encode_application_enumerated(&apdu[0], apdu_len =
rpdata->object_type); encode_application_enumerated(&apdu[0], rpdata->object_type);
break; break;
default: default:
if (pObject->Object_Read_Property) { if (pObject->Object_Read_Property) {
@@ -228,7 +201,7 @@ static int Read_Property_Common(
/* Encodes the property APDU and returns the length, /* Encodes the property APDU and returns the length,
or sets the error, and returns -1 */ or sets the error, and returns -1 */
int Device_Read_Property( int Device_Read_Property(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = -1; int apdu_len = -1;
struct object_functions *pObject = NULL; struct object_functions *pObject = NULL;
@@ -313,21 +286,22 @@ void Device_Objects_Property_List(
pObject = Device_Objects_Find_Functions(object_type); pObject = Device_Objects_Find_Functions(object_type);
if ((pObject != NULL) && (pObject->Object_RPM_List != NULL)) { if ((pObject != NULL) && (pObject->Object_RPM_List != NULL)) {
pObject->Object_RPM_List( pObject->Object_RPM_List(&pPropertyList->Required.pList,
&pPropertyList->Required.pList, &pPropertyList->Optional.pList, &pPropertyList->Proprietary.pList);
&pPropertyList->Optional.pList,
&pPropertyList->Proprietary.pList);
} }
/* Fetch the counts if available otherwise zero them */ /* Fetch the counts if available otherwise zero them */
pPropertyList->Required.count = pPropertyList->Required.pList == NULL pPropertyList->Required.count =
? 0 : property_list_count(pPropertyList->Required.pList); pPropertyList->Required.pList ==
NULL ? 0 : property_list_count(pPropertyList->Required.pList);
pPropertyList->Optional.count = pPropertyList->Optional.pList == NULL pPropertyList->Optional.count =
? 0 : property_list_count(pPropertyList->Optional.pList); pPropertyList->Optional.pList ==
NULL ? 0 : property_list_count(pPropertyList->Optional.pList);
pPropertyList->Proprietary.count = pPropertyList->Proprietary.pList == NULL pPropertyList->Proprietary.count =
? 0 : property_list_count(pPropertyList->Proprietary.pList); pPropertyList->Proprietary.pList ==
NULL ? 0 : property_list_count(pPropertyList->Proprietary.pList);
return; return;
} }
@@ -347,7 +321,8 @@ void Device_Property_Lists(
return; return;
} }
unsigned Device_Count(void) unsigned Device_Count(
void)
{ {
return 1; return 1;
} }
@@ -363,7 +338,7 @@ char *Device_Name(
{ {
uint8_t encoding = 0; uint8_t encoding = 0;
uint8_t length = 0; uint8_t length = 0;
static char name[NV_EEPROM_DEVICE_NAME_SIZE+1] = ""; static char name[NV_EEPROM_DEVICE_NAME_SIZE + 1] = "";
char *pName = NULL; char *pName = NULL;
if (object_instance == Object_Instance_Number) { if (object_instance == Object_Instance_Number) {
@@ -372,14 +347,12 @@ char *Device_Name(
eeprom_bytes_read(NV_EEPROM_DEVICE_NAME_0, (uint8_t *) & name, eeprom_bytes_read(NV_EEPROM_DEVICE_NAME_0, (uint8_t *) & name,
NV_EEPROM_DEVICE_NAME_SIZE); NV_EEPROM_DEVICE_NAME_SIZE);
if ((encoding >= MAX_CHARACTER_STRING_ENCODING) || if ((encoding >= MAX_CHARACTER_STRING_ENCODING) ||
(length > NV_EEPROM_DEVICE_NAME_SIZE) || (length > NV_EEPROM_DEVICE_NAME_SIZE) || (length < 1)) {
(length < 1)) {
encoding = CHARACTER_ANSI_X34; encoding = CHARACTER_ANSI_X34;
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_ENCODING, eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_ENCODING, &encoding, 1);
&encoding, 1);
sprintf(name, "DEVICE-%lu", Object_Instance_Number); sprintf(name, "DEVICE-%lu", Object_Instance_Number);
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0, eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0, (uint8_t *) & name[0],
(uint8_t *) & name[0], NV_EEPROM_DEVICE_NAME_SIZE); NV_EEPROM_DEVICE_NAME_SIZE);
length = strlen(name); length = strlen(name);
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH, &length, 1); eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH, &length, 1);
} }
@@ -395,7 +368,7 @@ char *Device_Name(
} }
bool Device_Reinitialize( bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data) BACNET_REINITIALIZE_DEVICE_DATA * rd_data)
{ {
bool status = false; bool status = false;
@@ -438,7 +411,7 @@ void Device_Init(
(uint8_t *) & Object_Instance_Number, (uint8_t *) & Object_Instance_Number,
sizeof(Object_Instance_Number)); sizeof(Object_Instance_Number));
} }
(void)Device_Name(Object_Instance_Number); (void) Device_Name(Object_Instance_Number);
} }
/* methods to manipulate the data */ /* methods to manipulate the data */
@@ -549,8 +522,7 @@ bool Device_Object_List_Identifier(
/* initialize the default return values */ /* initialize the default return values */
pObject = &Object_Table[0]; pObject = &Object_Table[0];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if (pObject->Object_Count && if (pObject->Object_Count && pObject->Object_Index_To_Instance) {
pObject->Object_Index_To_Instance) {
object_index -= count; object_index -= count;
count = pObject->Object_Count(); count = pObject->Object_Count();
if (object_index < count) { if (object_index < count) {
@@ -617,7 +589,7 @@ char *Device_Valid_Object_Id(
/* return the length of the apdu encoded or -1 for error */ /* return the length of the apdu encoded or -1 for error */
int Device_Read_Property_Local( int Device_Read_Property_Local(
BACNET_READ_PROPERTY_DATA *rpdata) BACNET_READ_PROPERTY_DATA * rpdata)
{ {
int apdu_len = 0; /* return value */ int apdu_len = 0; /* return value */
int len = 0; /* apdu len intermediate value */ int len = 0; /* apdu len intermediate value */
@@ -652,8 +624,7 @@ int Device_Read_Property_Local(
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_VENDOR_IDENTIFIER: case PROP_VENDOR_IDENTIFIER:
apdu_len = apdu_len = encode_application_unsigned(&apdu[0], BACNET_VENDOR_ID);
encode_application_unsigned(&apdu[0], BACNET_VENDOR_ID);
break; break;
case PROP_MODEL_NAME: case PROP_MODEL_NAME:
characterstring_init_ansi(&char_string, "bdk-atxx4-mstp"); characterstring_init_ansi(&char_string, "bdk-atxx4-mstp");
@@ -671,12 +642,10 @@ int Device_Read_Property_Local(
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_PROTOCOL_VERSION: case PROP_PROTOCOL_VERSION:
apdu_len = apdu_len = encode_application_unsigned(&apdu[0], 1);
encode_application_unsigned(&apdu[0], 1);
break; break;
case PROP_PROTOCOL_REVISION: case PROP_PROTOCOL_REVISION:
apdu_len = apdu_len = encode_application_unsigned(&apdu[0], 5);
encode_application_unsigned(&apdu[0], 5);
break; break;
case PROP_PROTOCOL_SERVICES_SUPPORTED: case PROP_PROTOCOL_SERVICES_SUPPORTED:
/* Note: list of services that are executed, not initiated. */ /* Note: list of services that are executed, not initiated. */
@@ -701,8 +670,7 @@ int Device_Read_Property_Local(
i = 0; i = 0;
pObject = &Object_Table[i]; pObject = &Object_Table[i];
while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) { while (pObject->Object_Type < MAX_BACNET_OBJECT_TYPE) {
if ((pObject->Object_Count) && if ((pObject->Object_Count) && (pObject->Object_Count() > 0)) {
(pObject->Object_Count() > 0)) {
bitstring_set_bit(&bit_string, pObject->Object_Type, true); bitstring_set_bit(&bit_string, pObject->Object_Type, true);
} }
pObject++; pObject++;
@@ -730,7 +698,8 @@ int Device_Read_Property_Local(
/* can we all fit into the APDU? */ /* can we all fit into the APDU? */
if ((apdu_len + len) >= MAX_APDU) { if ((apdu_len + len) >= MAX_APDU) {
rpdata->error_class = ERROR_CLASS_SERVICES; rpdata->error_class = ERROR_CLASS_SERVICES;
rpdata->error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT; rpdata->error_code =
ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = -1; apdu_len = -1;
break; break;
} }
@@ -743,8 +712,8 @@ int Device_Read_Property_Local(
} }
} }
} else { } else {
if (Device_Object_List_Identifier(rpdata->array_index, &object_type, if (Device_Object_List_Identifier(rpdata->array_index,
&instance)) &object_type, &instance))
apdu_len = apdu_len =
encode_application_object_id(&apdu[0], object_type, encode_application_object_id(&apdu[0], object_type,
instance); instance);
@@ -803,8 +772,7 @@ int Device_Read_Property_Local(
break; break;
} }
/* only array properties can have array options */ /* only array properties can have array options */
if ((apdu_len >= 0) && if ((apdu_len >= 0) && (rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->object_property != PROP_OBJECT_LIST) &&
(rpdata->array_index != BACNET_ARRAY_ALL)) { (rpdata->array_index != BACNET_ARRAY_ALL)) {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY; rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
@@ -831,8 +799,8 @@ bool Device_Write_Property_Local(
case PROP_OBJECT_IDENTIFIER: case PROP_OBJECT_IDENTIFIER:
if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) { if (value.tag == BACNET_APPLICATION_TAG_OBJECT_ID) {
if ((value.type.Object_Id.type == OBJECT_DEVICE) && if ((value.type.Object_Id.type == OBJECT_DEVICE) &&
(Device_Set_Object_Instance_Number(value.type. (Device_Set_Object_Instance_Number(value.type.Object_Id.
Object_Id.instance))) { instance))) {
/* we could send an I-Am broadcast to let the world know */ /* we could send an I-Am broadcast to let the world know */
status = true; status = true;
} else { } else {
@@ -892,18 +860,20 @@ bool Device_Write_Property_Local(
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH, eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_LENGTH,
&small_length, 1); &small_length, 1);
pCharString = pCharString =
characterstring_value(&value. characterstring_value(&value.type.
type.Character_String); Character_String);
eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0, eeprom_bytes_write(NV_EEPROM_DEVICE_NAME_0,
(uint8_t *) pCharString, length); (uint8_t *) pCharString, length);
status = true; status = true;
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED; wp_data->error_code =
ERROR_CODE_CHARACTER_SET_NOT_SUPPORTED;
} }
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY; wp_data->error_code =
ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;
} }
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
bacnet-stack/ports/bdk-atxx4-mstp/main.c
+2 -4
View File
@@ -102,10 +102,8 @@ static void bacnet_init(
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
(handler_unrecognized_service); (handler_unrecognized_service);
/* we need to handle who-is to support dynamic device binding */ /* we need to handle who-is to support dynamic device binding */
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);
handler_who_is); apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS, handler_who_has);
apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_HAS,
handler_who_has);
/* Set the handlers for any confirmed services that we support. */ /* Set the handlers for any confirmed services that we support. */
/* We must implement read property - it's required! */ /* We must implement read property - it's required! */
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY, apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY,
bacnet-stack/ports/bdk-atxx4-mstp/rs485.c
+4 -2
View File
@@ -51,12 +51,14 @@ static FIFO_BUFFER Receive_Buffer;
static struct etimer Silence_Timer; static struct etimer Silence_Timer;
bool rs485_silence_time_elapsed(uint32_t milliseconds) bool rs485_silence_time_elapsed(
uint32_t milliseconds)
{ {
return timer_elapsed_milliseconds(&Silence_Timer, milliseconds); return timer_elapsed_milliseconds(&Silence_Timer, milliseconds);
} }
void rs485_silence_time_reset(void) void rs485_silence_time_reset(
void)
{ {
timer_elapsed_start(&Silence_Timer); timer_elapsed_start(&Silence_Timer);
} }
bacnet-stack/ports/bdk-atxx4-mstp/rs485.h
+4 -2
View File
@@ -60,8 +60,10 @@ extern "C" {
void rs485_turnaround_delay( void rs485_turnaround_delay(
void); void);
void rs485_silence_time_reset(void); void rs485_silence_time_reset(
bool rs485_silence_time_elapsed(uint32_t milliseconds); void);
bool rs485_silence_time_elapsed(
uint32_t milliseconds);
#ifdef __cplusplus #ifdef __cplusplus
} }
bacnet-stack/ports/bdk-atxx4-mstp/seeprom.c
+2 -2
View File
@@ -427,8 +427,8 @@ int seeprom_bytes_write_page(
int seeprom_bytes_write( int seeprom_bytes_write(
uint16_t off, /* SEEPROM starting memory address */ uint16_t off, /* SEEPROM starting memory address */
uint8_t * buf, /* data to send */ uint8_t * buf, /* data to send */
int len) /* number of bytes of data */ int len)
{ { /* number of bytes of data */
int status = 0; int status = 0;
int rv = 0; int rv = 0;
bacnet-stack/ports/bdk-atxx4-mstp/timer.c
+6 -6
View File
@@ -94,7 +94,7 @@ bool timer_elapsed_milliseconds(
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
bool timer_elapsed_seconds( bool timer_elapsed_seconds(
struct etimer *t, struct etimer * t,
uint32_t seconds) uint32_t seconds)
{ {
uint32_t milliseconds = seconds; uint32_t milliseconds = seconds;
@@ -110,7 +110,7 @@ bool timer_elapsed_seconds(
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
bool timer_elapsed_minutes( bool timer_elapsed_minutes(
struct etimer *t, struct etimer * t,
uint32_t minutes) uint32_t minutes)
{ {
uint32_t milliseconds = minutes; uint32_t milliseconds = minutes;
@@ -191,7 +191,7 @@ uint32_t timer_interval_elapsed(
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
uint32_t timer_interval( uint32_t timer_interval(
struct itimer *t) struct itimer * t)
{ {
uint32_t interval = 0; uint32_t interval = 0;
@@ -208,7 +208,7 @@ uint32_t timer_interval(
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
bool timer_interval_expired( bool timer_interval_expired(
struct itimer *t) struct itimer * t)
{ {
bool expired = false; bool expired = false;
@@ -269,7 +269,8 @@ void timer_interval_restart(
static uint32_t Milliseconds; static uint32_t Milliseconds;
uint32_t timer_milliseconds(void) uint32_t timer_milliseconds(
void)
{ {
return Milliseconds; return Milliseconds;
} }
@@ -364,4 +365,3 @@ int main(
} }
#endif #endif
#endif #endif
bacnet-stack/ports/bdk-atxx4-mstp/timer.h
+2 -1
View File
@@ -46,7 +46,8 @@ extern "C" {
/* these 3 functions are created in the hardware specific module */ /* these 3 functions are created in the hardware specific module */
void timer_init( void timer_init(
void); void);
uint32_t timer_milliseconds(void); uint32_t timer_milliseconds(
void);
uint32_t timer_milliseconds_set( uint32_t timer_milliseconds_set(
uint32_t value); uint32_t value);
bacnet-stack/ports/bdk-atxx4-mstp/timer2.c
+4 -2
View File
@@ -75,7 +75,8 @@ uint32_t timer_milliseconds_set(
* Returns: none * Returns: none
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
uint32_t timer_milliseconds(void) uint32_t timer_milliseconds(
void)
{ {
uint32_t timer_value = 0; /* return value */ uint32_t timer_value = 0; /* return value */
uint8_t sreg = 0; /* holds interrupts pending */ uint8_t sreg = 0; /* holds interrupts pending */
@@ -93,7 +94,8 @@ uint32_t timer_milliseconds(void)
* Returns: none * Returns: none
* Notes: none * Notes: none
*************************************************************************/ *************************************************************************/
void timer_init(void) void timer_init(
void)
{ {
/* Normal Operation */ /* Normal Operation */
TCCR2A = 0; TCCR2A = 0;
bacnet-stack/ports/linux/bip-init.c
+2 -2
View File
@@ -209,11 +209,11 @@ bool bip_init(
* @return 0 on success, else the error from the ioctl() call. * @return 0 on success, else the error from the ioctl() call.
*/ */
int bip_get_local_netmask( int bip_get_local_netmask(
struct in_addr *netmask ) struct in_addr *netmask)
{ {
int rv; int rv;
char *ifname = getenv("BACNET_IFACE"); /* will probably be null */ char *ifname = getenv("BACNET_IFACE"); /* will probably be null */
if ( ifname == NULL ) if (ifname == NULL)
ifname = "eth0"; ifname = "eth0";
rv = get_local_address_ioctl(ifname, netmask, SIOCGIFNETMASK); rv = get_local_address_ioctl(ifname, netmask, SIOCGIFNETMASK);
return rv; return rv;

Some files were not shown because too many files have changed in this diff Show More