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

3 files changed, 38 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 84e3bf56e..c1fcd4030 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,21 @@ 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);
+               #else
+                   TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA
+               #endif
+
                PT100Data[Sensor_i].WaitForData = false;
                PT100Data[Sensor_i].SyncRequired = true;
                if (PT100Data[Sensor_i].Callback)
@@ -430,7 +438,12 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            else if (PT100Data[Sensor_i].SyncRequired == true)
            {
-               TemperatureSensorSync(Sensor_i);
+               #ifdef  Use_Head_Card
+                   HeadADCPT100_StartSync(Sensor_i);
+               #else
+                   TemperatureSensorSync(Sensor_i);
+               #endif
+
                PT100Data[Sensor_i].SyncRequired = false;
                PT100Activity--;
                break; // one PT100 activitiy per MS 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
index 7c4bb1761..faf6022d6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_init.c
@@ -25,7 +25,7 @@
 #include "heaters.h"
 #include "Drivers/Heater/Heater.h"
 #include "Drivers/Heater/TemperatureSensor.h"
-
+#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h"
 
 
 /******************** STRUCTURES AND ENUMs  ********************************************/
@@ -62,7 +62,13 @@ uint32_t Heaters_Init(void)
 {
     int i;
     //ROM_TimerDisable(Heater_timerBase, TIMER_A);
-    FPGA_SensorInitConfig();
+
+    #ifdef  Use_Head_Card
+        HeadADCPT100_SensorInitConfig();
+    #else
+        FPGA_SensorInitConfig();
+    #endif
+
     memset(HeaterControl,0,sizeof(HeaterControl));
     for (i = 0;i<MAX_HEATERS_NUM; i++)
         DeActivateHeater(i);
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 75944d862..5c56bcaa5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -12,10 +12,15 @@
 #include "drivers/Flash_Memory/FATFS/ff.h"
 #include "drivers/Flash_Memory/FATFS/Control_File_System.h"
 #include "drivers/adc_sampling/adc.h"
+#include "drivers/Heater/TemperatureSensor.h"
+#include "drivers/ADC_Sampling/adc.h"
+
+#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h"
+#include "drivers/Motors/Motor.h"
 
 //#include "graphics_adapter.h"
 extern uint8_t Input_Voltage;
-
+extern uint8_t Test_Read_Buf[4];
 void Stub_ProgressRequest(MessageContainer* requestContainer)
 {
     MessageContainer responseContainer;
@@ -37,6 +42,14 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
             test_Home_Pos();
         }
     else
+    if((request->amount == 0x100) && (request->delay == 0x100)) //head card PT100
+    {
+        Test_HeadCard_PT100(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
+        //response.progress = (double)Test_Read_Buf[0];
+        response.progress = (double)Data_ADC_Head;
+        response.has_progress = true;
+    }
+    else
     if((request->amount == 0xCF) && (request->delay == 0xCF)) //Create File System on the Drive
     {
 #ifdef WATCHDOG