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

Added fixes for Alarms and Events. Thank you Sebastien!

Browse Source
This commit is contained in:
skarg
2009-11-29 18:47:05 +00:00
parent 35ec69c307
commit 52294d1dce
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/alarm_ack.c
+4 -4
View File
@@ -88,7 +88,7 @@ int alarm_ack_encode_service_request(
len =
encode_context_enumerated(&apdu[apdu_len], 2,
data->eventTypeAcked);
data->eventStateAcked);
apdu_len += len;
len =
@@ -144,7 +144,7 @@ int alarm_ack_decode_service_request(
decode_context_enumerated(&apdu[len], 2, &enumValue))) {
return -1;
}
data->eventTypeAcked = (BACNET_EVENT_TYPE) enumValue;
data->eventStateAcked = (BACNET_EVENT_STATE)enumValue;
len += section_len;
if (-1 == (section_len =
@@ -199,7 +199,7 @@ void testAlarmAck(
testAlarmAckIn.eventTimeStamp.value.time.min = 11;
testAlarmAckIn.eventTimeStamp.value.time.sec = 12;
testAlarmAckIn.eventTimeStamp.value.time.hundredths = 14;
testAlarmAckIn.eventTypeAcked = EVENT_CHANGE_OF_LIFE_SAFETY;
testAlarmAckIn.eventStateAcked = EVENT_STATE_OFFNORMAL;
memset(&testAlarmAckOut, 0, sizeof(testAlarmAckOut));
@@ -247,7 +247,7 @@ void testAlarmAck(
testAlarmAckOut.eventTimeStamp.value.time.hundredths);
ct_test(pTest,
testAlarmAckIn.eventTypeAcked == testAlarmAckOut.eventTypeAcked);
testAlarmAckIn.eventStateAcked == testAlarmAckOut.eventStateAcked);
}