Bugfix/print property name units lighting (#313)
* Fix EPICS property name proprietary range * Fix Lighting Command decode length * add function to determine property name and units proprietary range * improve test coverage for AI, AO, AV, BI, BO, BV, LO * refactor common property encoding to proplist module * add decoder for priority array Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
+4
-4
@@ -793,10 +793,10 @@ static void PrintReadPropertyData(BACNET_OBJECT_TYPE object_type,
|
||||
*/
|
||||
static void Print_Property_Identifier(unsigned propertyIdentifier)
|
||||
{
|
||||
if (propertyIdentifier < 512) {
|
||||
fprintf(stdout, "%s", bactext_property_name(propertyIdentifier));
|
||||
} else {
|
||||
if (bactext_property_name_proprietary(propertyIdentifier)) {
|
||||
fprintf(stdout, "-- proprietary %u", propertyIdentifier);
|
||||
} else {
|
||||
fprintf(stdout, "%s", bactext_property_name(propertyIdentifier));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1675,7 +1675,7 @@ int main(int argc, char *argv[])
|
||||
myState = PRINT_HEADING;
|
||||
/* just press ahead without the data */
|
||||
} else {
|
||||
myState = NEXT_OBJECT;
|
||||
myState = NEXT_OBJECT;
|
||||
}/* Give up and move on to the
|
||||
next. */
|
||||
Error_Count++;
|
||||
|
||||
+25
-59
@@ -158,68 +158,34 @@ static int Read_Property_Common(
|
||||
return 0;
|
||||
}
|
||||
apdu = rpdata->application_data;
|
||||
switch (rpdata->object_property) {
|
||||
case PROP_OBJECT_IDENTIFIER:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
/* Device Object exception: requested instance
|
||||
may not match our instance if a wildcard */
|
||||
if (rpdata->object_type == OBJECT_DEVICE) {
|
||||
rpdata->object_instance = Object_Instance_Number;
|
||||
}
|
||||
apdu_len = encode_application_object_id(
|
||||
&apdu[0], rpdata->object_type, rpdata->object_instance);
|
||||
if (property_list_common(rpdata->object_property)) {
|
||||
apdu_len = property_list_common_encode(rpdata,
|
||||
Object_Instance_Number);
|
||||
} else if (rpdata->object_property == PROP_OBJECT_NAME) {
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
characterstring_init_ansi(&char_string, "");
|
||||
if (pObject->Object_Name) {
|
||||
(void)pObject->Object_Name(
|
||||
rpdata->object_instance, &char_string);
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_NAME:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
characterstring_init_ansi(&char_string, "");
|
||||
if (pObject->Object_Name) {
|
||||
(void)pObject->Object_Name(
|
||||
rpdata->object_instance, &char_string);
|
||||
}
|
||||
apdu_len =
|
||||
encode_application_character_string(&apdu[0], &char_string);
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_TYPE:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
apdu_len = encode_application_enumerated(
|
||||
&apdu[0], rpdata->object_type);
|
||||
}
|
||||
break;
|
||||
apdu_len =
|
||||
encode_application_character_string(&apdu[0], &char_string);
|
||||
}
|
||||
#if (BACNET_PROTOCOL_REVISION >= 14)
|
||||
case PROP_PROPERTY_LIST:
|
||||
Device_Objects_Property_List(
|
||||
rpdata->object_type,
|
||||
rpdata->object_instance,
|
||||
&property_list);
|
||||
apdu_len = property_list_encode(
|
||||
rpdata,
|
||||
property_list.Required.pList,
|
||||
property_list.Optional.pList,
|
||||
property_list.Proprietary.pList);
|
||||
break;
|
||||
} else if (rpdata->object_property == PROP_PROPERTY_LIST) {
|
||||
Device_Objects_Property_List(
|
||||
rpdata->object_type, rpdata->object_instance, &property_list);
|
||||
apdu_len = property_list_encode(rpdata,
|
||||
property_list.Required.pList, property_list.Optional.pList,
|
||||
property_list.Proprietary.pList);
|
||||
#endif
|
||||
default:
|
||||
if (pObject->Object_Read_Property) {
|
||||
apdu_len = pObject->Object_Read_Property(rpdata);
|
||||
}
|
||||
break;
|
||||
} else if (pObject->Object_Read_Property) {
|
||||
apdu_len = pObject->Object_Read_Property(rpdata);
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
|
||||
+61
-9
@@ -971,6 +971,45 @@ int bacapp_decode_generic_property(
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(BACAPP_TYPES_EXTRA)
|
||||
/* decode one value of a priority array */
|
||||
static int decode_priority_value(uint8_t *apdu,
|
||||
unsigned max_apdu_len,
|
||||
BACNET_APPLICATION_DATA_VALUE *value,
|
||||
BACNET_PROPERTY_ID prop)
|
||||
{
|
||||
int val_len = 0;
|
||||
uint32_t len_value_type = 0;
|
||||
int len = 0;
|
||||
bool is_opening_tag;
|
||||
uint8_t tag_number;
|
||||
|
||||
if (decode_is_context_tag(apdu, 0) && !decode_is_closing_tag(apdu)) {
|
||||
/* Contextual Abstract-syntax & type */
|
||||
val_len =
|
||||
decode_tag_number_and_value(apdu, &tag_number, &len_value_type);
|
||||
is_opening_tag = decode_is_opening_tag(apdu);
|
||||
len += val_len;
|
||||
val_len = bacapp_decode_generic_property(
|
||||
&apdu[len], max_apdu_len - len, value, prop);
|
||||
if (val_len < 0) {
|
||||
return BACNET_STATUS_ERROR;
|
||||
}
|
||||
len += val_len;
|
||||
if (is_opening_tag) {
|
||||
if (!decode_is_closing_tag_number(apdu, 0)) {
|
||||
return BACNET_STATUS_ERROR;
|
||||
}
|
||||
len++;
|
||||
}
|
||||
} else {
|
||||
len = bacapp_decode_generic_property(apdu, max_apdu_len, value, prop);
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(BACAPP_TYPES_EXTRA)
|
||||
/**
|
||||
* @brief Decodes a well-known, possibly complex property value
|
||||
@@ -1060,12 +1099,12 @@ int bacapp_decode_known_property(uint8_t *apdu,
|
||||
len = bacapp_decode_timestamp(apdu, &value->type.Time_Stamp);
|
||||
break;
|
||||
case PROP_DEFAULT_COLOR:
|
||||
case PROP_TRACKING_VALUE:
|
||||
/* Properties using BACnetxyColor */
|
||||
value->tag = BACNET_APPLICATION_TAG_XY_COLOR;
|
||||
len = xy_color_decode(apdu, max_apdu_len,
|
||||
&value->type.XY_Color);
|
||||
break;
|
||||
case PROP_TRACKING_VALUE:
|
||||
case PROP_PRESENT_VALUE:
|
||||
if (object_type == OBJECT_COLOR) {
|
||||
/* Properties using BACnetxyColor */
|
||||
@@ -1084,6 +1123,16 @@ int bacapp_decode_known_property(uint8_t *apdu,
|
||||
len = color_command_decode(apdu, max_apdu_len, NULL,
|
||||
&value->type.Color_Command);
|
||||
break;
|
||||
case PROP_LIGHTING_COMMAND:
|
||||
/* Properties using BACnetLightingCommand */
|
||||
value->tag = BACNET_APPLICATION_TAG_LIGHTING_COMMAND;
|
||||
len = lighting_command_decode(apdu, max_apdu_len,
|
||||
&value->type.Lighting_Command);
|
||||
break;
|
||||
case PROP_PRIORITY_ARRAY:
|
||||
/* [16] BACnetPriorityValue : 16x values (simple property) */
|
||||
len = decode_priority_value(apdu, max_apdu_len, value, property);
|
||||
break;
|
||||
case PROP_LIST_OF_GROUP_MEMBERS:
|
||||
/* Properties using ReadAccessSpecification */
|
||||
case PROP_WEEKLY_SCHEDULE:
|
||||
@@ -1696,11 +1745,12 @@ int bacapp_snprintf_value(
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_TYPE:
|
||||
if (value->type.Enumerated < MAX_ASHRAE_OBJECT_TYPE) {
|
||||
if (value->type.Enumerated < BACNET_OBJECT_TYPE_LAST) {
|
||||
ret_val = snprintf(str, str_len, "%s",
|
||||
bactext_object_type_name(
|
||||
value->type.Enumerated));
|
||||
} else if (value->type.Enumerated < 128) {
|
||||
} else if (value->type.Enumerated <
|
||||
BACNET_OBJECT_TYPE_RESERVED_MAX) {
|
||||
ret_val = snprintf(str, str_len, "reserved %lu",
|
||||
(unsigned long)value->type.Enumerated);
|
||||
} else {
|
||||
@@ -1713,13 +1763,14 @@ int bacapp_snprintf_value(
|
||||
bactext_event_state_name(value->type.Enumerated));
|
||||
break;
|
||||
case PROP_UNITS:
|
||||
if (value->type.Enumerated < 256) {
|
||||
if (bactext_engineering_unit_name_proprietary(
|
||||
(unsigned)value->type.Enumerated)) {
|
||||
ret_val = snprintf(str, str_len, "proprietary %lu",
|
||||
(unsigned long)value->type.Enumerated);
|
||||
} else {
|
||||
ret_val = snprintf(str, str_len, "%s",
|
||||
bactext_engineering_unit_name(
|
||||
value->type.Enumerated));
|
||||
} else {
|
||||
ret_val = snprintf(str, str_len, "proprietary %lu",
|
||||
(unsigned long)value->type.Enumerated);
|
||||
}
|
||||
break;
|
||||
case PROP_POLARITY:
|
||||
@@ -1785,10 +1836,11 @@ int bacapp_snprintf_value(
|
||||
}
|
||||
}
|
||||
ret_val += slen;
|
||||
if (value->type.Object_Id.type < MAX_ASHRAE_OBJECT_TYPE) {
|
||||
if (value->type.Object_Id.type <= BACNET_OBJECT_TYPE_LAST) {
|
||||
slen = snprintf(str, str_len, "%s, ",
|
||||
bactext_object_type_name(value->type.Object_Id.type));
|
||||
} else if (value->type.Object_Id.type < 128) {
|
||||
} else if (value->type.Object_Id.type <
|
||||
BACNET_OBJECT_TYPE_RESERVED_MAX) {
|
||||
slen = snprintf(str, str_len, "reserved %u, ",
|
||||
(unsigned)value->type.Object_Id.type);
|
||||
} else {
|
||||
|
||||
@@ -545,8 +545,10 @@ typedef enum {
|
||||
/* Enumerated values 0-511 are reserved for definition by ASHRAE. */
|
||||
/* Enumerated values 512-4194303 may be used by others subject to the */
|
||||
/* procedures and constraints described in Clause 23. */
|
||||
PROP_RESERVED_RANGE_MAX = 511,
|
||||
PROP_PROPRIETARY_RANGE_MIN = 512,
|
||||
PROP_PROPRIETARY_RANGE_MAX = 4194303,
|
||||
PROP_RESERVED_RANGE_MIN2 = 4194304,
|
||||
/* enumerations 4194304-4194327 are defined in Addendum 2020cc */
|
||||
PROP_MAX_BVLC_LENGTH_ACCEPTED = 4194304,
|
||||
PROP_MAX_NPDU_LENGTH_ACCEPTED = 4194305,
|
||||
@@ -1295,6 +1297,8 @@ typedef enum BACnetObjectType {
|
||||
OBJECT_AUDIT_REPORTER = 62, /* Addendum 135-2016bi */
|
||||
OBJECT_COLOR = 63, /* Addendum 135-2020ca */
|
||||
OBJECT_COLOR_TEMPERATURE = 64, /* Addendum 135-2020ca */
|
||||
BACNET_OBJECT_TYPE_LAST = OBJECT_COLOR_TEMPERATURE,
|
||||
BACNET_OBJECT_TYPE_RESERVED_MAX = 127,
|
||||
/* Enumerated values 0-127 are reserved for definition by ASHRAE. */
|
||||
/* Enumerated values 128-1023 may be used by others subject to */
|
||||
/* the procedures and constraints described in Clause 23. */
|
||||
|
||||
+29
-7
@@ -748,12 +748,24 @@ INDTEXT_DATA bacnet_property_names[] = {
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
bool bactext_property_name_proprietary(unsigned index)
|
||||
{
|
||||
bool status = false;
|
||||
|
||||
if ((index >= PROP_PROPRIETARY_RANGE_MIN) &&
|
||||
(index <= PROP_PROPRIETARY_RANGE_MAX)) {
|
||||
status = true;
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
const char *bactext_property_name(unsigned index)
|
||||
{
|
||||
/* Enumerated values 0-511 are reserved for definition by ASHRAE.
|
||||
Enumerated values 512-4194303 may be used by others subject to the
|
||||
procedures and constraints described in Clause 23. */
|
||||
if ((index >= 512) && (index <= 4194303)) {
|
||||
if (bactext_property_name_proprietary(index)) {
|
||||
return Vendor_Proprietary_String;
|
||||
} else {
|
||||
return indtext_by_index_default(
|
||||
@@ -1018,18 +1030,28 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
|
||||
the procedures and constraints described in Clause 23. */
|
||||
};
|
||||
|
||||
bool bactext_engineering_unit_name_proprietary(unsigned index)
|
||||
{
|
||||
bool status = false;
|
||||
|
||||
if ((index >= UNITS_PROPRIETARY_RANGE_MIN) &&
|
||||
(index <= UNITS_PROPRIETARY_RANGE_MAX)) {
|
||||
status = true;
|
||||
} else if ((index >= UNITS_PROPRIETARY_RANGE_MIN2) &&
|
||||
(index <= UNITS_PROPRIETARY_RANGE_MAX2)) {
|
||||
status = true;
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
const char *bactext_engineering_unit_name(unsigned index)
|
||||
{
|
||||
if (index <= UNITS_RESERVED_RANGE_MAX) {
|
||||
return indtext_by_index_default(
|
||||
bacnet_engineering_unit_names, index, ASHRAE_Reserved_String);
|
||||
} else if (index <= UNITS_PROPRIETARY_RANGE_MAX) {
|
||||
if (bactext_engineering_unit_name_proprietary(index)) {
|
||||
return Vendor_Proprietary_String;
|
||||
} else if (index <= UNITS_RESERVED_RANGE_MAX2) {
|
||||
return indtext_by_index_default(
|
||||
bacnet_engineering_unit_names, index, ASHRAE_Reserved_String);
|
||||
} else if (index <= UNITS_PROPRIETARY_RANGE_MAX2) {
|
||||
return Vendor_Proprietary_String;
|
||||
}
|
||||
|
||||
return ASHRAE_Reserved_String;
|
||||
|
||||
@@ -69,6 +69,9 @@ extern "C" {
|
||||
const char *bactext_event_type_name(
|
||||
unsigned index);
|
||||
BACNET_STACK_EXPORT
|
||||
bool bactext_property_name_proprietary(
|
||||
unsigned index);
|
||||
BACNET_STACK_EXPORT
|
||||
const char *bactext_property_name(
|
||||
unsigned index);
|
||||
BACNET_STACK_EXPORT
|
||||
@@ -84,6 +87,9 @@ extern "C" {
|
||||
const char *search_name,
|
||||
unsigned *found_index);
|
||||
BACNET_STACK_EXPORT
|
||||
bool bactext_engineering_unit_name_proprietary(
|
||||
unsigned index);
|
||||
BACNET_STACK_EXPORT
|
||||
const char *bactext_engineering_unit_name(
|
||||
unsigned index);
|
||||
BACNET_STACK_EXPORT
|
||||
|
||||
@@ -1352,64 +1352,34 @@ static int Read_Property_Common(
|
||||
return 0;
|
||||
}
|
||||
apdu = rpdata->application_data;
|
||||
switch (rpdata->object_property) {
|
||||
case PROP_OBJECT_IDENTIFIER:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
/* Device Object exception: requested instance
|
||||
may not match our instance if a wildcard */
|
||||
if (rpdata->object_type == OBJECT_DEVICE) {
|
||||
rpdata->object_instance = Object_Instance_Number;
|
||||
}
|
||||
apdu_len = encode_application_object_id(
|
||||
&apdu[0], rpdata->object_type, rpdata->object_instance);
|
||||
if (property_list_common(rpdata->object_property)) {
|
||||
apdu_len = property_list_common_encode(rpdata,
|
||||
Object_Instance_Number);
|
||||
} else if (rpdata->object_property == PROP_OBJECT_NAME) {
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
characterstring_init_ansi(&char_string, "");
|
||||
if (pObject->Object_Name) {
|
||||
(void)pObject->Object_Name(
|
||||
rpdata->object_instance, &char_string);
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_NAME:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
characterstring_init_ansi(&char_string, "");
|
||||
if (pObject->Object_Name) {
|
||||
(void)pObject->Object_Name(
|
||||
rpdata->object_instance, &char_string);
|
||||
}
|
||||
apdu_len =
|
||||
encode_application_character_string(&apdu[0], &char_string);
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_TYPE:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
apdu_len = encode_application_enumerated(
|
||||
&apdu[0], rpdata->object_type);
|
||||
}
|
||||
break;
|
||||
apdu_len =
|
||||
encode_application_character_string(&apdu[0], &char_string);
|
||||
}
|
||||
#if (BACNET_PROTOCOL_REVISION >= 14)
|
||||
case PROP_PROPERTY_LIST:
|
||||
Device_Objects_Property_List(
|
||||
rpdata->object_type, rpdata->object_instance, &property_list);
|
||||
apdu_len = property_list_encode(rpdata,
|
||||
property_list.Required.pList, property_list.Optional.pList,
|
||||
property_list.Proprietary.pList);
|
||||
break;
|
||||
} else if (rpdata->object_property == PROP_PROPERTY_LIST) {
|
||||
Device_Objects_Property_List(
|
||||
rpdata->object_type, rpdata->object_instance, &property_list);
|
||||
apdu_len = property_list_encode(rpdata,
|
||||
property_list.Required.pList, property_list.Optional.pList,
|
||||
property_list.Proprietary.pList);
|
||||
#endif
|
||||
default:
|
||||
if (pObject->Object_Read_Property) {
|
||||
apdu_len = pObject->Object_Read_Property(rpdata);
|
||||
}
|
||||
break;
|
||||
} else if (pObject->Object_Read_Property) {
|
||||
apdu_len = pObject->Object_Read_Property(rpdata);
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
@@ -1910,6 +1880,7 @@ void Device_Init(object_functions_t *object_table)
|
||||
}
|
||||
#if (BACNET_PROTOCOL_REVISION >= 24)
|
||||
Color_Create(1);
|
||||
Color_Temperature_Create(1);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -39,6 +39,15 @@
|
||||
#include "bacnet/basic/services.h"
|
||||
#include "bacnet/basic/tsm/tsm.h"
|
||||
|
||||
#if PRINT_ENABLED
|
||||
#include <stdio.h>
|
||||
#define PRINTF(...) fprintf(stdout,__VA_ARGS__)
|
||||
#define PRINTF_ERR(...) fprintf(stderr,__VA_ARGS__)
|
||||
#else
|
||||
#define PRINTF(...)
|
||||
#define PRINTF_ERR(...)
|
||||
#endif
|
||||
|
||||
/** @file h_rpm_a.c Handles Read Property Multiple Acknowledgments. */
|
||||
|
||||
/** Decode the received RPM data and make a linked list of the results.
|
||||
@@ -122,12 +131,10 @@ int rpm_ack_decode_service_request(
|
||||
/* If len == 0 then it's an empty structure, which is OK. */
|
||||
if (len < 0) {
|
||||
/* problem decoding */
|
||||
#if PRINT_ENABLED
|
||||
fprintf(stderr, "RPM Ack: unable to decode! %s:%s\n",
|
||||
PRINTF_ERR("RPM Ack: unable to decode! %s:%s\n",
|
||||
bactext_object_type_name(rpm_object->object_type),
|
||||
bactext_property_name(
|
||||
rpm_property->propertyIdentifier));
|
||||
#endif
|
||||
/* note: caller will free the memory */
|
||||
return BACNET_STATUS_ERROR;
|
||||
}
|
||||
@@ -139,11 +146,17 @@ int rpm_ack_decode_service_request(
|
||||
apdu_len--;
|
||||
apdu++;
|
||||
break;
|
||||
} else {
|
||||
} else if (len > 0) {
|
||||
old_value = value;
|
||||
value =
|
||||
calloc(1, sizeof(BACNET_APPLICATION_DATA_VALUE));
|
||||
old_value->next = value;
|
||||
} else {
|
||||
PRINTF_ERR("RPM Ack: decoded %s:%s len=%d\n",
|
||||
bactext_object_type_name(rpm_object->object_type),
|
||||
bactext_property_name(
|
||||
rpm_property->propertyIdentifier), len);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (apdu_len && decode_is_opening_tag_number(apdu, 5)) {
|
||||
@@ -209,50 +222,40 @@ void rpm_ack_print_data(BACNET_READ_ACCESS_DATA *rpm_data)
|
||||
#endif
|
||||
BACNET_PROPERTY_REFERENCE *listOfProperties = NULL;
|
||||
BACNET_APPLICATION_DATA_VALUE *value = NULL;
|
||||
#if PRINT_ENABLED
|
||||
bool array_value = false;
|
||||
#endif
|
||||
|
||||
if (rpm_data) {
|
||||
#if PRINT_ENABLED
|
||||
fprintf(stdout, "%s #%lu\r\n",
|
||||
PRINTF("%s #%lu\r\n",
|
||||
bactext_object_type_name(rpm_data->object_type),
|
||||
(unsigned long)rpm_data->object_instance);
|
||||
fprintf(stdout, "{\r\n");
|
||||
#endif
|
||||
PRINTF("{\r\n");
|
||||
listOfProperties = rpm_data->listOfProperties;
|
||||
while (listOfProperties) {
|
||||
#if PRINT_ENABLED
|
||||
if ((listOfProperties->propertyIdentifier < 512) ||
|
||||
(listOfProperties->propertyIdentifier > 4194303)) {
|
||||
/* Enumerated values 0-511 and 4194304+ are reserved
|
||||
for definition by ASHRAE.*/
|
||||
fprintf(stdout, " %s: ",
|
||||
PRINTF(" %s: ",
|
||||
bactext_property_name(
|
||||
listOfProperties->propertyIdentifier));
|
||||
} else {
|
||||
/* Enumerated values 512-4194303 may be used
|
||||
by others subject to the procedures and
|
||||
constraints described in Clause 23. */
|
||||
fprintf(stdout, " proprietary %u: ",
|
||||
PRINTF(" proprietary %u: ",
|
||||
(unsigned)listOfProperties->propertyIdentifier);
|
||||
}
|
||||
#endif
|
||||
if (listOfProperties->propertyArrayIndex != BACNET_ARRAY_ALL) {
|
||||
#if PRINT_ENABLED
|
||||
fprintf(stdout, "[%d]", listOfProperties->propertyArrayIndex);
|
||||
#endif
|
||||
PRINTF("[%d]", listOfProperties->propertyArrayIndex);
|
||||
}
|
||||
value = listOfProperties->value;
|
||||
if (value) {
|
||||
#if PRINT_ENABLED
|
||||
if (value->next) {
|
||||
fprintf(stdout, "{");
|
||||
PRINTF("{");
|
||||
array_value = true;
|
||||
} else {
|
||||
array_value = false;
|
||||
}
|
||||
#endif
|
||||
#ifdef BACAPP_PRINT_ENABLED
|
||||
object_value.object_type = rpm_data->object_type;
|
||||
object_value.object_instance = rpm_data->object_instance;
|
||||
@@ -266,34 +269,28 @@ void rpm_ack_print_data(BACNET_READ_ACCESS_DATA *rpm_data)
|
||||
object_value.value = value;
|
||||
bacapp_print_value(stdout, &object_value);
|
||||
#endif
|
||||
#if PRINT_ENABLED
|
||||
if (value->next) {
|
||||
fprintf(stdout, ",\r\n ");
|
||||
PRINTF(",\r\n ");
|
||||
} else {
|
||||
if (array_value) {
|
||||
fprintf(stdout, "}\r\n");
|
||||
PRINTF("}\r\n");
|
||||
} else {
|
||||
fprintf(stdout, "\r\n");
|
||||
PRINTF("\r\n");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
value = value->next;
|
||||
}
|
||||
} else {
|
||||
#if PRINT_ENABLED
|
||||
/* AccessError */
|
||||
fprintf(stdout, "BACnet Error: %s: %s\r\n",
|
||||
PRINTF("BACnet Error: %s: %s\r\n",
|
||||
bactext_error_class_name(
|
||||
(int)listOfProperties->error.error_class),
|
||||
bactext_error_code_name(
|
||||
(int)listOfProperties->error.error_code));
|
||||
#endif
|
||||
}
|
||||
listOfProperties = listOfProperties->next;
|
||||
}
|
||||
#if PRINT_ENABLED
|
||||
fprintf(stdout, "}\r\n");
|
||||
#endif
|
||||
PRINTF("}\r\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -366,9 +363,7 @@ void handler_read_property_multiple_ack(uint8_t *service_request,
|
||||
rpm_data = rpm_data_free(rpm_data);
|
||||
}
|
||||
} else {
|
||||
#if PRINT_ENABLED
|
||||
fprintf(stderr, "RPM Ack Malformed! Freeing memory...\n");
|
||||
#endif
|
||||
PRINTF_ERR("RPM Ack Malformed! Freeing memory...\n");
|
||||
while (rpm_data) {
|
||||
rpm_data = rpm_data_free(rpm_data);
|
||||
}
|
||||
|
||||
+196
-63
@@ -122,7 +122,7 @@ int lighting_command_encode_context(
|
||||
* @param apdu_max_len - number of bytes in the buffer to decode
|
||||
* @param value - lighting command value to place the decoded values
|
||||
*
|
||||
* @return number of bytes encoded
|
||||
* @return number of bytes decoded
|
||||
*/
|
||||
int lighting_command_decode(
|
||||
uint8_t *apdu, unsigned apdu_max_len, BACNET_LIGHTING_COMMAND *data)
|
||||
@@ -133,11 +133,11 @@ int lighting_command_decode(
|
||||
uint32_t len_value_type = 0;
|
||||
uint32_t enum_value = 0;
|
||||
BACNET_UNSIGNED_INTEGER unsigned_value = 0;
|
||||
BACNET_LIGHTING_OPERATION operation= BACNET_LIGHTS_NONE;
|
||||
float real_value = 0.0;
|
||||
|
||||
(void)apdu_max_len;
|
||||
/* check for value pointers */
|
||||
if (apdu_max_len && data) {
|
||||
if (apdu_max_len) {
|
||||
/* Tag 0: operation */
|
||||
if (!decode_is_context_tag(&apdu[apdu_len], 0)) {
|
||||
return BACNET_STATUS_ERROR;
|
||||
@@ -148,73 +148,206 @@ int lighting_command_decode(
|
||||
len = decode_enumerated(&apdu[apdu_len], len_value_type, &enum_value);
|
||||
if (len > 0) {
|
||||
if (unsigned_value <= BACNET_LIGHTS_PROPRIETARY_LAST) {
|
||||
data->operation = (BACNET_LIGHTING_OPERATION)enum_value;
|
||||
if (data) {
|
||||
data->operation = (BACNET_LIGHTING_OPERATION)enum_value;
|
||||
}
|
||||
} else {
|
||||
return BACNET_STATUS_ERROR;
|
||||
}
|
||||
}
|
||||
apdu_len += len;
|
||||
/* Tag 1: target-level - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 1)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
data->target_level = real_value;
|
||||
apdu_len += len;
|
||||
data->use_target_level = true;
|
||||
} else {
|
||||
data->use_target_level = false;
|
||||
}
|
||||
/* Tag 2: ramp-rate - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 2)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
data->ramp_rate = real_value;
|
||||
data->use_ramp_rate = true;
|
||||
} else {
|
||||
data->use_ramp_rate = false;
|
||||
}
|
||||
/* Tag 3: step-increment - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 3)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
data->step_increment = real_value;
|
||||
data->use_step_increment = true;
|
||||
} else {
|
||||
data->use_step_increment = false;
|
||||
}
|
||||
/* Tag 4: fade-time - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
data->fade_time = (uint32_t)unsigned_value;
|
||||
data->use_fade_time = true;
|
||||
} else {
|
||||
data->use_fade_time = false;
|
||||
}
|
||||
/* Tag 5: priority - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
data->priority = (uint8_t)unsigned_value;
|
||||
data->use_priority = true;
|
||||
} else {
|
||||
data->use_priority = false;
|
||||
}
|
||||
}
|
||||
switch (operation) {
|
||||
case BACNET_LIGHTS_NONE:
|
||||
break;
|
||||
case BACNET_LIGHTS_FADE_TO:
|
||||
if ((apdu_max_len - apdu_len) == 0) {
|
||||
return BACNET_STATUS_REJECT;
|
||||
}
|
||||
/* Tag 1: target-level */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 1)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->target_level = real_value;
|
||||
data->use_target_level = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_target_level = false;
|
||||
}
|
||||
}
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 4: fade-time - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->fade_time = (uint32_t)unsigned_value;
|
||||
data->use_fade_time = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_fade_time = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 5: priority - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->priority = (uint8_t)unsigned_value;
|
||||
data->use_priority = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_priority = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BACNET_LIGHTS_RAMP_TO:
|
||||
if ((apdu_max_len - apdu_len) == 0) {
|
||||
return BACNET_STATUS_REJECT;
|
||||
}
|
||||
/* Tag 1: target-level */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 1)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->target_level = real_value;
|
||||
data->use_target_level = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_target_level = false;
|
||||
}
|
||||
}
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 2: ramp-rate - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 2)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->ramp_rate = real_value;
|
||||
data->use_ramp_rate = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_ramp_rate = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 5: priority - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->priority = (uint8_t)unsigned_value;
|
||||
data->use_priority = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_priority = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BACNET_LIGHTS_STEP_UP:
|
||||
case BACNET_LIGHTS_STEP_DOWN:
|
||||
case BACNET_LIGHTS_STEP_ON:
|
||||
case BACNET_LIGHTS_STEP_OFF:
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 3: step-increment - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 3)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_real(&apdu[apdu_len], &real_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->step_increment = real_value;
|
||||
data->use_step_increment = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_step_increment = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 5: priority - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->priority = (uint8_t)unsigned_value;
|
||||
data->use_priority = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_priority = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BACNET_LIGHTS_WARN:
|
||||
case BACNET_LIGHTS_WARN_OFF:
|
||||
case BACNET_LIGHTS_WARN_RELINQUISH:
|
||||
case BACNET_LIGHTS_STOP:
|
||||
if ((apdu_max_len - apdu_len) != 0) {
|
||||
/* Tag 5: priority - OPTIONAL */
|
||||
if (decode_is_context_tag(&apdu[apdu_len], 4)) {
|
||||
len = decode_tag_number_and_value(
|
||||
&apdu[apdu_len], &tag_number, &len_value_type);
|
||||
apdu_len += len;
|
||||
len = decode_unsigned(
|
||||
&apdu[apdu_len], len_value_type, &unsigned_value);
|
||||
apdu_len += len;
|
||||
if (data) {
|
||||
data->priority = (uint8_t)unsigned_value;
|
||||
data->use_priority = true;
|
||||
}
|
||||
} else {
|
||||
if (data) {
|
||||
data->use_priority = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return len;
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -251,3 +251,84 @@ int property_list_encode(BACNET_READ_PROPERTY_DATA *rpdata,
|
||||
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
/**
|
||||
* ReadProperty handler for common properties. For the given ReadProperty
|
||||
* data, the application_data is loaded or the error flags are set.
|
||||
*
|
||||
* @param rpdata - ReadProperty data, including requested data and
|
||||
* data for the reply, or error response.
|
||||
* @param device_instance_number - device instance number
|
||||
*
|
||||
* @return number of APDU bytes in the response, or
|
||||
* BACNET_STATUS_ERROR on error.
|
||||
*/
|
||||
int property_list_common_encode(BACNET_READ_PROPERTY_DATA *rpdata,
|
||||
uint32_t device_instance_number)
|
||||
{
|
||||
int apdu_len = BACNET_STATUS_ERROR;
|
||||
uint8_t *apdu = NULL;
|
||||
|
||||
if (!rpdata) {
|
||||
return 0;
|
||||
}
|
||||
if ((rpdata->application_data == NULL) ||
|
||||
(rpdata->application_data_len == 0)) {
|
||||
return 0;
|
||||
}
|
||||
apdu = rpdata->application_data;
|
||||
switch (rpdata->object_property) {
|
||||
case PROP_OBJECT_IDENTIFIER:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
/* Device Object exception: requested instance
|
||||
may not match our instance if a wildcard */
|
||||
if (rpdata->object_type == OBJECT_DEVICE) {
|
||||
rpdata->object_instance = device_instance_number;
|
||||
}
|
||||
apdu_len = encode_application_object_id(
|
||||
&apdu[0], rpdata->object_type, rpdata->object_instance);
|
||||
}
|
||||
break;
|
||||
case PROP_OBJECT_TYPE:
|
||||
/* only array properties can have array options */
|
||||
if (rpdata->array_index != BACNET_ARRAY_ALL) {
|
||||
rpdata->error_class = ERROR_CLASS_PROPERTY;
|
||||
rpdata->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||
apdu_len = BACNET_STATUS_ERROR;
|
||||
} else {
|
||||
apdu_len = encode_application_enumerated(
|
||||
&apdu[0], rpdata->object_type);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Determine if the property is a common property
|
||||
* @param property - property value for comparison
|
||||
* @return true if the property is a common object property
|
||||
*/
|
||||
bool property_list_common(BACNET_PROPERTY_ID property)
|
||||
{
|
||||
bool status = false;
|
||||
|
||||
switch (property) {
|
||||
case PROP_OBJECT_IDENTIFIER:
|
||||
case PROP_OBJECT_TYPE:
|
||||
status = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -60,6 +60,13 @@ extern "C" {
|
||||
const int *pListRequired,
|
||||
const int *pListOptional,
|
||||
const int *pListProprietary);
|
||||
BACNET_STACK_EXPORT
|
||||
int property_list_common_encode(
|
||||
BACNET_READ_PROPERTY_DATA *rpdata,
|
||||
uint32_t device_instance_number);
|
||||
BACNET_STACK_EXPORT
|
||||
bool property_list_common(
|
||||
BACNET_PROPERTY_ID property);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -22,29 +22,39 @@
|
||||
static void testAnalogInput(void)
|
||||
{
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Analog_Input_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_ANALOG_INPUT;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Analog_Input_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
return;
|
||||
Analog_Input_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Analog_Input_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
printf("property '%s': failed to decode!\n",
|
||||
bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @}
|
||||
|
||||
@@ -22,27 +22,43 @@
|
||||
static void testAnalogOutput(void)
|
||||
{
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Analog_Output_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_ANALOG_OUTPUT;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Analog_Output_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
Analog_Output_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Analog_Output_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
//printf("property '%s': failed to decode!\n",
|
||||
// bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
if (rpdata.object_property == PROP_PRIORITY_ARRAY) {
|
||||
/* FIXME: known fail to decode */
|
||||
len = test_len;
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -21,30 +21,44 @@
|
||||
*/
|
||||
static void testAnalog_Value(void)
|
||||
{
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Analog_Value_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_ANALOG_VALUE;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Analog_Value_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
return;
|
||||
Analog_Value_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Analog_Value_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
//printf("property '%s': failed to decode!\n",
|
||||
// bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
if (rpdata.object_property == PROP_PRIORITY_ARRAY) {
|
||||
/* FIXME: known fail to decode */
|
||||
len = test_len;
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @}
|
||||
|
||||
@@ -21,30 +21,40 @@
|
||||
*/
|
||||
static void testBinaryInput(void)
|
||||
{
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Binary_Input_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_BINARY_INPUT;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Binary_Input_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
return;
|
||||
Binary_Input_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Binary_Input_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
printf("property '%s': failed to decode!\n",
|
||||
bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @}
|
||||
|
||||
@@ -22,29 +22,43 @@
|
||||
static void testBinaryOutput(void)
|
||||
{
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Binary_Output_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_BINARY_OUTPUT;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Binary_Output_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
return;
|
||||
Binary_Output_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Binary_Output_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
//printf("property '%s': failed to decode!\n",
|
||||
// bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
if (rpdata.object_property == PROP_PRIORITY_ARRAY) {
|
||||
/* FIXME: known fail to decode */
|
||||
len = test_len;
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @}
|
||||
|
||||
@@ -22,29 +22,43 @@
|
||||
static void testBinary_Value(void)
|
||||
{
|
||||
uint8_t apdu[MAX_APDU] = { 0 };
|
||||
int len = 0;
|
||||
int len = 0, test_len = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint8_t tag_number = 0;
|
||||
BACNET_OBJECT_TYPE decoded_type = 0;
|
||||
uint32_t decoded_instance = 0;
|
||||
BACNET_READ_PROPERTY_DATA rpdata;
|
||||
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
|
||||
BACNET_APPLICATION_DATA_VALUE value = {0};
|
||||
const int *required_property = NULL;
|
||||
const uint32_t instance = 1;
|
||||
|
||||
Binary_Value_Init();
|
||||
rpdata.application_data = &apdu[0];
|
||||
rpdata.application_data_len = sizeof(apdu);
|
||||
rpdata.object_type = OBJECT_BINARY_VALUE;
|
||||
rpdata.object_instance = 1;
|
||||
rpdata.object_property = PROP_OBJECT_IDENTIFIER;
|
||||
rpdata.object_instance = instance;
|
||||
rpdata.array_index = BACNET_ARRAY_ALL;
|
||||
len = Binary_Value_Read_Property(&rpdata);
|
||||
zassert_not_equal(len, 0, NULL);
|
||||
len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
|
||||
zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
|
||||
len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
|
||||
zassert_equal(decoded_type, rpdata.object_type, NULL);
|
||||
zassert_equal(decoded_instance, rpdata.object_instance, NULL);
|
||||
|
||||
return;
|
||||
Binary_Value_Property_Lists(&required_property, NULL, NULL);
|
||||
while ((*required_property) >= 0) {
|
||||
rpdata.object_property = *required_property;
|
||||
len = Binary_Value_Read_Property(&rpdata);
|
||||
zassert_true(len >= 0, NULL);
|
||||
if (len >= 0) {
|
||||
test_len = bacapp_decode_known_property(rpdata.application_data,
|
||||
len, &value, rpdata.object_type, rpdata.object_property);
|
||||
if (len != test_len) {
|
||||
//printf("property '%s': failed to decode!\n",
|
||||
// bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
if (rpdata.object_property == PROP_PRIORITY_ARRAY) {
|
||||
/* FIXME: known fail to decode */
|
||||
len = test_len;
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
required_property++;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @}
|
||||
|
||||
@@ -52,11 +52,9 @@ static void testLightingOutput(void)
|
||||
printf("property '%s': failed to decode!\n",
|
||||
bactext_property_name(rpdata.object_property));
|
||||
}
|
||||
if ((rpdata.object_property == PROP_LIGHTING_COMMAND) ||
|
||||
(rpdata.object_property == PROP_PRIORITY_ARRAY) ||
|
||||
(rpdata.object_property == PROP_TRACKING_VALUE)) {
|
||||
/* FIXME: how to decode the complex data? */
|
||||
test_len = len;
|
||||
if (rpdata.object_property == PROP_PRIORITY_ARRAY) {
|
||||
/* FIXME: known fail to decode */
|
||||
len = test_len;
|
||||
}
|
||||
zassert_equal(len, test_len, NULL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user