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

Added code to handle Life Safety Operation service.

Browse Source
This commit is contained in:
minack
2009-01-23 00:34:55 +00:00
parent 93826be9e5
commit 89fc2810f3
6 changed files with 380 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/event.c
+7 -7
View File
@@ -505,7 +505,7 @@ int event_notify_decode_service_request(
/* tag 6 - eventType */
if ((section_length =
decode_context_enumerated(&apdu[len], 6,
&data->eventType)) == -1) {
(int*)&data->eventType)) == -1) {
return -1;
} else {
len += section_length;
@@ -534,7 +534,7 @@ int event_notify_decode_service_request(
/* tag 8 - notifyType */
if ((section_length =
decode_context_enumerated(&apdu[len], 8,
&data->notifyType)) == -1) {
(int*)&data->notifyType)) == -1) {
return -1;
} else {
len += section_length;
@@ -553,7 +553,7 @@ int event_notify_decode_service_request(
/* tag 10 - fromState */
if ((section_length =
decode_context_enumerated(&apdu[len], 10,
&data->fromState)) == -1) {
(int*)&data->fromState)) == -1) {
return -1;
} else {
len += section_length;
@@ -564,7 +564,7 @@ int event_notify_decode_service_request(
/* tag 11 - toState */
if ((section_length =
decode_context_enumerated(&apdu[len], 11,
&data->toState)) == -1) {
(int*)&data->toState)) == -1) {
return -1;
} else {
len += section_length;
@@ -744,7 +744,7 @@ int event_notify_decode_service_request(
case EVENT_CHANGE_OF_LIFE_SAFETY:
if (-1 == (section_length =
decode_context_enumerated(&apdu[len], 0,
&data->notificationParams.
(int*)&data->notificationParams.
changeOfLifeSafety.newState))) {
return -1;
}
@@ -752,7 +752,7 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
decode_context_enumerated(&apdu[len], 1,
&data->notificationParams.
(int*)&data->notificationParams.
changeOfLifeSafety.newMode))) {
return -1;
}
@@ -768,7 +768,7 @@ int event_notify_decode_service_request(
if (-1 == (section_length =
decode_context_enumerated(&apdu[len], 3,
&data->notificationParams.
(int*)&data->notificationParams.
changeOfLifeSafety.operationExpected))) {
return -1;
}
bacnet-stack/src/lso.c
+165
View File
@@ -0,0 +1,165 @@
#include "lso.h"
#include "bacdcode.h"
#include "apdu.h"
int lso_encode_adpu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_LSO_DATA * data)
{
int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */
uint16_t max_apdu = Device_Max_APDU_Length_Accepted();
if (apdu && data) {
apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST;
apdu[1] = encode_max_segs_max_apdu(0, max_apdu);
apdu[2] = invoke_id;
apdu[3] = SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION;
apdu_len = 4;
/* tag 0 - requestingProcessId */
len =
encode_context_unsigned(&apdu[apdu_len], 0,
data->processId);
apdu_len += len;
/* tag 1 - requestingSource */
len =
encode_context_character_string(&apdu[apdu_len], 1,
&data->requestingSrc);
apdu_len += len;
/*
Operation
*/
len = encode_context_enumerated(&apdu[apdu_len], 2, data->operation);
apdu_len += len;
/*
Object ID
*/
len = encode_context_object_id(&apdu[apdu_len], 3,
data->targetObject.type,
data->targetObject.instance);
apdu_len += len;
}
return apdu_len;
}
int lso_decode_service_request(
uint8_t *apdu,
unsigned apdu_len,
BACNET_LSO_DATA *data)
{
int len = 0; /* return value */
int section_length;
uint8_t tag_number = 0;
uint32_t len_value_type = 0;
int type = 0; /* for decoding */
int property = 0; /* for decoding */
/* check for value pointers */
if (apdu_len && data) {
/* Tag 0: Object ID */
if ( (section_length = decode_context_unsigned(&apdu[len], 0, &data->processId)) == -1)
{
return -1;
}
len += section_length;
if ( (section_length = decode_context_character_string(&apdu[len], 1, &data->requestingSrc)) == -1)
{
return -1;
}
len += section_length;
if ( (section_length = decode_context_enumerated(&apdu[len], 2, (int*)&data->operation)) == -1)
{
return -1;
}
len += section_length;
/*
** This is an optional parameter, so dont fail if it doesnt exist
*/
if ( decode_is_context_tag(&apdu[len], 3) )
{
if ( (section_length = decode_context_object_id(&apdu[len], 3,
&data->targetObject.type,
&data->targetObject.instance)) == -1 )
{
return -1;
}
len += section_length;
}
else
{
data->targetObject.type = 0;
data->targetObject.instance = 0;
}
return len;
}
return 0;
}
#ifdef TEST
#include <assert.h>
#include <string.h>
#include "ctest.h"
#include "bacapp.h"
void testLSO(
Test * pTest)
{
uint8_t apdu[1000];
int len;
BACNET_LSO_DATA data;
BACNET_LSO_DATA rxdata;
memset(&rxdata, 0, sizeof(rxdata));
characterstring_init_ansi(&data.requestingSrc, "foobar");
data.operation = LIFE_SAFETY_OP_RESET;
data.processId = 0x1234;
data.targetObject.instance = 0x1000;
data.targetObject.type = OBJECT_BINARY_INPUT;
len = lso_encode_adpu(apdu, 100, &data);
lso_decode_service_request(&apdu[4], len, &rxdata);
ct_test(pTest, data.operation == rxdata.operation);
ct_test(pTest, data.processId == rxdata.processId);
ct_test(pTest, data.targetObject.instance == rxdata.targetObject.instance);
ct_test(pTest, data.targetObject.type == rxdata.targetObject.type);
ct_test(pTest, memcmp(data.requestingSrc.value, rxdata.requestingSrc.value, rxdata.requestingSrc.length) == 0);
}
#ifdef TEST_LSO
int main(
int argc,
char *argv[])
{
Test *pTest;
bool rc;
pTest = ct_create("BACnet Life Safety Operation", NULL);
/* individual tests */
rc = ct_addTestFunction(pTest, testLSO);
assert(rc);
ct_setStream(pTest, stdout);
ct_run(pTest);
(void) ct_report(pTest);
ct_destroy(pTest);
return 0;
}
#endif /* TEST_COV */
#endif /* TEST */