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

refactored and added return error codes to read property functions.

Browse Source
This commit is contained in:
skarg
2005-05-24 10:47:46 +00:00
parent f0a28e494b
commit 96e5e43938
7 changed files with 122 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ai.c
+6 -2
View File
@@ -65,7 +65,9 @@ int Analog_Input_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index) int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{ {
int apdu_len = 0; // return value int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
@@ -107,7 +109,9 @@ int Analog_Input_Encode_Property_APDU(
apdu_len = encode_tagged_enumerated(&apdu[0],UNITS_PERCENT); apdu_len = encode_tagged_enumerated(&apdu[0],UNITS_PERCENT);
break; break;
default: default:
break; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_UNKNOWN_PROPERTY;
break;
} }
return apdu_len; return apdu_len;
bacnet-stack/ai.h
+3 -1
View File
@@ -37,7 +37,9 @@ int Analog_Input_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index); int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
bacnet-stack/ao.c
+45 -32
View File
@@ -145,13 +145,15 @@ int Analog_Output_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index) int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{ {
int len = 0; int len = 0;
int apdu_len = 0; // return value int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
char text_string[32] = {""}; char text_string[32] = {""};
float value = 1.41421356; float real_value = 1.41421356;
unsigned object_index = 0; unsigned object_index = 0;
unsigned i = 0; unsigned i = 0;
@@ -164,7 +166,7 @@ int Analog_Output_Encode_Property_APDU(
break; break;
case PROP_OBJECT_NAME: case PROP_OBJECT_NAME:
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
// note: the object name must be unique in this device // note: the object name must be unique within this device
sprintf(text_string,"ANALOG OUTPUT %d",object_instance); sprintf(text_string,"ANALOG OUTPUT %d",object_instance);
apdu_len = encode_tagged_character_string(&apdu[0], text_string); apdu_len = encode_tagged_character_string(&apdu[0], text_string);
break; break;
@@ -172,8 +174,8 @@ int Analog_Output_Encode_Property_APDU(
apdu_len = encode_tagged_enumerated(&apdu[0], OBJECT_ANALOG_OUTPUT); apdu_len = encode_tagged_enumerated(&apdu[0], OBJECT_ANALOG_OUTPUT);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
value = Analog_Output_Present_Value(object_instance); real_value = Analog_Output_Present_Value(object_instance);
apdu_len = encode_tagged_real(&apdu[0], value); apdu_len = encode_tagged_real(&apdu[0], real_value);
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, false); bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, false);
@@ -202,21 +204,21 @@ int Analog_Output_Encode_Property_APDU(
object_index = Analog_Output_Instance_To_Index(object_instance); object_index = Analog_Output_Instance_To_Index(object_instance);
for (i = 0; i < BACNET_MAX_PRIORITIES; i++) for (i = 0; i < BACNET_MAX_PRIORITIES; i++)
{ {
// FIXME: check it we have room before adding it to APDU // FIXME: check if we have room before adding it to APDU
if (Analog_Output_Level[object_index][i] == AO_LEVEL_NULL) if (Analog_Output_Level[object_index][i] == AO_LEVEL_NULL)
len = encode_tagged_null(&apdu[apdu_len]); len = encode_tagged_null(&apdu[apdu_len]);
else else
{ {
value = Analog_Output_Level[object_index][i]; real_value = Analog_Output_Level[object_index][i];
len = encode_tagged_real(&apdu[apdu_len], value); len = encode_tagged_real(&apdu[apdu_len], real_value);
} }
// add it if we have room // add it if we have room
if ((apdu_len + len) < MAX_APDU) if ((apdu_len + len) < MAX_APDU)
apdu_len += len; apdu_len += len;
else else
{ {
// ERROR_CLASS_SERVICES *error_class = ERROR_CLASS_SERVICES;
// ERROR_CODE_NO_SPACE_FOR_OBJECT *error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = 0; apdu_len = 0;
break; break;
} }
@@ -231,24 +233,26 @@ int Analog_Output_Encode_Property_APDU(
len = encode_tagged_null(&apdu[apdu_len]); len = encode_tagged_null(&apdu[apdu_len]);
else else
{ {
value = Analog_Output_Level[object_index][array_index]; real_value = Analog_Output_Level[object_index][array_index];
len = encode_tagged_real(&apdu[apdu_len], value); len = encode_tagged_real(&apdu[apdu_len], real_value);
} }
} }
else else
{ {
//ERROR_CLASS_PROPERTY *error_class = ERROR_CLASS_PROPERTY;
//ERROR_CODE_INVALID_ARRAY_INDEX *error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
} }
} }
break; break;
case PROP_RELINQUISH_DEFAULT: case PROP_RELINQUISH_DEFAULT:
value = AO_RELINQUISH_DEFAULT; real_value = AO_RELINQUISH_DEFAULT;
apdu_len = encode_tagged_real(&apdu[0], value); apdu_len = encode_tagged_real(&apdu[0], real_value);
break; break;
default: default:
break; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_UNKNOWN_PROPERTY;
break;
} }
return apdu_len; return apdu_len;
@@ -279,29 +283,25 @@ bool Analog_Output_Write_Property(
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
if (wp_data->value.tag == BACNET_APPLICATION_TAG_REAL) if (wp_data->value.tag == BACNET_APPLICATION_TAG_REAL)
{ {
if ((wp_data->value.type.Real >= 0.0) &&
(wp_data->value.type.Real <= 100.0))
level = wp_data->value.type.Real;
else
{
*error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
return false;
}
object_index = Analog_Output_Instance_To_Index(
wp_data->object_instance);
priority = wp_data->priority; priority = wp_data->priority;
if (priority && (priority <= BACNET_MAX_PRIORITIES)) if (priority && (priority <= BACNET_MAX_PRIORITIES) &&
(wp_data->value.type.Real >= 0.0) &&
(wp_data->value.type.Real <= 100.0))
{ {
level = wp_data->value.type.Real;
object_index = Analog_Output_Instance_To_Index(
wp_data->object_instance);
priority--; priority--;
Analog_Output_Level[object_index][priority] = level; Analog_Output_Level[object_index][priority] = level;
// if Out of Service is TRUE, then don't set the
// physical output. This comment may apply to the
// main loop (i.e. check out of service before changing output)
status = true; status = true;
} }
else else
{ {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
return false;
} }
} }
else if (wp_data->value.tag == BACNET_APPLICATION_TAG_NULL) else if (wp_data->value.tag == BACNET_APPLICATION_TAG_NULL)
@@ -320,14 +320,27 @@ bool Analog_Output_Write_Property(
{ {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
return false;
} }
} }
else else
{ {
*error_class = ERROR_CLASS_PROPERTY; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_INVALID_DATA_TYPE; *error_code = ERROR_CODE_INVALID_DATA_TYPE;
return false; }
break;
case PROP_OUT_OF_SERVICE:
if (wp_data->value.tag == BACNET_APPLICATION_TAG_BOOLEAN)
{
object_index = Analog_Output_Instance_To_Index(
wp_data->object_instance);
Analog_Output_Out_Of_Service[object_index] =
wp_data->value.type.Boolean;
status = true;
}
else
{
*error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_INVALID_DATA_TYPE;
} }
break; break;
default: default:
bacnet-stack/ao.h
+3 -1
View File
@@ -39,7 +39,9 @@ int Analog_Output_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
uint32_t object_instance, uint32_t object_instance,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index); int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code);
bool Analog_Output_Write_Property( bool Analog_Output_Write_Property(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_WRITE_PROPERTY_DATA *wp_data,
bacnet-stack/device.c
+32 -30
View File
@@ -189,11 +189,6 @@ BACNET_SEGMENTATION Device_Segmentation_Supported(void)
return SEGMENTATION_NONE; return SEGMENTATION_NONE;
} }
//FIXME: Probably return one at a time, or be supported by
// an object module, or encode the APDU here.
//Object_List
uint16_t Device_APDU_Timeout(void) uint16_t Device_APDU_Timeout(void)
{ {
return APDU_Timeout; return APDU_Timeout;
@@ -276,10 +271,13 @@ bool Device_Object_List_Identifier(unsigned array_index,
return status; return status;
} }
// return the length of the apdu encoded
int Device_Encode_Property_APDU( int Device_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index) int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{ {
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
@@ -324,26 +322,26 @@ int Device_Encode_Property_APDU(
Application_Software_Version); Application_Software_Version);
break; break;
// if you support time // if you support time
case PROP_LOCAL_TIME: //case PROP_LOCAL_TIME:
//t = time(NULL); //t = time(NULL);
//my_tm = localtime(&t); //my_tm = localtime(&t);
//apdu_len = //apdu_len =
// encode_tagged_time(&apdu[0], my_tm->tm_hour, my_tm->tm_min, // encode_tagged_time(&apdu[0], my_tm->tm_hour, my_tm->tm_min,
// my_tm->tm_sec, 0); // my_tm->tm_sec, 0);
break; //break;
// if you support date // if you support date
case PROP_LOCAL_DATE: //case PROP_LOCAL_DATE:
//t = time(NULL); //t = time(NULL);
//my_tm = localtime(&t); //my_tm = localtime(&t);
// year = years since 1900 // year = years since 1900
// month 1=Jan // month 1=Jan
// day = day of month // day = day of month
// wday 1=Monday...7=Sunday // wday 1=Monday...7=Sunday
//apdu_len = encode_tagged_date(&apdu[0], //apdu_len = encode_tagged_date(&apdu[0],
// my_tm->tm_year, // my_tm->tm_year,
// my_tm->tm_mon + 1, // my_tm->tm_mon + 1,
// my_tm->tm_mday, ((my_tm->tm_wday == 0) ? 7 : my_tm->tm_wday)); // my_tm->tm_mday, ((my_tm->tm_wday == 0) ? 7 : my_tm->tm_wday));
break; //break;
case PROP_PROTOCOL_VERSION: case PROP_PROTOCOL_VERSION:
apdu_len = encode_tagged_unsigned(&apdu[0], Device_Protocol_Version()); apdu_len = encode_tagged_unsigned(&apdu[0], Device_Protocol_Version());
break; break;
@@ -398,8 +396,8 @@ int Device_Encode_Property_APDU(
// 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)
{ {
// ERROR_CLASS_SERVICES *error_class = ERROR_CLASS_SERVICES;
// ERROR_CODE_NO_SPACE_FOR_OBJECT *error_code = ERROR_CODE_NO_SPACE_FOR_OBJECT;
apdu_len = 0; apdu_len = 0;
break; break;
} }
@@ -407,6 +405,8 @@ int Device_Encode_Property_APDU(
else else
{ {
// error: internal error? // error: internal error?
*error_class = ERROR_CLASS_SERVICES;
*error_code = ERROR_CODE_OTHER;
apdu_len = 0; apdu_len = 0;
break; break;
} }
@@ -418,8 +418,8 @@ int Device_Encode_Property_APDU(
apdu_len = encode_tagged_object_id(&apdu[0], object_type, instance); apdu_len = encode_tagged_object_id(&apdu[0], object_type, instance);
else else
{ {
//ERROR_CLASS_PROPERTY *error_class = ERROR_CLASS_PROPERTY;
//ERROR_CODE_INVALID_ARRAY_INDEX *error_code = ERROR_CODE_INVALID_ARRAY_INDEX;
} }
} }
break; break;
@@ -438,7 +438,9 @@ int Device_Encode_Property_APDU(
apdu_len = encode_tagged_unsigned(&apdu[0], Number_Of_APDU_Retries); apdu_len = encode_tagged_unsigned(&apdu[0], Number_Of_APDU_Retries);
break; break;
default: default:
break; *error_class = ERROR_CLASS_PROPERTY;
*error_code = ERROR_CODE_UNKNOWN_PROPERTY;
break;
} }
return apdu_len; return apdu_len;
bacnet-stack/device.h
+3 -1
View File
@@ -87,7 +87,9 @@ void Device_Set_Database_Revision(uint8_t revision);
int Device_Encode_Property_APDU( int Device_Encode_Property_APDU(
uint8_t *apdu, uint8_t *apdu,
BACNET_PROPERTY_ID property, BACNET_PROPERTY_ID property,
int32_t array_index); int32_t array_index,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code);
bool Device_Write_Property( bool Device_Write_Property(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_WRITE_PROPERTY_DATA *wp_data,
bacnet-stack/handlers.c
+30 -72
View File
@@ -221,7 +221,10 @@ void ReadPropertyHandler(
int32_t array_index; int32_t array_index;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
bool send = false; bool send = false;
bool error = false;
int bytes_sent = 0; int bytes_sent = 0;
BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
len = rp_decode_service_request( len = rp_decode_service_request(
service_request, service_request,
@@ -273,13 +276,14 @@ void ReadPropertyHandler(
{ {
case OBJECT_DEVICE: case OBJECT_DEVICE:
// FIXME: probably need a length limitation sent with encode // FIXME: probably need a length limitation sent with encode
// FIXME: might need to return error codes
if (object_instance == Device_Object_Instance_Number()) if (object_instance == Device_Object_Instance_Number())
{ {
len = Device_Encode_Property_APDU( len = Device_Encode_Property_APDU(
&Temp_Buf[0], &Temp_Buf[0],
object_property, object_property,
array_index); array_index,
&error_class,
&error_code);
if (len > 0) if (len > 0)
{ {
// encode the APDU portion of the packet // encode the APDU portion of the packet
@@ -298,28 +302,10 @@ void ReadPropertyHandler(
send = true; send = true;
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_PROPERTY,
ERROR_CODE_UNKNOWN_PROPERTY);
fprintf(stderr,"Sending Unknown Property Error!\n");
send = true;
}
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_OBJECT,
ERROR_CODE_UNKNOWN_OBJECT);
fprintf(stderr,"Sending Unknown Object Error!\n");
send = true;
}
break; break;
case OBJECT_ANALOG_INPUT: case OBJECT_ANALOG_INPUT:
if (Analog_Input_Valid_Instance(object_instance)) if (Analog_Input_Valid_Instance(object_instance))
@@ -328,7 +314,9 @@ void ReadPropertyHandler(
&Temp_Buf[0], &Temp_Buf[0],
object_instance, object_instance,
object_property, object_property,
array_index); array_index,
&error_class,
&error_code);
if (len > 0) if (len > 0)
{ {
// encode the APDU portion of the packet // encode the APDU portion of the packet
@@ -347,28 +335,10 @@ void ReadPropertyHandler(
send = true; send = true;
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_PROPERTY,
ERROR_CODE_UNKNOWN_PROPERTY);
fprintf(stderr,"Sending Unknown Property Error!\n");
send = true;
}
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_OBJECT,
ERROR_CODE_UNKNOWN_OBJECT);
fprintf(stderr,"Sending Unknown Object Error!\n");
send = true;
}
break; break;
case OBJECT_ANALOG_OUTPUT: case OBJECT_ANALOG_OUTPUT:
if (Analog_Output_Valid_Instance(object_instance)) if (Analog_Output_Valid_Instance(object_instance))
@@ -377,7 +347,9 @@ void ReadPropertyHandler(
&Temp_Buf[0], &Temp_Buf[0],
object_instance, object_instance,
object_property, object_property,
array_index); array_index,
&error_class,
&error_code);
if (len > 0) if (len > 0)
{ {
// encode the APDU portion of the packet // encode the APDU portion of the packet
@@ -396,41 +368,27 @@ void ReadPropertyHandler(
send = true; send = true;
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_PROPERTY,
ERROR_CODE_UNKNOWN_PROPERTY);
fprintf(stderr,"Sending Unknown Property Error!\n");
send = true;
}
} }
else else
{ error = true;
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_OBJECT,
ERROR_CODE_UNKNOWN_OBJECT);
fprintf(stderr,"Sending Unknown Object Error!\n");
send = true;
}
break; break;
default: default:
pdu_len += bacerror_encode_apdu( error = true;
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
ERROR_CLASS_OBJECT,
ERROR_CODE_UNKNOWN_OBJECT);
fprintf(stderr,"Sending Unknown Object Error!\n");
send = true;
break; break;
} }
} }
if (error)
{
pdu_len += bacerror_encode_apdu(
&Tx_Buf[pdu_len],
service_data->invoke_id,
SERVICE_CONFIRMED_READ_PROPERTY,
error_class,
error_code);
fprintf(stderr,"Sending Read Property Error!\n");
send = true;
}
if (send) if (send)
{ {
bytes_sent = bacdl_send_pdu( bytes_sent = bacdl_send_pdu(