valves test for Mati

2 files changed, 48 insertions, 1 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index b83fa6610..9297d3bb8 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -24,14 +24,24 @@
 #include "Drivers/Heater/TemperatureSensor.h"
 #include "drivers/Motors/Motor.h"
 
+#include "StateMachines/Initialization/InitSequence.h"
+
 #include "Modules/General/MachineStatus.h"
 #include "Modules/Control/MillisecTask.h"
 #include "modules/ids/ids_ex.h"
 
 MachineState StoredMachineStatus = MACHINE_STATE__PowerUp;
-
+bool SetMAchineStateProblem = false;
 void SetMachineStatus (MachineState State)
 {
+    if (State == MACHINE_STATE__Ready)
+    {
+        if ((GetMachineState()<MACHINE_STATE_MACHINE_READY_TO_DYE)&&(GetMachineState()!=MACHINE_STATE_NO_PROCESS_PARAMS))
+        {
+            ReportWithPackageFilter(GeneralFilter,"SetMachineStatus problem",__FILE__,__LINE__,State,RpWarning,GetMachineState(), 0);
+            SetMAchineStateProblem = true;
+        }
+    }
     ReportWithPackageFilter(GeneralFilter,"SetMachineStatus",__FILE__,__LINE__,State,RpWarning,StoredMachineStatus, 0);
 
     StoredMachineStatus = State;
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 7650b8dfb..b23985103 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -25,6 +25,7 @@
 #include "Drivers/I2C_Communication/Head_Card/Fan/fan_click.h"
 #include "Drivers/I2C_Communication/Head_Card/Fan/Head_Fan.h"
 #include "drivers/Motors/Motor.h"
+#include "drivers/Valves/Valve.h"
 #include "drivers/FPGA/FPGA_SPI_Comm.h"
 #include "Modules/IFS/ifs.h"
 #include "Modules/IDS/ids_ex.h"
@@ -1221,6 +1222,42 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
 
     }
+    else
+    if(request->amount == 0xC11)
+    {
+        IgnoreMidTank = request->delay;
+        LOG_ERROR(IgnoreMidTank, "IgnoreMidTank");
+
+        response.progress = request->delay;
+        response.has_progress = true;
+    }
+    else
+    if(request->amount == 0xC12)
+    {
+        MidTankMitigation = request->delay;
+        LOG_ERROR(MidTankMitigation, "MidTankMitigation");
+
+        response.progress = request->delay;
+        response.has_progress = true;
+    }
+    else
+    if(request->amount == 0xC13)
+    {
+        MidTankMitigationOff = request->delay;
+        LOG_ERROR(MidTankMitigationOff, "MidTankMitigationOff");
+
+        response.progress = request->delay;
+        response.has_progress = true;
+    }
+    else
+    if(request->amount == 0xC14)
+    {
+        MidTankMitigationOn = request->delay;
+        LOG_ERROR(MidTankMitigationOn, "MidTankMitigationOn");
+
+        response.progress = request->delay;
+        response.has_progress = true;
+    }
     else     
 	if((request->amount == 0xDF) && (request->delay == 0xDF)) //Power off
     {