Head card PT00

1 files changed, 37 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 515460214..d9af23cac 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -411,7 +411,8 @@ uint32_t MillisecLoop(uint32_t tick)
    //int PT100Busy[MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID] = {0,0,0,0,0,0,0,0,0,0};
    if (PT100Activity)
    {
-       for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID;Sensor_i++)
+
+       for (Sensor_i = 0;Sensor_i < MAX_TANGO_TEMPERATURE_SENSOR_ID;Sensor_i++)
        {
            /*if (TempSensorResponse[Sensor_i].Busy == true)
            {
@@ -420,19 +421,33 @@ uint32_t MillisecLoop(uint32_t tick)
            }*/
            if (PT100Data[Sensor_i].Active == true)
            {
-               #ifndef  Use_Head_Card
+               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               {
                    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
            {
-               #ifdef  Use_Head_Card
-                   HeadADCPT100_SendReadDataCommand(Sensor_i);
-               #endif
+               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               {
                    TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
+               }
+               else if(Sensor_i < MAX_HEAD_CARD_TEMPERATURE_SENSOR_ID)
+               {
+                   HeadADCPT100_SendReadDataCommand(Sensor_i);
+               }
+               else if(Sensor_i < MAX_WHS_CARD_TEMPERATURE_SENSOR_ID)
+               {
+                   //for WHS...
+               }
+               else
+               {
+                   //TBD
+               }
+
                PT100Data[Sensor_i].WaitForData = false;
                PT100Data[Sensor_i].SyncRequired = true;
                if (PT100Data[Sensor_i].Callback)
@@ -441,10 +456,23 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            else if (PT100Data[Sensor_i].SyncRequired == true)
            {
-               #ifdef  Use_Head_Card
+               if(Sensor_i < MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID)
+               {
+                   TemperatureSensorSync(Sensor_i);
+               }
+               else if(Sensor_i < MAX_HEAD_CARD_TEMPERATURE_SENSOR_ID)
+               {
                    HeadADCPT100_StartSync(Sensor_i);
-               #endif
-               TemperatureSensorSync(Sensor_i);
+               }
+               else if(Sensor_i < MAX_WHS_CARD_TEMPERATURE_SENSOR_ID)
+               {
+                   //StartSync WHS...
+               }
+               else
+               {
+                   //TBD...
+               }
+
 
                PT100Data[Sensor_i].SyncRequired = false;
                PT100Activity--;