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

2 files changed, 24 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 1cc8e766b..0e95f4053 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -59,6 +59,8 @@
 #include <Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h>
 #include <Drivers/I2C_Communication/I2C_Task.h>
 #include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h>
+#include "Modules/Heaters/Heaters_ex.h"
+#include <Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h>
 Task_Handle Millisecond_Task_Handle;
 /******************** Definitions  ********************************************/
 
@@ -694,6 +696,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     if (O600Millisecond_Tick)
     {
         Trigger_WHSReadAllFanTacho ();
+        DrierHeaterVoltageSetup();
         if (RapidPressureRead == false)
         {
             for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
@@ -704,8 +707,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (Onesecond_Tick)
     {
-        char Lenstr[160];
-        static int Counter = 0;
+        //char Lenstr[160];
+        //static int Counter = 0;
         MachineUpdateResponseFunc();
         //KeepAliveOneSecondCall();
 
@@ -725,8 +728,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
         if (WHS_Type == WHS_TYPE_NEW)
         {
             Trigger_WHS_PT100_Read_All();
-            WHS_Blower_Avarege_ORF1(); //drier
-            WHS_Blower_Avarege_ORF3(); //head
+            WHS_Blower_Avarege(HEAD_FLOW_METER);
+            WHS_Blower_Avarege(DRIER_FLOW_METER);
             WHS_Start_Blower_Control_Closed_Loop ();
         }
     }
@@ -928,7 +931,7 @@ void HundredMicroTimerInterrupt(int ARG0)
     StoreBuffer[StoreBufferId][StoreBufferCounter++] = dancer2;
     StoreBuffer[StoreBufferId][StoreBufferCounter++] = dancer3;
     /*-----------------------*/
-    //len = usprintf(&StoreBuffer[StoreBufferId][StoreBufferCounter], "\r\n%d %d %d", dancer1[dancer_count],dancer2[dancer_count],dancer3[dancer_count]);
+    //len = usprintf(&StoreBuffer[StoreBufferId][StoreBufferCounter], "%d %d %d", dancer1[dancer_count],dancer2[dancer_count],dancer3[dancer_count]);
     //StoreBufferCounter+=(len+1);
     /*-----------------------*/
     dancer1sum+=dancer1;
@@ -977,7 +980,7 @@ void MillisecLogInit(void)
     if (FileHandle == 0)
         Fresult = FR_DENIED;
     else
-        Fresult = f_open(FileHandle,MillisecPath,FA_WRITE |  FA_OPEN_ALWAYS);
+        Fresult = f_open(FileHandle,MillisecPath,FA_WRITE |  FA_OPEN_ALWAYS|FA_CREATE_ALWAYS);
     ROM_IntMasterEnable();
     return ;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index bea68e314..0f9848ba1 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -51,6 +51,7 @@
 
 #include  <PMR/Diagnostics/EventType.pb-c.h>
 
+#include "drivers/FPGA/Full_Vme/FPGA_Programming_Up.h"
 #include "drivers/adc_sampling/adc.h"
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 #include "drivers/FPGA/FPGA_SPI_Comm.h"
@@ -181,19 +182,22 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
         ACTIVITY_RED_LED_OFF; // Heaters indication - all the Heaters OFF
         if(FPGA_WD_Occurred == true)
         {
-            FPGA_WD_Occurred = false;
-            AlarmHandlingSetAlarm(EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,true);
-            if (JobIsActive())
+            if (FPGABurningActive == false)
             {
-                JobEndReason = JOB_MOTOR_ALARM;
-                SendJobProgress(0.0,0,false, "Hardware Failure Error");
-                AbortJob("FPGA Watchdog Error");
-            }
-            ReportWithPackageFilter(FPGAFilter, "FPGA Watchdog Error",__FILE__,__LINE__,0,RpError, 0,0);
+                FPGA_WD_Occurred = false;
+                AlarmHandlingSetAlarm(EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,true);
+                if (JobIsActive())
+                {
+                    JobEndReason = JOB_MOTOR_ALARM;
+                    SendJobProgress(0.0,0,false, "Hardware Failure Error");
+                    AbortJob("FPGA Watchdog Error");
+                }
+                ReportWithPackageFilter(FPGAFilter, "FPGA Watchdog Error",__FILE__,__LINE__,0,RpError, 0,0);
 
-            ACTIVITY_GREEN_LED_ON;
-            FPGA_SetMotorsInit();
-            Motor_ReconfigAllMotors();
+                ACTIVITY_GREEN_LED_ON;
+                FPGA_SetMotorsInit();
+                Motor_ReconfigAllMotors();
+            }
         }
 		else
             ACTIVITY_GREEN_LED_OFF;