fix calculate new limit state

IOTechSystems · Nov 29, 2024 · e94699c · e94699c
1 parent ed02bb4
commit e94699c
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
@@ -4102,32 +4102,33 @@ static UA_StatusCode calculateNewLimitState (
             if (exclusive) goto done;
         }
     }
-
-    readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWDEADBAND), &lowDeadband);
-    retval = readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLIMIT), &lowLimit);
+     
+    readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWDEADBAND), &lowLowDeadband);
+    retval = readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWLIMIT), &lowLowLimit);
     if (retval == UA_STATUSCODE_GOOD)
     {
-        UA_Double limit = UA_LIMITSTATE_CHECK(prevState, UA_LIMITSTATE_LOWSTATEBIT) ?
-                          (lowLimit + lowDeadband) :  lowLimit;
+        UA_Double limit = UA_LIMITSTATE_CHECK(prevState, UA_LIMITSTATE_LOWLOWSTATEBIT) ?
+                          (lowLowLimit + lowLowDeadband) :  lowLowLimit;
         if (inputValue <= limit)
         {
-            UA_LIMITSTATE_SET(state, UA_LIMITSTATE_LOWSTATEBIT);
+            UA_LIMITSTATE_SET(state, UA_LIMITSTATE_LOWLOWSTATEBIT);
             if (exclusive) goto done;
         }
     }
 
-    readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWDEADBAND), &lowLowDeadband);
-    retval = readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWLIMIT), &lowLowLimit);
+    readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWDEADBAND), &lowDeadband);
+    retval = readObjectPropertyDouble (server, *conditionId, UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLIMIT), &lowLimit);
     if (retval == UA_STATUSCODE_GOOD)
     {
-        UA_Double limit = UA_LIMITSTATE_CHECK(prevState, UA_LIMITSTATE_LOWLOWSTATEBIT) ?
-                          (lowLowLimit + lowLowDeadband) :  lowLowLimit;
+        UA_Double limit = UA_LIMITSTATE_CHECK(prevState, UA_LIMITSTATE_LOWSTATEBIT) ?
+                          (lowLimit + lowDeadband) :  lowLimit;
         if (inputValue <= limit)
         {
-            UA_LIMITSTATE_SET(state, UA_LIMITSTATE_LOWLOWSTATEBIT);
+            UA_LIMITSTATE_SET(state, UA_LIMITSTATE_LOWSTATEBIT);
             if (exclusive) goto done;
         }
     }
+
     retval = UA_STATUSCODE_GOOD;
 done:
     *stateOut = state;