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

1 files changed, 28 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 7c15c6ae7..063d7c823 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -49,6 +49,7 @@
 
 #include "Communication/Connection.h"
 #include "Modules/General/buttons.h"
+#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h"
 
 Task_Handle Millisecond_Task_Handle;
 /******************** Definitions  ********************************************/
@@ -414,14 +415,19 @@ uint32_t MillisecLoop(uint32_t tick)
            }*/
            if (PT100Data[Sensor_i].Active == true)
            {
-               TemperatureSendSensorDummyClk(Sensor_i);
+               #ifndef  Use_Head_Card
+                   TemperatureSendSensorDummyClk(Sensor_i);
+                #endif
                PT100Data[Sensor_i].Active = false;
                PT100Data[Sensor_i].WaitForData = true; // mark the motor for data request next round
                break; //  one PT100 activitiy per MS 
            }
            else if (PT100Data[Sensor_i].WaitForData == true) //Read request sent, data is waiting
            {
-               TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
+               #ifdef  Use_Head_Card
+                   HeadADCPT100_SendReadDataCommand(Sensor_i);
+               #endif
+                   TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
                PT100Data[Sensor_i].WaitForData = false;
                PT100Data[Sensor_i].SyncRequired = true;
                if (PT100Data[Sensor_i].Callback)
@@ -430,7 +436,11 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            else if (PT100Data[Sensor_i].SyncRequired == true)
            {
+               #ifdef  Use_Head_Card
+                   HeadADCPT100_StartSync(Sensor_i);
+               #endif
                TemperatureSensorSync(Sensor_i);
+
                PT100Data[Sensor_i].SyncRequired = false;
                PT100Activity--;
                break; // one PT100 activitiy per MS 
@@ -482,6 +492,8 @@ void setRapidPressureRead(bool value)
 {
     RapidPressureRead = value;
 }
+
+uint16_t PumpCounter = 0;
 uint32_t MillisecLowLoop(uint32_t tick)
 {
     uint8_t Motor_i,Disp_i,Heater_i,temp;
@@ -491,13 +503,14 @@ uint32_t MillisecLowLoop(uint32_t tick)
     //call all modules Millisec functions
     //test dancers and speed encoders
     //check all callback units (state machine waiting for completion of a change)
-    bool Ten_msTick, Hundred_msTick , m90msecTick, Onesecond_Tick,O900Millisecond_Tick,OneMinute_Tick;
+    bool Ten_msTick, Hundred_msTick , m90msecTick, Onesecond_Tick,O900Millisecond_Tick,OneMinute_Tick,OneHourTick;
     Ten_msTick      =   (tick%eTenMillisecond == 0)      ?true:false;
     Hundred_msTick  =   (tick%eHundredMillisecond == 0)  ?true:false;
     m90msecTick  =   (tick%eHundredMillisecond == 90)  ?true:false;
     O900Millisecond_Tick  =   (tick%eOneSecond == 900)           ?true:false;
     Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
     OneMinute_Tick  =   (tick%eOneMinute == 0)           ?true:false;
+    OneHourTick  =   (tick%eOneHour == 0)           ?true:false;
     //gather Motor data from FPGA
     //ROM_IntMasterDisable();
 
@@ -544,6 +557,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
             }
             ADC_TriggerCollection();
         }
+        DispensersCollectionCall();
+
     }
 
     if ((O900Millisecond_Tick)&&(RapidPressureRead == false))
@@ -599,6 +614,16 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 MotorGetStatusFromFPGA(Motor_i);
         }*/
     }
+    if (OneHourTick)
+    {
+#define PUMP_LIMIT 8
+        PumpCounter++;
+        if (PumpCounter>=PUMP_LIMIT)
+        {
+            PumpActivation(900);
+            PumpCounter = 0;
+        }
+    }
     //ROM_IntMasterEnable();