Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 9 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index ea5fd159c..2ae3da453 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -114,12 +114,12 @@ bool IgnoreMidTank = false;
 
 bool MidTankMitigation = false;
 int MidTankMitigationOn = 20,MidTankMitigationOff = 10;
-uint32_t MidtankMitigationControlId[MAX_SYSTEM_DISPENSERS*2] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-uint32_t MidtankMitigationCounter[MAX_SYSTEM_DISPENSERS*2];
+uint32_t MidtankMitigationControlId[NUM_OF_VALVES] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+uint16_t MidtankMitigationCounter[NUM_OF_VALVES];
 
 uint32_t ValveCallback(uint32_t deviceID, uint32_t ReadValue)
 {
-    int Valve_Id = deviceID%MAX_SYSTEM_DISPENSERS;
+    int Valve_Id = deviceID;
 
     MidtankMitigationCounter[deviceID]++;
     if (MidtankMitigationCounter[deviceID] > MidTankMitigationOn )
@@ -414,7 +414,6 @@ void EnableDisableAllDispensersValves(bool EnableOrDisable )
 void Valve_Set(Valves_t Valve_Id, bool Direction)
 {
 #ifndef EVALUATION_BOARD
-    int deviceId;
     if ((Valve_Id>=VALVE_2W_MID_AIR_8)&&(Valve_Id<=VALVE_2W_CART_MID_1))
     {
         if (IgnoreMidTank == true)
@@ -424,20 +423,19 @@ void Valve_Set(Valves_t Valve_Id, bool Direction)
         }
         if (MidTankMitigation == true)
         {
-            deviceId = Valve_Id - VALVE_2W_MID_AIR_8;
-            Report("Mid Tank Valve command mitigation",__FILE__,Valve_Id,(int)deviceId,RpWarning,Direction,0);
+            Report("Mid Tank Valve command mitigation",__FILE__,Valve_Id,(int)Valve_Id,RpWarning,Direction,0);
             if (Direction == true)
             {
                 //start s 2 seconds control, then according to the set values
-                MidtankMitigationCounter[deviceId] =  MidTankMitigationOn+1;
-                MidtankMitigationControlId[deviceId] = AddControlCallback("Valve mitigation", ValveCallback,  2, TemplateDataReadCBFunction,deviceId, Direction, 0 );
+                MidtankMitigationCounter[Valve_Id] =  MidTankMitigationOn+1;
+                MidtankMitigationControlId[Valve_Id] = AddControlCallback("Valve mitigation", ValveCallback,  2, TemplateDataReadCBFunction,Valve_Id, Direction, 0 );
             }
             else
             {
                 //cancel the control    if (Valve3WayControlId[_ValveId] != 0xFF)
-                if (RemoveControlCallback(MidtankMitigationControlId[deviceId], ValveCallback )!=OK)
-                    Report("Remove Control Failed.",__FILE__,__LINE__,(int)deviceId,RpError,(int)Direction,0);
-                MidtankMitigationControlId[deviceId] = 0xFF;
+                if (RemoveControlCallback(MidtankMitigationControlId[Valve_Id], ValveCallback )!=OK)
+                    Report("Remove Control Failed.",__FILE__,__LINE__,(int)Valve_Id,RpError,(int)Direction,0);
+                MidtankMitigationControlId[Valve_Id] = 0xFF;
             }
         }
     }