From 03a0a23ba60a757d9da1f7a42e937deb06ad6cf8 Mon Sep 17 00:00:00 2001 From: skarg Date: Mon, 15 Oct 2012 21:28:29 +0000 Subject: [PATCH] Corrected normal/fault transitions in Analog_Input_Alarm_Ack(). Thanks, yoo_ms@hotmail.com. --- bacnet-stack/demo/object/ai.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bacnet-stack/demo/object/ai.c b/bacnet-stack/demo/object/ai.c index 93aac339..d6983f76 100644 --- a/bacnet-stack/demo/object/ai.c +++ b/bacnet-stack/demo/object/ai.c @@ -1105,14 +1105,14 @@ int Analog_Input_Alarm_Ack( break; case EVENT_STATE_FAULT: - if (CurrentAI->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked == + if (CurrentAI->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked == false) { if (alarmack_data->eventTimeStamp.tag != TIME_STAMP_DATETIME) { *error_code = ERROR_CODE_INVALID_TIME_STAMP; return -1; } if (datetime_compare(&CurrentAI->Acked_Transitions - [TRANSITION_TO_NORMAL].Time_Stamp, + [TRANSITION_TO_FAULT].Time_Stamp, &alarmack_data->eventTimeStamp.value.dateTime) > 0) { *error_code = ERROR_CODE_INVALID_TIME_STAMP; return -1; @@ -1128,14 +1128,14 @@ int Analog_Input_Alarm_Ack( break; case EVENT_STATE_NORMAL: - if (CurrentAI->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked == + if (CurrentAI->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked == false) { if (alarmack_data->eventTimeStamp.tag != TIME_STAMP_DATETIME) { *error_code = ERROR_CODE_INVALID_TIME_STAMP; return -1; } if (datetime_compare(&CurrentAI->Acked_Transitions - [TRANSITION_TO_FAULT].Time_Stamp, + [TRANSITION_TO_NORMAL].Time_Stamp, &alarmack_data->eventTimeStamp.value.dateTime) > 0) { *error_code = ERROR_CODE_INVALID_TIME_STAMP; return -1; @@ -1153,6 +1153,8 @@ int Analog_Input_Alarm_Ack( default: return -2; } + CurrentAI->Ack_notify_data.bSendAckNotify = true; + CurrentAI->Ack_notify_data.EventState = alarmack_data->eventStateAcked; return 1; }