Acked_Transitions for Analog-Input and Analog-Value objects.

This commit is contained in:
k001a
2011-07-19 20:40:25 +00:00
parent e5496d3d11
commit acbfe10349
6 changed files with 115 additions and 42 deletions
+7 -7
View File
@@ -781,11 +781,11 @@ void Notification_Class_common_reporting_function(
event_data->initiatingObjectIdentifier.type = OBJECT_DEVICE;
event_data->initiatingObjectIdentifier.instance =
Device_Object_Instance_Number();
/* Priority and AckRequired*/
switch (event_data->toState)
switch (event_data->toState)
{
case EVENT_STATE_OFFNORMAL:
case EVENT_STATE_NORMAL:
event_data->priority =
CurrentNotify->Priority[EVENT_STATE_NORMAL];
event_data->ackRequired = (CurrentNotify->Ack_Required &
@@ -795,16 +795,16 @@ void Notification_Class_common_reporting_function(
case EVENT_STATE_FAULT:
event_data->priority =
CurrentNotify->Priority[EVENT_STATE_FAULT];
event_data->ackRequired = (CurrentNotify->Ack_Required &
event_data->ackRequired = (CurrentNotify->Ack_Required &
TRANSITION_TO_FAULT_MASKED) ? true : false;
break;
case EVENT_STATE_NORMAL:
case EVENT_STATE_OFFNORMAL:
case EVENT_STATE_HIGH_LIMIT:
case EVENT_STATE_LOW_LIMIT:
case EVENT_STATE_LOW_LIMIT:
event_data->priority =
CurrentNotify->Priority[EVENT_STATE_OFFNORMAL];
event_data->ackRequired = (CurrentNotify->Ack_Required &
event_data->ackRequired = (CurrentNotify->Ack_Required &
TRANSITION_TO_OFFNORMAL_MASKED) ? true : false;
break;