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

2 files changed, 10 insertions, 8 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 8a14a1d67..689219583 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -822,14 +822,6 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (Tensecond_Tick)
     {
-    #ifndef RUN_AS_MAIN_JIG
-        //Trigger_MidTank_Pressure_Read();
-        for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
-        {
-            Read_MidTank_Pressure_Sensor(Disp_i);
-        }
-    #endif
-
     }
     if (OneMinute_Tick)
     {
@@ -864,6 +856,14 @@ uint32_t MillisecLowLoop(uint32_t tick)
         {
             Shinko_Cycle_Comm();
         }
+#ifndef RUN_AS_MAIN_JIG
+        //Trigger_MidTank_Pressure_Read();
+        for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+        {
+            Read_MidTank_Pressure_Sensor(Disp_i);
+        }
+#endif
+
     }
     if (OneHourTick)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 14275533e..2047e9910 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -198,6 +198,8 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
                     ReportWithPackageFilter(FPGAFilter, "FPGA Watchdog Error",__FILE__,__LINE__,0,RpError, 0,0);
 
                     ACTIVITY_GREEN_LED_ON;
+                    MotorConfiguredTimeout = 100;
+
                     FPGA_SetMotorsInit();
                     Motor_ReconfigAllMotors();
                 }