merge conflicts

1 files changed, 17 insertions, 10 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 2c7512129..da4f04f3b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -569,6 +569,7 @@ void setRapidPressureRead(bool value)
 }
 
 uint16_t PumpCounter = 0;
+uint16_t realtimetest[101];
 uint32_t MillisecLowLoop(uint32_t tick)
 {
     uint8_t Motor_i,Disp_i,temp;
@@ -598,6 +599,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
     OneMinute_Tick  =   (tick%eOneMinute == 0)           ?true:false;
     OneHourTick  =   (tick%eOneHour == 0)           ?true:false;
+    realtimetest[(tick%1000)/10]++;
     //gather Motor data from FPGA
     //ROM_IntMasterDisable();
     int StartPT100 = 0;
@@ -669,6 +671,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (O200Millisecond_Tick)
     {
+        Trigger_WHS_MAX11614_Read_allADC();
         FPGA_GetAllDispensersValveBusyOCD();
         temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
@@ -690,6 +693,8 @@ 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++)
@@ -718,19 +723,21 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i);
             }
         }
-        Trigger_WHS_PT100_Read_All();
-        Trigger_WHS_MAX11614_Read_allADC();
-        WHS_Blower_Avarege_ORF1(); //drier
-        WHS_Blower_Avarege_ORF3(); //head
-        Trigger_WHSReadAllFanTacho ();
+        if (WHS_Type == WHS_TYPE_NEW)
+        {
+            Trigger_WHS_PT100_Read_All();
+            WHS_Blower_Avarege(HEAD_FLOW_METER);
+            WHS_Blower_Avarege(DRIER_FLOW_METER);
+            WHS_Start_Blower_Control_Closed_Loop ();
+        }
     }
     if (OneMinute_Tick)
     {
-        Trigger_MidTank_Pressure_Read();
-        /*for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+        //Trigger_MidTank_Pressure_Read();
+        for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
         {
             Read_MidTank_Pressure_Sensor(Disp_i);
-        }*/
+        }
 //        MachineUpdateResponseFunc();
         /*        for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
@@ -922,7 +929,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;
@@ -971,7 +978,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 ;