mirror/bacnet-stack
1
0
Fork 0
mirror of https://github.com/stargieg/bacnet-stack synced 2025-10-26 23:35:52 +08:00
Code Issues Releases Wiki Activity

fix bi value type to encode_application_enumerated

Browse Source
This commit is contained in:
Patrick Grimm 2014-02-24 20:10:24 +01:00
parent b1340e611f
commit 7ca37c1aa3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demo/object/bi.c
View File

@ -1061,7 +1061,7 @@ int Binary_Input_Read_Property(
/* Array element zero is the number of elements in the array */ /* Array element zero is the number of elements in the array */
if (rpdata->array_index == 0) { if (rpdata->array_index == 0) {
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0], BACNET_MAX_PRIORITY); encode_application_enumerated(&apdu[0], BACNET_MAX_PRIORITY);
/* 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) {
@ -1072,7 +1072,7 @@ int Binary_Input_Read_Property(
} else { } else {
present_value = CurrentBI->Priority_Array[i]; present_value = CurrentBI->Priority_Array[i];
len = len =
encode_application_unsigned(&apdu[apdu_len], encode_application_enumerated(&apdu[apdu_len],
present_value); present_value);
} }
/* add it if we have room */ /* add it if we have room */
@ -1094,7 +1094,7 @@ int Binary_Input_Read_Property(
present_value = present_value =
CurrentBI->Priority_Array[rpdata->array_index - 1]; CurrentBI->Priority_Array[rpdata->array_index - 1];
apdu_len = apdu_len =
encode_application_unsigned(&apdu[0],present_value); encode_application_enumerated(&apdu[0],present_value);
} }
} else { } else {
rpdata->error_class = ERROR_CLASS_PROPERTY; rpdata->error_class = ERROR_CLASS_PROPERTY;
@ -1106,7 +1106,7 @@ int Binary_Input_Read_Property(
case PROP_RELINQUISH_DEFAULT: case PROP_RELINQUISH_DEFAULT:
present_value = CurrentBI->Relinquish_Default; present_value = CurrentBI->Relinquish_Default;
apdu_len = encode_application_unsigned(&apdu[0], present_value); apdu_len = encode_application_enumerated(&apdu[0], present_value);
break; break;
case PROP_POLARITY: case PROP_POLARITY:
@ -1118,7 +1118,7 @@ int Binary_Input_Read_Property(
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
case PROP_ALARM_VALUE: case PROP_ALARM_VALUE:
len = len =
encode_application_unsigned(&apdu[apdu_len], encode_application_enumerated(&apdu[apdu_len],
CurrentBI->Alarm_Value); CurrentBI->Alarm_Value);
apdu_len += len; apdu_len += len;
break; break;
@ -1422,10 +1422,10 @@ bool Binary_Input_Write_Property(
case PROP_RELINQUISH_DEFAULT: case PROP_RELINQUISH_DEFAULT:
status = status =
WPValidateArgType(&value, BACNET_APPLICATION_TAG_BOOLEAN, WPValidateArgType(&value, BACNET_APPLICATION_TAG_ENUMERATED,
&wp_data->error_class, &wp_data->error_code); &wp_data->error_class, &wp_data->error_code);
if (status) { if (status) {
CurrentBI->Relinquish_Default = value.type.Boolean; CurrentBI->Relinquish_Default = value.type.Enumerated;
} }
break; break;
@ -1446,7 +1446,7 @@ bool Binary_Input_Write_Property(
break; break;
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
case PROP_ALARM_VALUES: case PROP_ALARM_VALUES:
if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) { if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
if (wp_data->array_index == 0) { if (wp_data->array_index == 0) {
/* Array element zero is the number of /* Array element zero is the number of
elements in the array. We have a fixed elements in the array. We have a fixed