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

Fixed basic analog-value object intrinsic reporting and write property (#640)

Browse Source 
* Fixed basic analog-value object intrinsic reporting for ack notification.
* Fixed basic analog-value object write property of present-value to priority 6.
This commit is contained in:
Steve Karg
2024-05-14 11:28:28 -05:00
committed by GitHub
parent ec98da5989
commit c21c99fef3
3 changed files with 289 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-format
+1
View File
@@ -8,6 +8,7 @@ AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false AllowShortLoopsOnASingleLine: false
AlignEscapedNewlines: Left AlignEscapedNewlines: Left
AlignArrayOfStructures: None
PointerAlignment: Right PointerAlignment: Right
BreakBeforeBraces: Linux BreakBeforeBraces: Linux
BreakBeforeBinaryOperators: None BreakBeforeBinaryOperators: None
src/bacnet/basic/object/ai.c
+115 -87
View File
@@ -30,28 +30,33 @@
/* me! */ /* me! */
#include "bacnet/basic/object/ai.h" #include "bacnet/basic/object/ai.h"
#define PRINTF debug_perror
/* Key List for storing the object data sorted by instance number */ /* Key List for storing the object data sorted by instance number */
static OS_Keylist Object_List; static OS_Keylist Object_List;
/* common object type */ /* common object type */
static const BACNET_OBJECT_TYPE Object_Type = OBJECT_ANALOG_INPUT; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_ANALOG_INPUT;
/* clang-format off */
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = { PROP_OBJECT_IDENTIFIER, static const int Properties_Required[] = {
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE,
PROP_OUT_OF_SERVICE, PROP_UNITS, -1
};
static const int Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY, static const int Properties_Optional[] = {
PROP_COV_INCREMENT, PROP_DESCRIPTION, PROP_RELIABILITY, PROP_COV_INCREMENT,
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT, PROP_LOW_LIMIT, PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT,
PROP_DEADBAND, PROP_LIMIT_ENABLE, PROP_EVENT_ENABLE, PROP_ACKED_TRANSITIONS, PROP_LOW_LIMIT, PROP_DEADBAND, PROP_LIMIT_ENABLE, PROP_EVENT_ENABLE,
PROP_NOTIFY_TYPE, PROP_EVENT_TIME_STAMPS, PROP_ACKED_TRANSITIONS, PROP_NOTIFY_TYPE, PROP_EVENT_TIME_STAMPS,
#endif #endif
-1 }; -1
};
static const int Properties_Proprietary[] = { -1 }; static const int Properties_Proprietary[] = {
-1
};
/* clang-format on */
/** /**
* Initialize the pointers for the required, the optional and the properitary * Initialize the pointers for the required, the optional and the properitary
@@ -180,8 +185,8 @@ float Analog_Input_Present_Value(uint32_t object_instance)
* @param index Object index * @param index Object index
* @param value Given present value. * @param value Given present value.
*/ */
static void Analog_Input_COV_Detect( static void
struct analog_input_descr *pObject, float value) Analog_Input_COV_Detect(struct analog_input_descr *pObject, float value)
{ {
float prior_value = 0.0f; float prior_value = 0.0f;
float cov_increment = 0.0f; float cov_increment = 0.0f;
@@ -243,7 +248,8 @@ bool Analog_Input_Object_Name(
status = status =
characterstring_init_ansi(object_name, pObject->Object_Name); characterstring_init_ansi(object_name, pObject->Object_Name);
} else { } else {
snprintf(text_string, sizeof(text_string), "ANALOG INPUT %u", snprintf(
text_string, sizeof(text_string), "ANALOG INPUT %u",
object_instance); object_instance);
status = characterstring_init_ansi(object_name, text_string); status = characterstring_init_ansi(object_name, text_string);
} }
@@ -340,9 +346,8 @@ bool Analog_Input_Description_Set(uint32_t object_instance, char *new_name)
* @brief For a given object instance-number, returns the reliability * @brief For a given object instance-number, returns the reliability
* @param object_instance - object-instance number of the object * @param object_instance - object-instance number of the object
* @return reliability property value * @return reliability property value
*/ */
BACNET_RELIABILITY Analog_Input_Reliability( BACNET_RELIABILITY Analog_Input_Reliability(uint32_t object_instance)
uint32_t object_instance)
{ {
BACNET_RELIABILITY value = RELIABILITY_NO_FAULT_DETECTED; BACNET_RELIABILITY value = RELIABILITY_NO_FAULT_DETECTED;
struct analog_input_descr *pObject; struct analog_input_descr *pObject;
@@ -362,8 +367,7 @@ BACNET_RELIABILITY Analog_Input_Reliability(
* @return true if the reliability property value was set * @return true if the reliability property value was set
*/ */
bool Analog_Input_Reliability_Set( bool Analog_Input_Reliability_Set(
uint32_t object_instance, uint32_t object_instance, BACNET_RELIABILITY value)
BACNET_RELIABILITY value)
{ {
bool status = false; bool status = false;
struct analog_input_descr *pObject; struct analog_input_descr *pObject;
@@ -375,7 +379,6 @@ bool Analog_Input_Reliability_Set(
} }
return status; return status;
} }
/** /**
@@ -439,8 +442,9 @@ bool Analog_Input_Encode_Value_List(
} }
out_of_service = pObject->Out_Of_Service; out_of_service = pObject->Out_Of_Service;
present_value = pObject->Present_Value; present_value = pObject->Present_Value;
status = cov_value_list_encode_real(value_list, present_value, in_alarm, status = cov_value_list_encode_real(
fault, overridden, out_of_service); value_list, present_value, in_alarm, fault, overridden,
out_of_service);
} }
return status; return status;
@@ -453,7 +457,7 @@ bool Analog_Input_Encode_Value_List(
*/ */
float Analog_Input_COV_Increment(uint32_t object_instance) float Analog_Input_COV_Increment(uint32_t object_instance)
{ {
float value = 0; float value = 0.0f;
struct analog_input_descr *pObject; struct analog_input_descr *pObject;
pObject = Analog_Input_Object(object_instance); pObject = Analog_Input_Object(object_instance);
@@ -542,7 +546,8 @@ bool Analog_Input_Out_Of_Service(uint32_t object_instance)
} }
/** /**
* @brief For a given object instance-number, sets the out-of-service property value * @brief For a given object instance-number, sets the out-of-service property
* value
* @param object_instance - object-instance number of the object * @param object_instance - object-instance number of the object
* @param value - boolean out-of-service value * @param value - boolean out-of-service value
* @return true if the out-of-service property value was set * @return true if the out-of-service property value was set
@@ -650,8 +655,7 @@ int Analog_Input_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len = encode_application_enumerated(&apdu[0], Object_Type);
encode_application_enumerated(&apdu[0], Object_Type);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
real_value = Analog_Input_Present_Value(rpdata->object_instance); real_value = Analog_Input_Present_Value(rpdata->object_instance);
@@ -659,12 +663,15 @@ int Analog_Input_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, bitstring_set_bit(
&bit_string, STATUS_FLAG_IN_ALARM,
pObject->Event_State != EVENT_STATE_NORMAL); pObject->Event_State != EVENT_STATE_NORMAL);
bitstring_set_bit(&bit_string, STATUS_FLAG_FAULT, bitstring_set_bit(
&bit_string, STATUS_FLAG_FAULT,
pObject->Reliability != RELIABILITY_NO_FAULT_DETECTED); pObject->Reliability != RELIABILITY_NO_FAULT_DETECTED);
bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false); bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false);
bitstring_set_bit(&bit_string, STATUS_FLAG_OUT_OF_SERVICE, bitstring_set_bit(
&bit_string, STATUS_FLAG_OUT_OF_SERVICE,
pObject->Out_Of_Service); pObject->Out_Of_Service);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
@@ -684,7 +691,8 @@ int Analog_Input_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
apdu_len = encode_application_enumerated(&apdu[0], pObject->Units); apdu_len = encode_application_enumerated(&apdu[0], pObject->Units);
break; break;
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(
&char_string,
Analog_Input_Description(rpdata->object_instance)); Analog_Input_Description(rpdata->object_instance));
apdu_len = apdu_len =
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
@@ -713,33 +721,41 @@ int Analog_Input_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
break; break;
case PROP_LIMIT_ENABLE: case PROP_LIMIT_ENABLE:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, 0, bitstring_set_bit(
&bit_string, 0,
(pObject->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ? true (pObject->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ? true
: false); : false);
bitstring_set_bit(&bit_string, 1, bitstring_set_bit(
&bit_string, 1,
(pObject->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ? true (pObject->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ? true
: false); : false);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_ENABLE: case PROP_EVENT_ENABLE:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_OFFNORMAL,
(pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true (pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true
: false); : false);
bitstring_set_bit(&bit_string, TRANSITION_TO_FAULT, bitstring_set_bit(
&bit_string, TRANSITION_TO_FAULT,
(pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true : false); (pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true : false);
bitstring_set_bit(&bit_string, TRANSITION_TO_NORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_NORMAL,
(pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true (pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true
: false); : false);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_ACKED_TRANSITIONS: case PROP_ACKED_TRANSITIONS:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_OFFNORMAL,
pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
bitstring_set_bit(&bit_string, TRANSITION_TO_FAULT, bitstring_set_bit(
&bit_string, TRANSITION_TO_FAULT,
pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
bitstring_set_bit(&bit_string, TRANSITION_TO_NORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_NORMAL,
pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
@@ -748,8 +764,9 @@ int Analog_Input_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
&apdu[0], pObject->Notify_Type ? NOTIFY_EVENT : NOTIFY_ALARM); &apdu[0], pObject->Notify_Type ? NOTIFY_EVENT : NOTIFY_ALARM);
break; break;
case PROP_EVENT_TIME_STAMPS: case PROP_EVENT_TIME_STAMPS:
apdu_len = bacnet_array_encode(rpdata->object_instance, apdu_len = bacnet_array_encode(
rpdata->array_index, Analog_Input_Event_Time_Stamps_Encode, rpdata->object_instance, rpdata->array_index,
Analog_Input_Event_Time_Stamps_Encode,
MAX_BACNET_EVENT_TRANSITION, apdu, apdu_size); MAX_BACNET_EVENT_TRANSITION, apdu, apdu_size);
if (apdu_len == BACNET_STATUS_ABORT) { if (apdu_len == BACNET_STATUS_ABORT) {
rpdata->error_code = rpdata->error_code =
@@ -948,7 +965,8 @@ bool Analog_Input_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
break; break;
#endif #endif
default: default:
if (property_lists_member(Properties_Required, Properties_Optional, if (property_lists_member(
Properties_Required, Properties_Optional,
Properties_Proprietary, wp_data->object_property)) { Properties_Proprietary, wp_data->object_property)) {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED; wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
@@ -991,7 +1009,8 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
CurrentAI->Ack_notify_data.bSendAckNotify = false; CurrentAI->Ack_notify_data.bSendAckNotify = false;
/* copy toState */ /* copy toState */
ToState = CurrentAI->Ack_notify_data.EventState; ToState = CurrentAI->Ack_notify_data.EventState;
PRINTF("Analog-Input[%d]: Send AckNotification.\n", object_instance); debug_printf(
"Analog-Input[%d]: Send AckNotification.\n", object_instance);
characterstring_init_ansi(&msgText, "AckNotification"); characterstring_init_ansi(&msgText, "AckNotification");
/* Notify Type */ /* Notify Type */
event_data.notifyType = NOTIFY_ACK_NOTIFICATION; event_data.notifyType = NOTIFY_ACK_NOTIFICATION;
@@ -1012,9 +1031,9 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal > CurrentAI->High_Limit) && if ((PresentVal > CurrentAI->High_Limit) &&
((CurrentAI->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) == ((CurrentAI->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ==
EVENT_HIGH_LIMIT_ENABLE) && EVENT_HIGH_LIMIT_ENABLE) &&
((CurrentAI->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) == ((CurrentAI->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ==
EVENT_ENABLE_TO_OFFNORMAL)) { EVENT_ENABLE_TO_OFFNORMAL)) {
if (!CurrentAI->Remaining_Time_Delay) if (!CurrentAI->Remaining_Time_Delay)
CurrentAI->Event_State = EVENT_STATE_HIGH_LIMIT; CurrentAI->Event_State = EVENT_STATE_HIGH_LIMIT;
else else
@@ -1030,9 +1049,9 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal < CurrentAI->Low_Limit) && if ((PresentVal < CurrentAI->Low_Limit) &&
((CurrentAI->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) == ((CurrentAI->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ==
EVENT_LOW_LIMIT_ENABLE) && EVENT_LOW_LIMIT_ENABLE) &&
((CurrentAI->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) == ((CurrentAI->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ==
EVENT_ENABLE_TO_OFFNORMAL)) { EVENT_ENABLE_TO_OFFNORMAL)) {
if (!CurrentAI->Remaining_Time_Delay) if (!CurrentAI->Remaining_Time_Delay)
CurrentAI->Event_State = EVENT_STATE_LOW_LIMIT; CurrentAI->Event_State = EVENT_STATE_LOW_LIMIT;
else else
@@ -1052,11 +1071,11 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
property, and (c) the TO-NORMAL flag must be set in the property, and (c) the TO-NORMAL flag must be set in the
Event_Enable property. */ Event_Enable property. */
if ((PresentVal < if ((PresentVal <
CurrentAI->High_Limit - CurrentAI->Deadband) && CurrentAI->High_Limit - CurrentAI->Deadband) &&
((CurrentAI->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) == ((CurrentAI->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ==
EVENT_HIGH_LIMIT_ENABLE) && EVENT_HIGH_LIMIT_ENABLE) &&
((CurrentAI->Event_Enable & EVENT_ENABLE_TO_NORMAL) == ((CurrentAI->Event_Enable & EVENT_ENABLE_TO_NORMAL) ==
EVENT_ENABLE_TO_NORMAL)) { EVENT_ENABLE_TO_NORMAL)) {
if (!CurrentAI->Remaining_Time_Delay) if (!CurrentAI->Remaining_Time_Delay)
CurrentAI->Event_State = EVENT_STATE_NORMAL; CurrentAI->Event_State = EVENT_STATE_NORMAL;
else else
@@ -1078,9 +1097,9 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal > CurrentAI->Low_Limit + CurrentAI->Deadband) && if ((PresentVal > CurrentAI->Low_Limit + CurrentAI->Deadband) &&
((CurrentAI->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) == ((CurrentAI->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ==
EVENT_LOW_LIMIT_ENABLE) && EVENT_LOW_LIMIT_ENABLE) &&
((CurrentAI->Event_Enable & EVENT_ENABLE_TO_NORMAL) == ((CurrentAI->Event_Enable & EVENT_ENABLE_TO_NORMAL) ==
EVENT_ENABLE_TO_NORMAL)) { EVENT_ENABLE_TO_NORMAL)) {
if (!CurrentAI->Remaining_Time_Delay) if (!CurrentAI->Remaining_Time_Delay)
CurrentAI->Event_State = EVENT_STATE_NORMAL; CurrentAI->Event_State = EVENT_STATE_NORMAL;
else else
@@ -1125,7 +1144,8 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
ExceededLimit = 0; ExceededLimit = 0;
break; break;
} /* switch (ToState) */ } /* switch (ToState) */
PRINTF("Analog-Input[%d]: Event_State goes from %s to %s.\n", debug_printf(
"Analog-Input[%d]: Event_State goes from %s to %s.\n",
object_instance, bactext_event_state_name(FromState), object_instance, bactext_event_state_name(FromState),
bactext_event_state_name(ToState)); bactext_event_state_name(ToState));
/* Notify Type */ /* Notify Type */
@@ -1142,7 +1162,8 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
/* Time Stamp */ /* Time Stamp */
event_data.timeStamp.tag = TIME_STAMP_DATETIME; event_data.timeStamp.tag = TIME_STAMP_DATETIME;
if (event_data.notifyType != NOTIFY_ACK_NOTIFICATION) { if (event_data.notifyType != NOTIFY_ACK_NOTIFICATION) {
datetime_local(&event_data.timeStamp.value.dateTime.date, datetime_local(
&event_data.timeStamp.value.dateTime.date,
&event_data.timeStamp.value.dateTime.time, NULL, NULL); &event_data.timeStamp.value.dateTime.time, NULL, NULL);
/* fill Event_Time_Stamps */ /* fill Event_Time_Stamps */
switch (ToState) { switch (ToState) {
@@ -1170,15 +1191,18 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
switch (ToState) { switch (ToState) {
case EVENT_STATE_HIGH_LIMIT: case EVENT_STATE_HIGH_LIMIT:
case EVENT_STATE_LOW_LIMIT: case EVENT_STATE_LOW_LIMIT:
datetime_copy(&event_data.timeStamp.value.dateTime, datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAI->Event_Time_Stamps[TRANSITION_TO_OFFNORMAL]); &CurrentAI->Event_Time_Stamps[TRANSITION_TO_OFFNORMAL]);
break; break;
case EVENT_STATE_FAULT: case EVENT_STATE_FAULT:
datetime_copy(&event_data.timeStamp.value.dateTime, datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAI->Event_Time_Stamps[TRANSITION_TO_FAULT]); &CurrentAI->Event_Time_Stamps[TRANSITION_TO_FAULT]);
break; break;
case EVENT_STATE_NORMAL: case EVENT_STATE_NORMAL:
datetime_copy(&event_data.timeStamp.value.dateTime, datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAI->Event_Time_Stamps[TRANSITION_TO_NORMAL]); &CurrentAI->Event_Time_Stamps[TRANSITION_TO_NORMAL]);
break; break;
default: default:
@@ -1227,8 +1251,9 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
ExceededLimit; ExceededLimit;
} }
/* add data from notification class */ /* add data from notification class */
PRINTF("Analog-Input[%d]: Notification Class[%d]-%s " debug_printf(
"%u/%u/%u-%u:%u:%u.%u!\n", "Analog-Input[%d]: Notification Class[%d]-%s "
"%u/%u/%u-%u:%u:%u.%u!\n",
object_instance, event_data.notificationClass, object_instance, event_data.notificationClass,
bactext_event_type_name(event_data.eventType), bactext_event_type_name(event_data.eventType),
(unsigned)event_data.timeStamp.value.dateTime.date.year, (unsigned)event_data.timeStamp.value.dateTime.date.year,
@@ -1242,7 +1267,7 @@ void Analog_Input_Intrinsic_Reporting(uint32_t object_instance)
/* Ack required */ /* Ack required */
if ((event_data.notifyType != NOTIFY_ACK_NOTIFICATION) && if ((event_data.notifyType != NOTIFY_ACK_NOTIFICATION) &&
(event_data.ackRequired == true)) { (event_data.ackRequired == true)) {
PRINTF("Analog-Input[%d]: Ack Required!\n", object_instance); debug_printf("Analog-Input[%d]: Ack Required!\n", object_instance);
switch (event_data.toState) { switch (event_data.toState) {
case EVENT_STATE_OFFNORMAL: case EVENT_STATE_OFFNORMAL:
case EVENT_STATE_HIGH_LIMIT: case EVENT_STATE_HIGH_LIMIT:
@@ -1299,14 +1324,14 @@ int Analog_Input_Event_Information(
(TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */ (TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */
IsNotAckedTransitions = IsNotAckedTransitions =
(pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked == (pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked ==
false) | false) |
(pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked == (pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked ==
false) | false) |
(pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked == (pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked ==
false); false);
} else } else {
return -1; /* end of list */ return -1; /* end of list */
}
if ((IsActiveEvent) || (IsNotAckedTransitions)) { if ((IsActiveEvent) || (IsNotAckedTransitions)) {
/* Object Identifier */ /* Object Identifier */
getevent_data->objectIdentifier.type = Object_Type; getevent_data->objectIdentifier.type = Object_Type;
@@ -1316,14 +1341,14 @@ int Analog_Input_Event_Information(
getevent_data->eventState = pObject->Event_State; getevent_data->eventState = pObject->Event_State;
/* Acknowledged Transitions */ /* Acknowledged Transitions */
bitstring_init(&getevent_data->acknowledgedTransitions); bitstring_init(&getevent_data->acknowledgedTransitions);
bitstring_set_bit(&getevent_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_OFFNORMAL, &getevent_data->acknowledgedTransitions, TRANSITION_TO_OFFNORMAL,
pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
bitstring_set_bit(&getevent_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_FAULT, &getevent_data->acknowledgedTransitions, TRANSITION_TO_FAULT,
pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
bitstring_set_bit(&getevent_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_NORMAL, &getevent_data->acknowledgedTransitions, TRANSITION_TO_NORMAL,
pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
/* Event Time Stamps */ /* Event Time Stamps */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@@ -1335,11 +1360,14 @@ int Analog_Input_Event_Information(
getevent_data->notifyType = pObject->Notify_Type; getevent_data->notifyType = pObject->Notify_Type;
/* Event Enable */ /* Event Enable */
bitstring_init(&getevent_data->eventEnable); bitstring_init(&getevent_data->eventEnable);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
&getevent_data->eventEnable, TRANSITION_TO_OFFNORMAL,
(pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true : false); (pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true : false);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_FAULT, bitstring_set_bit(
&getevent_data->eventEnable, TRANSITION_TO_FAULT,
(pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true : false); (pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true : false);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_NORMAL, bitstring_set_bit(
&getevent_data->eventEnable, TRANSITION_TO_NORMAL,
(pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true : false); (pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true : false);
/* Event Priorities */ /* Event Priorities */
Notification_Class_Get_Priorities( Notification_Class_Get_Priorities(
@@ -1390,8 +1418,8 @@ int Analog_Input_Alarm_Ack(
/* Send ack notification */ /* Send ack notification */
CurrentAI->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked = CurrentAI->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAI->Event_State) { alarmack_data->eventStateAcked == CurrentAI->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1416,8 +1444,8 @@ int Analog_Input_Alarm_Ack(
/* Send ack notification */ /* Send ack notification */
CurrentAI->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked = CurrentAI->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAI->Event_State) { alarmack_data->eventStateAcked == CurrentAI->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1442,8 +1470,8 @@ int Analog_Input_Alarm_Ack(
/* Send ack notification */ /* Send ack notification */
CurrentAI->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked = CurrentAI->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAI->Event_State) { alarmack_data->eventStateAcked == CurrentAI->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1487,14 +1515,15 @@ int Analog_Input_Alarm_Summary(
getalarm_data->alarmState = pObject->Event_State; getalarm_data->alarmState = pObject->Event_State;
/* Acknowledged Transitions */ /* Acknowledged Transitions */
bitstring_init(&getalarm_data->acknowledgedTransitions); bitstring_init(&getalarm_data->acknowledgedTransitions);
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, bitstring_set_bit(
&getalarm_data->acknowledgedTransitions,
TRANSITION_TO_OFFNORMAL, TRANSITION_TO_OFFNORMAL,
pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_FAULT, &getalarm_data->acknowledgedTransitions, TRANSITION_TO_FAULT,
pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_NORMAL, &getalarm_data->acknowledgedTransitions, TRANSITION_TO_NORMAL,
pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
return 1; /* active alarm */ return 1; /* active alarm */
} else { } else {
@@ -1620,7 +1649,6 @@ void Analog_Input_Init(void)
/* Set handler for AcknowledgeAlarm function */ /* Set handler for AcknowledgeAlarm function */
handler_alarm_ack_set(Object_Type, Analog_Input_Alarm_Ack); handler_alarm_ack_set(Object_Type, Analog_Input_Alarm_Ack);
/* Set handler for GetAlarmSummary Service */ /* Set handler for GetAlarmSummary Service */
handler_get_alarm_summary_set( handler_get_alarm_summary_set(Object_Type, Analog_Input_Alarm_Summary);
Object_Type, Analog_Input_Alarm_Summary);
#endif #endif
} }
src/bacnet/basic/object/av.c
+173 -136
View File
@@ -34,21 +34,28 @@ static OS_Keylist Object_List;
/* common object type */ /* common object type */
static const BACNET_OBJECT_TYPE Object_Type = OBJECT_ANALOG_VALUE; static const BACNET_OBJECT_TYPE Object_Type = OBJECT_ANALOG_VALUE;
/* clang-format off */
/* These three arrays are used by the ReadPropertyMultiple handler */ /* These three arrays are used by the ReadPropertyMultiple handler */
static const int Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER, static const int Analog_Value_Properties_Required[] = {
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_OBJECT_IDENTIFIER, PROP_OBJECT_NAME, PROP_OBJECT_TYPE,
PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 }; PROP_PRESENT_VALUE, PROP_STATUS_FLAGS, PROP_EVENT_STATE,
PROP_OUT_OF_SERVICE, PROP_UNITS, -1
};
static const int Analog_Value_Properties_Optional[] = { PROP_DESCRIPTION, static const int Analog_Value_Properties_Optional[] = {
PROP_RELIABILITY, PROP_COV_INCREMENT, PROP_DESCRIPTION, PROP_RELIABILITY, PROP_COV_INCREMENT,
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT, PROP_LOW_LIMIT, PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT,
PROP_DEADBAND, PROP_LIMIT_ENABLE, PROP_EVENT_ENABLE, PROP_ACKED_TRANSITIONS, PROP_LOW_LIMIT, PROP_DEADBAND, PROP_LIMIT_ENABLE, PROP_EVENT_ENABLE,
PROP_NOTIFY_TYPE, PROP_EVENT_TIME_STAMPS, PROP_ACKED_TRANSITIONS, PROP_NOTIFY_TYPE, PROP_EVENT_TIME_STAMPS,
#endif #endif
-1 }; -1
};
static const int Analog_Value_Properties_Proprietary[] = { -1 }; static const int Analog_Value_Properties_Proprietary[] = {
-1
};
/* clang-format on */
/** /**
* Initialize the pointers for the required, the optional and the properitary * Initialize the pointers for the required, the optional and the properitary
@@ -156,7 +163,7 @@ unsigned Analog_Value_Instance_To_Index(uint32_t object_instance)
*/ */
float Analog_Value_Present_Value(uint32_t object_instance) float Analog_Value_Present_Value(uint32_t object_instance)
{ {
float value = 0; float value = 0.0f;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
pObject = Analog_Value_Object(object_instance); pObject = Analog_Value_Object(object_instance);
@@ -177,8 +184,8 @@ float Analog_Value_Present_Value(uint32_t object_instance)
* @param index Object index * @param index Object index
* @param value Given present value. * @param value Given present value.
*/ */
static void Analog_Value_COV_Detect( static void
struct analog_value_descr *pObject, float value) Analog_Value_COV_Detect(struct analog_value_descr *pObject, float value)
{ {
float prior_value = 0.0f; float prior_value = 0.0f;
float cov_increment = 0.0f; float cov_increment = 0.0f;
@@ -246,10 +253,11 @@ bool Analog_Value_Object_Name(
pObject = Analog_Value_Object(object_instance); pObject = Analog_Value_Object(object_instance);
if (pObject) { if (pObject) {
if (pObject->Object_Name) { if (pObject->Object_Name) {
status = characterstring_init_ansi(object_name, status =
pObject->Object_Name); characterstring_init_ansi(object_name, pObject->Object_Name);
} else { } else {
snprintf(text_string, sizeof(text_string), "ANALOG VALUE %u", snprintf(
text_string, sizeof(text_string), "ANALOG VALUE %u",
object_instance); object_instance);
status = characterstring_init_ansi(object_name, text_string); status = characterstring_init_ansi(object_name, text_string);
} }
@@ -342,9 +350,8 @@ bool Analog_Value_Description_Set(uint32_t object_instance, char *new_name)
* @brief For a given object instance-number, returns the reliability * @brief For a given object instance-number, returns the reliability
* @param object_instance - object-instance number of the object * @param object_instance - object-instance number of the object
* @return reliability property value * @return reliability property value
*/ */
BACNET_RELIABILITY Analog_Value_Reliability( BACNET_RELIABILITY Analog_Value_Reliability(uint32_t object_instance)
uint32_t object_instance)
{ {
BACNET_RELIABILITY value = RELIABILITY_NO_FAULT_DETECTED; BACNET_RELIABILITY value = RELIABILITY_NO_FAULT_DETECTED;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
@@ -364,8 +371,7 @@ BACNET_RELIABILITY Analog_Value_Reliability(
* @return true if the reliability property value was set * @return true if the reliability property value was set
*/ */
bool Analog_Value_Reliability_Set( bool Analog_Value_Reliability_Set(
uint32_t object_instance, uint32_t object_instance, BACNET_RELIABILITY value)
BACNET_RELIABILITY value)
{ {
bool status = false; bool status = false;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
@@ -377,7 +383,6 @@ bool Analog_Value_Reliability_Set(
} }
return status; return status;
} }
/** /**
@@ -441,8 +446,9 @@ bool Analog_Value_Encode_Value_List(
} }
out_of_service = pObject->Out_Of_Service; out_of_service = pObject->Out_Of_Service;
present_value = pObject->Present_Value; present_value = pObject->Present_Value;
status = cov_value_list_encode_real(value_list, present_value, status = cov_value_list_encode_real(
in_alarm, fault, overridden, out_of_service); value_list, present_value, in_alarm, fault, overridden,
out_of_service);
} }
return status; return status;
@@ -455,7 +461,7 @@ bool Analog_Value_Encode_Value_List(
*/ */
float Analog_Value_COV_Increment(uint32_t object_instance) float Analog_Value_COV_Increment(uint32_t object_instance)
{ {
float value = 0; float value = 0.0f;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
pObject = Analog_Value_Object(object_instance); pObject = Analog_Value_Object(object_instance);
@@ -470,7 +476,7 @@ float Analog_Value_COV_Increment(uint32_t object_instance)
* @brief For a given object instance-number, sets the COV-Increment value * @brief For a given object instance-number, sets the COV-Increment value
* @param object_instance - object-instance number of the object * @param object_instance - object-instance number of the object
* @param value - COV-Increment value * @param value - COV-Increment value
*/ */
void Analog_Value_COV_Increment_Set(uint32_t object_instance, float value) void Analog_Value_COV_Increment_Set(uint32_t object_instance, float value)
{ {
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
@@ -491,15 +497,15 @@ void Analog_Value_COV_Increment_Set(uint32_t object_instance, float value)
*/ */
uint16_t Analog_Value_Units(uint32_t object_instance) uint16_t Analog_Value_Units(uint32_t object_instance)
{ {
uint16_t units = UNITS_NO_UNITS; uint16_t units = UNITS_NO_UNITS;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
pObject = Analog_Value_Object(object_instance); pObject = Analog_Value_Object(object_instance);
if (pObject) { if (pObject) {
units = pObject->Units; units = pObject->Units;
} }
return units; return units;
} }
/** /**
@@ -512,16 +518,16 @@ uint16_t Analog_Value_Units(uint32_t object_instance)
*/ */
bool Analog_Value_Units_Set(uint32_t object_instance, uint16_t units) bool Analog_Value_Units_Set(uint32_t object_instance, uint16_t units)
{ {
bool status = false; bool status = false;
struct analog_value_descr *pObject; struct analog_value_descr *pObject;
pObject = Analog_Value_Object(object_instance); pObject = Analog_Value_Object(object_instance);
if (pObject) { if (pObject) {
pObject->Units = units; pObject->Units = units;
status = true; status = true;
} }
return status; return status;
} }
/** /**
@@ -544,7 +550,8 @@ bool Analog_Value_Out_Of_Service(uint32_t object_instance)
} }
/** /**
* @brief For a given object instance-number, sets the out-of-service property value * @brief For a given object instance-number, sets the out-of-service property
* value
* @param object_instance - object-instance number of the object * @param object_instance - object-instance number of the object
* @param value - boolean out-of-service value * @param value - boolean out-of-service value
* @return true if the out-of-service property value was set * @return true if the out-of-service property value was set
@@ -660,8 +667,7 @@ int Analog_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
} }
break; break;
case PROP_OBJECT_TYPE: case PROP_OBJECT_TYPE:
apdu_len = apdu_len = encode_application_enumerated(&apdu[0], Object_Type);
encode_application_enumerated(&apdu[0], Object_Type);
break; break;
case PROP_PRESENT_VALUE: case PROP_PRESENT_VALUE:
real_value = Analog_Value_Present_Value(rpdata->object_instance); real_value = Analog_Value_Present_Value(rpdata->object_instance);
@@ -669,12 +675,15 @@ int Analog_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
break; break;
case PROP_STATUS_FLAGS: case PROP_STATUS_FLAGS:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, bitstring_set_bit(
&bit_string, STATUS_FLAG_IN_ALARM,
(CurrentAV->Event_State != EVENT_STATE_NORMAL)); (CurrentAV->Event_State != EVENT_STATE_NORMAL));
bitstring_set_bit(&bit_string, STATUS_FLAG_FAULT, bitstring_set_bit(
&bit_string, STATUS_FLAG_FAULT,
(CurrentAV->Reliability != RELIABILITY_NO_FAULT_DETECTED)); (CurrentAV->Reliability != RELIABILITY_NO_FAULT_DETECTED));
bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false); bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false);
bitstring_set_bit(&bit_string, STATUS_FLAG_OUT_OF_SERVICE, bitstring_set_bit(
&bit_string, STATUS_FLAG_OUT_OF_SERVICE,
CurrentAV->Out_Of_Service); CurrentAV->Out_Of_Service);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
@@ -687,15 +696,16 @@ int Analog_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
encode_application_enumerated(&apdu[0], CurrentAV->Reliability); encode_application_enumerated(&apdu[0], CurrentAV->Reliability);
break; break;
case PROP_OUT_OF_SERVICE: case PROP_OUT_OF_SERVICE:
apdu_len = encode_application_boolean(&apdu[0], apdu_len =
CurrentAV->Out_Of_Service); encode_application_boolean(&apdu[0], CurrentAV->Out_Of_Service);
break; break;
case PROP_UNITS: case PROP_UNITS:
apdu_len = apdu_len =
encode_application_enumerated(&apdu[0], CurrentAV->Units); encode_application_enumerated(&apdu[0], CurrentAV->Units);
break; break;
case PROP_DESCRIPTION: case PROP_DESCRIPTION:
characterstring_init_ansi(&char_string, characterstring_init_ansi(
&char_string,
Analog_Value_Description(rpdata->object_instance)); Analog_Value_Description(rpdata->object_instance));
apdu_len = apdu_len =
encode_application_character_string(&apdu[0], &char_string); encode_application_character_string(&apdu[0], &char_string);
@@ -724,34 +734,42 @@ int Analog_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
break; break;
case PROP_LIMIT_ENABLE: case PROP_LIMIT_ENABLE:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, 0, bitstring_set_bit(
&bit_string, 0,
(CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ? true (CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ? true
: false); : false);
bitstring_set_bit(&bit_string, 1, bitstring_set_bit(
&bit_string, 1,
(CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ? true (CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ? true
: false); : false);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_EVENT_ENABLE: case PROP_EVENT_ENABLE:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_OFFNORMAL,
(CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true (CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true
: false); : false);
bitstring_set_bit(&bit_string, TRANSITION_TO_FAULT, bitstring_set_bit(
&bit_string, TRANSITION_TO_FAULT,
(CurrentAV->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true (CurrentAV->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true
: false); : false);
bitstring_set_bit(&bit_string, TRANSITION_TO_NORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_NORMAL,
(CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true (CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true
: false); : false);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
case PROP_ACKED_TRANSITIONS: case PROP_ACKED_TRANSITIONS:
bitstring_init(&bit_string); bitstring_init(&bit_string);
bitstring_set_bit(&bit_string, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_OFFNORMAL,
CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked); CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
bitstring_set_bit(&bit_string, TRANSITION_TO_FAULT, bitstring_set_bit(
&bit_string, TRANSITION_TO_FAULT,
CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked); CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
bitstring_set_bit(&bit_string, TRANSITION_TO_NORMAL, bitstring_set_bit(
&bit_string, TRANSITION_TO_NORMAL,
CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked); CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
apdu_len = encode_application_bitstring(&apdu[0], &bit_string); apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
break; break;
@@ -760,8 +778,9 @@ int Analog_Value_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
&apdu[0], CurrentAV->Notify_Type ? NOTIFY_EVENT : NOTIFY_ALARM); &apdu[0], CurrentAV->Notify_Type ? NOTIFY_EVENT : NOTIFY_ALARM);
break; break;
case PROP_EVENT_TIME_STAMPS: case PROP_EVENT_TIME_STAMPS:
apdu_len = bacnet_array_encode(rpdata->object_instance, apdu_len = bacnet_array_encode(
rpdata->array_index, Analog_Value_Event_Time_Stamps_Encode, rpdata->object_instance, rpdata->array_index,
Analog_Value_Event_Time_Stamps_Encode,
MAX_BACNET_EVENT_TRANSITION, apdu, apdu_size); MAX_BACNET_EVENT_TRANSITION, apdu, apdu_size);
if (apdu_len == BACNET_STATUS_ABORT) { if (apdu_len == BACNET_STATUS_ABORT) {
rpdata->error_code = rpdata->error_code =
@@ -843,15 +862,16 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
algorithm and may not be used for other purposes in any algorithm and may not be used for other purposes in any
object. */ object. */
if (Analog_Value_Present_Value_Set(wp_data->object_instance, if (wp_data->priority == 6) {
value.type.Real, wp_data->priority)) {
status = true;
} else if (wp_data->priority == 6) {
/* Command priority 6 is reserved for use by Minimum On/Off /* Command priority 6 is reserved for use by Minimum On/Off
algorithm and may not be used for other purposes in any algorithm and may not be used for other purposes in any
object. */ object. */
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED; wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
} else if (Analog_Value_Present_Value_Set(
wp_data->object_instance, value.type.Real,
wp_data->priority)) {
status = true;
} else { } else {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; wp_data->error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
@@ -975,10 +995,10 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
#endif #endif
default: default:
if (property_lists_member( if (property_lists_member(
Analog_Value_Properties_Required, Analog_Value_Properties_Required,
Analog_Value_Properties_Optional, Analog_Value_Properties_Optional,
Analog_Value_Properties_Proprietary, Analog_Value_Properties_Proprietary,
wp_data->object_property)) { wp_data->object_property)) {
wp_data->error_class = ERROR_CLASS_PROPERTY; wp_data->error_class = ERROR_CLASS_PROPERTY;
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED; wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
} else { } else {
@@ -998,11 +1018,11 @@ bool Analog_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
void Analog_Value_Intrinsic_Reporting(uint32_t object_instance) void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
{ {
#if defined(INTRINSIC_REPORTING) #if defined(INTRINSIC_REPORTING)
BACNET_EVENT_NOTIFICATION_DATA event_data; BACNET_EVENT_NOTIFICATION_DATA event_data = { 0 };
BACNET_CHARACTER_STRING msgText; BACNET_CHARACTER_STRING msgText = { 0 };
ANALOG_VALUE_DESCR *CurrentAV; ANALOG_VALUE_DESCR *CurrentAV = NULL;
uint8_t FromState = 0; uint8_t FromState = 0;
uint8_t ToState; uint8_t ToState = 0;
float ExceededLimit = 0.0f; float ExceededLimit = 0.0f;
float PresentVal = 0.0f; float PresentVal = 0.0f;
bool SendNotify = false; bool SendNotify = false;
@@ -1020,13 +1040,9 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
CurrentAV->Ack_notify_data.bSendAckNotify = false; CurrentAV->Ack_notify_data.bSendAckNotify = false;
/* copy toState */ /* copy toState */
ToState = CurrentAV->Ack_notify_data.EventState; ToState = CurrentAV->Ack_notify_data.EventState;
debug_printf(
#if PRINT_ENABLED "Send Acknotification for (%s,%u).\n",
fprintf(stderr, "Send Acknotification for (%s,%u).\n", bactext_object_type_name(Object_Type), (unsigned)object_instance);
bactext_object_type_name(Object_Type),
(unsigned)object_instance);
#endif /* PRINT_ENABLED */
characterstring_init_ansi(&msgText, "AckNotification"); characterstring_init_ansi(&msgText, "AckNotification");
/* Notify Type */ /* Notify Type */
@@ -1049,9 +1065,9 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal > CurrentAV->High_Limit) && if ((PresentVal > CurrentAV->High_Limit) &&
((CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) == ((CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ==
EVENT_HIGH_LIMIT_ENABLE) && EVENT_HIGH_LIMIT_ENABLE) &&
((CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) == ((CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ==
EVENT_ENABLE_TO_OFFNORMAL)) { EVENT_ENABLE_TO_OFFNORMAL)) {
if (!CurrentAV->Remaining_Time_Delay) if (!CurrentAV->Remaining_Time_Delay)
CurrentAV->Event_State = EVENT_STATE_HIGH_LIMIT; CurrentAV->Event_State = EVENT_STATE_HIGH_LIMIT;
else else
@@ -1068,9 +1084,9 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal < CurrentAV->Low_Limit) && if ((PresentVal < CurrentAV->Low_Limit) &&
((CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) == ((CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ==
EVENT_LOW_LIMIT_ENABLE) && EVENT_LOW_LIMIT_ENABLE) &&
((CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) == ((CurrentAV->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ==
EVENT_ENABLE_TO_OFFNORMAL)) { EVENT_ENABLE_TO_OFFNORMAL)) {
if (!CurrentAV->Remaining_Time_Delay) if (!CurrentAV->Remaining_Time_Delay)
CurrentAV->Event_State = EVENT_STATE_LOW_LIMIT; CurrentAV->Event_State = EVENT_STATE_LOW_LIMIT;
else else
@@ -1091,11 +1107,11 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
property, and (c) the TO-NORMAL flag must be set in the property, and (c) the TO-NORMAL flag must be set in the
Event_Enable property. */ Event_Enable property. */
if ((PresentVal < if ((PresentVal <
CurrentAV->High_Limit - CurrentAV->Deadband) && CurrentAV->High_Limit - CurrentAV->Deadband) &&
((CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) == ((CurrentAV->Limit_Enable & EVENT_HIGH_LIMIT_ENABLE) ==
EVENT_HIGH_LIMIT_ENABLE) && EVENT_HIGH_LIMIT_ENABLE) &&
((CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) == ((CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) ==
EVENT_ENABLE_TO_NORMAL)) { EVENT_ENABLE_TO_NORMAL)) {
if (!CurrentAV->Remaining_Time_Delay) if (!CurrentAV->Remaining_Time_Delay)
CurrentAV->Event_State = EVENT_STATE_NORMAL; CurrentAV->Event_State = EVENT_STATE_NORMAL;
else else
@@ -1118,9 +1134,9 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
property. */ property. */
if ((PresentVal > CurrentAV->Low_Limit + CurrentAV->Deadband) && if ((PresentVal > CurrentAV->Low_Limit + CurrentAV->Deadband) &&
((CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) == ((CurrentAV->Limit_Enable & EVENT_LOW_LIMIT_ENABLE) ==
EVENT_LOW_LIMIT_ENABLE) && EVENT_LOW_LIMIT_ENABLE) &&
((CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) == ((CurrentAV->Event_Enable & EVENT_ENABLE_TO_NORMAL) ==
EVENT_ENABLE_TO_NORMAL)) { EVENT_ENABLE_TO_NORMAL)) {
if (!CurrentAV->Remaining_Time_Delay) if (!CurrentAV->Remaining_Time_Delay)
CurrentAV->Event_State = EVENT_STATE_NORMAL; CurrentAV->Event_State = EVENT_STATE_NORMAL;
else else
@@ -1169,14 +1185,10 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
ExceededLimit = 0; ExceededLimit = 0;
break; break;
} /* switch (ToState) */ } /* switch (ToState) */
debug_printf("Event_State for (%s,%u) goes from %s to %s.\n",
#if PRINT_ENABLED
fprintf(stderr, "Event_State for (%s,%u) goes from %s to %s.\n",
bactext_object_type_name(Object_Type), bactext_object_type_name(Object_Type),
(unsigned)object_instance, bactext_event_state_name(FromState), (unsigned)object_instance, bactext_event_state_name(FromState),
bactext_event_state_name(ToState)); bactext_event_state_name(ToState));
#endif /* PRINT_ENABLED */
/* Notify Type */ /* Notify Type */
event_data.notifyType = CurrentAV->Notify_Type; event_data.notifyType = CurrentAV->Notify_Type;
@@ -1184,18 +1196,16 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
SendNotify = true; SendNotify = true;
} }
} }
if (SendNotify) { if (SendNotify) {
/* Event Object Identifier */ /* Event Object Identifier */
event_data.eventObjectIdentifier.type = Object_Type; event_data.eventObjectIdentifier.type = Object_Type;
event_data.eventObjectIdentifier.instance = object_instance; event_data.eventObjectIdentifier.instance = object_instance;
/* Time Stamp */ /* Time Stamp */
event_data.timeStamp.tag = TIME_STAMP_DATETIME; event_data.timeStamp.tag = TIME_STAMP_DATETIME;
datetime_local(&event_data.timeStamp.value.dateTime.date,
&event_data.timeStamp.value.dateTime.time, NULL, NULL);
if (event_data.notifyType != NOTIFY_ACK_NOTIFICATION) { if (event_data.notifyType != NOTIFY_ACK_NOTIFICATION) {
datetime_local(
&event_data.timeStamp.value.dateTime.date,
&event_data.timeStamp.value.dateTime.time, NULL, NULL);
/* fill Event_Time_Stamps */ /* fill Event_Time_Stamps */
switch (ToState) { switch (ToState) {
case EVENT_STATE_HIGH_LIMIT: case EVENT_STATE_HIGH_LIMIT:
@@ -1216,8 +1226,29 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
default: default:
break; break;
} }
} else {
/* fill event_data timeStamp */
switch (ToState) {
case EVENT_STATE_HIGH_LIMIT:
case EVENT_STATE_LOW_LIMIT:
datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAV->Event_Time_Stamps[TRANSITION_TO_OFFNORMAL]);
break;
case EVENT_STATE_FAULT:
datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAV->Event_Time_Stamps[TRANSITION_TO_FAULT]);
break;
case EVENT_STATE_NORMAL:
datetime_copy(
&event_data.timeStamp.value.dateTime,
&CurrentAV->Event_Time_Stamps[TRANSITION_TO_NORMAL]);
break;
default:
break;
}
} }
/* Notification Class */ /* Notification Class */
event_data.notificationClass = CurrentAV->Notification_Class; event_data.notificationClass = CurrentAV->Notification_Class;
@@ -1267,11 +1298,24 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
} }
/* add data from notification class */ /* add data from notification class */
debug_printf(
"Analog-Value[%d]: Notification Class[%d]-%s "
"%u/%u/%u-%u:%u:%u.%u!\n",
object_instance, event_data.notificationClass,
bactext_event_type_name(event_data.eventType),
(unsigned)event_data.timeStamp.value.dateTime.date.year,
(unsigned)event_data.timeStamp.value.dateTime.date.month,
(unsigned)event_data.timeStamp.value.dateTime.date.day,
(unsigned)event_data.timeStamp.value.dateTime.time.hour,
(unsigned)event_data.timeStamp.value.dateTime.time.min,
(unsigned)event_data.timeStamp.value.dateTime.time.sec,
(unsigned)event_data.timeStamp.value.dateTime.time.hundredths);
Notification_Class_common_reporting_function(&event_data); Notification_Class_common_reporting_function(&event_data);
/* Ack required */ /* Ack required */
if ((event_data.notifyType != NOTIFY_ACK_NOTIFICATION) && if ((event_data.notifyType != NOTIFY_ACK_NOTIFICATION) &&
(event_data.ackRequired == true)) { (event_data.ackRequired == true)) {
debug_printf("Analog-Value[%d]: Ack Required!\n", object_instance);
switch (event_data.toState) { switch (event_data.toState) {
case EVENT_STATE_OFFNORMAL: case EVENT_STATE_OFFNORMAL:
case EVENT_STATE_HIGH_LIMIT: case EVENT_STATE_HIGH_LIMIT:
@@ -1281,21 +1325,18 @@ void Analog_Value_Intrinsic_Reporting(uint32_t object_instance)
CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL] CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL]
.Time_Stamp = event_data.timeStamp.value.dateTime; .Time_Stamp = event_data.timeStamp.value.dateTime;
break; break;
case EVENT_STATE_FAULT: case EVENT_STATE_FAULT:
CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked = CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked =
false; false;
CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT] CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT]
.Time_Stamp = event_data.timeStamp.value.dateTime; .Time_Stamp = event_data.timeStamp.value.dateTime;
break; break;
case EVENT_STATE_NORMAL: case EVENT_STATE_NORMAL:
CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL] CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL]
.bIsAcked = false; .bIsAcked = false;
CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL] CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL]
.Time_Stamp = event_data.timeStamp.value.dateTime; .Time_Stamp = event_data.timeStamp.value.dateTime;
break; break;
default: /* shouldn't happen */ default: /* shouldn't happen */
break; break;
} }
@@ -1329,11 +1370,12 @@ int Analog_Value_Event_Information(
/* Acked_Transitions property, which has at least one of the bits /* Acked_Transitions property, which has at least one of the bits
(TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */ (TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */
IsNotAckedTransitions = IsNotAckedTransitions =
(pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked == false) | (pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked ==
false) |
(pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked == (pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked ==
false) | false) |
(pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked == (pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked ==
false); false);
} else { } else {
return -1; /* end of list */ return -1; /* end of list */
} }
@@ -1346,15 +1388,14 @@ int Analog_Value_Event_Information(
getevent_data->eventState = pObject->Event_State; getevent_data->eventState = pObject->Event_State;
/* Acknowledged Transitions */ /* Acknowledged Transitions */
bitstring_init(&getevent_data->acknowledgedTransitions); bitstring_init(&getevent_data->acknowledgedTransitions);
bitstring_set_bit(&getevent_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_OFFNORMAL, &getevent_data->acknowledgedTransitions, TRANSITION_TO_OFFNORMAL,
pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL] pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
.bIsAcked); bitstring_set_bit(
bitstring_set_bit(&getevent_data->acknowledgedTransitions, &getevent_data->acknowledgedTransitions, TRANSITION_TO_FAULT,
TRANSITION_TO_FAULT,
pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
bitstring_set_bit(&getevent_data->acknowledgedTransitions, bitstring_set_bit(
TRANSITION_TO_NORMAL, &getevent_data->acknowledgedTransitions, TRANSITION_TO_NORMAL,
pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked); pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
/* Event Time Stamps */ /* Event Time Stamps */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@@ -1366,15 +1407,15 @@ int Analog_Value_Event_Information(
getevent_data->notifyType = pObject->Notify_Type; getevent_data->notifyType = pObject->Notify_Type;
/* Event Enable */ /* Event Enable */
bitstring_init(&getevent_data->eventEnable); bitstring_init(&getevent_data->eventEnable);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_OFFNORMAL, bitstring_set_bit(
(pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true &getevent_data->eventEnable, TRANSITION_TO_OFFNORMAL,
: false); (pObject->Event_Enable & EVENT_ENABLE_TO_OFFNORMAL) ? true : false);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_FAULT, bitstring_set_bit(
(pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true &getevent_data->eventEnable, TRANSITION_TO_FAULT,
: false); (pObject->Event_Enable & EVENT_ENABLE_TO_FAULT) ? true : false);
bitstring_set_bit(&getevent_data->eventEnable, TRANSITION_TO_NORMAL, bitstring_set_bit(
(pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true &getevent_data->eventEnable, TRANSITION_TO_NORMAL,
: false); (pObject->Event_Enable & EVENT_ENABLE_TO_NORMAL) ? true : false);
/* Event Priorities */ /* Event Priorities */
Notification_Class_Get_Priorities( Notification_Class_Get_Priorities(
pObject->Notification_Class, getevent_data->eventPriorities); pObject->Notification_Class, getevent_data->eventPriorities);
@@ -1421,12 +1462,11 @@ int Analog_Value_Alarm_Ack(
*error_code = ERROR_CODE_INVALID_TIME_STAMP; *error_code = ERROR_CODE_INVALID_TIME_STAMP;
return -1; return -1;
} }
/* Clean transitions flag. */ /* Clean transitions flag. */
CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked = CurrentAV->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAV->Event_State) { alarmack_data->eventStateAcked == CurrentAV->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1451,8 +1491,8 @@ int Analog_Value_Alarm_Ack(
/* Send ack notification */ /* Send ack notification */
CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked = CurrentAV->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAV->Event_State) { alarmack_data->eventStateAcked == CurrentAV->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1477,8 +1517,8 @@ int Analog_Value_Alarm_Ack(
/* Send ack notification */ /* Send ack notification */
CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked = CurrentAV->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked =
true; true;
} else if (alarmack_data->eventStateAcked == } else if (
CurrentAV->Event_State) { alarmack_data->eventStateAcked == CurrentAV->Event_State) {
/* Send ack notification */ /* Send ack notification */
} else { } else {
*error_code = ERROR_CODE_INVALID_EVENT_STATE; *error_code = ERROR_CODE_INVALID_EVENT_STATE;
@@ -1523,18 +1563,16 @@ int Analog_Value_Alarm_Summary(
getalarm_data->alarmState = pObject->Event_State; getalarm_data->alarmState = pObject->Event_State;
/* Acknowledged Transitions */ /* Acknowledged Transitions */
bitstring_init(&getalarm_data->acknowledgedTransitions); bitstring_init(&getalarm_data->acknowledgedTransitions);
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, bitstring_set_bit(
&getalarm_data->acknowledgedTransitions,
TRANSITION_TO_OFFNORMAL, TRANSITION_TO_OFFNORMAL,
pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL] pObject->Acked_Transitions[TRANSITION_TO_OFFNORMAL].bIsAcked);
.bIsAcked); bitstring_set_bit(
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, &getalarm_data->acknowledgedTransitions, TRANSITION_TO_FAULT,
TRANSITION_TO_FAULT, pObject->Acked_Transitions[TRANSITION_TO_FAULT].bIsAcked);
pObject->Acked_Transitions[TRANSITION_TO_FAULT] bitstring_set_bit(
.bIsAcked); &getalarm_data->acknowledgedTransitions, TRANSITION_TO_NORMAL,
bitstring_set_bit(&getalarm_data->acknowledgedTransitions, pObject->Acked_Transitions[TRANSITION_TO_NORMAL].bIsAcked);
TRANSITION_TO_NORMAL,
pObject->Acked_Transitions[TRANSITION_TO_NORMAL]
.bIsAcked);
return 1; /* active alarm */ return 1; /* active alarm */
} else } else
@@ -1658,7 +1696,6 @@ void Analog_Value_Init(void)
/* Set handler for AcknowledgeAlarm function */ /* Set handler for AcknowledgeAlarm function */
handler_alarm_ack_set(Object_Type, Analog_Value_Alarm_Ack); handler_alarm_ack_set(Object_Type, Analog_Value_Alarm_Ack);
/* Set handler for GetAlarmSummary Service */ /* Set handler for GetAlarmSummary Service */
handler_get_alarm_summary_set( handler_get_alarm_summary_set(Object_Type, Analog_Value_Alarm_Summary);
Object_Type, Analog_Value_Alarm_Summary);
#endif #endif
} }