Merge tag 'FixTrevisanFluitek02' into develop

Fix gestioen emergenza sempre attiva se armed
2021-09-30 11:51:25 +02:00
parent b1e09a0961 687ce285a8
commit b9c5f55bb9
1 changed files with 7 additions and 5 deletions
@@ -358,11 +358,6 @@ namespace IOB_WIN_NEXT
                    B_input += (1 << 1);
                }
            }
-            // emergenza armata = 1
-            else if (!hasEStopTriggered && mtcParams.emergencyArmedTrue)
-            {
-                B_input += (1 << 5);
-            }
            // emergenza premuta = 1
            else if (hasEStopTriggered && !mtcParams.emergencyArmedTrue)
            {
@@ -379,6 +374,13 @@ namespace IOB_WIN_NEXT
                B_input += (1 << 4);
            }

+
+            // emergenza armata = 1
+            if (!hasEStopTriggered && mtcParams.emergencyArmedTrue)
+            {
+                B_input += (1 << 5);
+            }
+
            DateTime adesso = DateTime.Now;
            int vFactor = 1;
            // controllo SE HO dati per fare verifiche...