Heaters control trial

2 files changed, 7 insertions, 20 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 3e9218392..ec909136a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -160,26 +160,12 @@ void OneMilliSecondMillisecInterrupt(UArg arg0)
     return ;
 }
 uint32_t PT100Activity = 0;
-int32_t MillisecWriteToTempSensor(uint32_t TempSensorId, unsigned long Data, int Length, MSecFptr Callback)
-{
-    if (TempSensorId >= MAX_TEMPERATURE_SENSOR_ID) return -1;
-    PT100Activity++;
-    PT100Data[TempSensorId].Callback = Callback;
-    PT100Data[TempSensorId].Data = Data;
-    PT100Data[TempSensorId].Length = Length;
-    PT100Data[TempSensorId].DataRequired = false;
-    PT100Data[TempSensorId].Active = true;
-
-    return OK;
-}
-int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, unsigned long Data, int Length, MSecFptr Callback)
+int32_t MillisecReadFromTempSensor(uint32_t TempSensorId,  MSecFptr Callback)
 {
     if (TempSensorId >= MAX_TEMPERATURE_SENSOR_ID) return -1;
     PT100Activity++; //read request
     PT100Activity++;  //get response
     PT100Data[TempSensorId].Callback = Callback;
-    PT100Data[TempSensorId].Data = Data;
-    PT100Data[TempSensorId].Length = Length;
     PT100Data[TempSensorId].DataRequired = true;
     PT100Data[TempSensorId].Active = true;
 
@@ -297,13 +283,13 @@ uint32_t MillisecLoop(uint32_t tick)
     //FPGA_GetTempSensorBusy();
    if (PT100Activity)
    {
-       for (Sensor_i = TEMP_SENSE_ANALOG_MIXCHIP_TEMP;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
+       for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
        {
            //if (TempDriverDriverResponse[Sensor_i].Busy == true)
            //    continue;
            if (PT100Data[Sensor_i].WaitForData == true) //Read request sent, data is waiting
            {
-               if (SPIGetFPGAResponse(Sensor_i,&MotorInfo) == OK) //got the data from the FPGA
+               if (TemperatureSensorReadFromFPGA_Res(Sensor_i) == OK) //got the data from the FPGA
                {
                    PT100Data[Sensor_i].WaitForData = false;
                    if (PT100Data[Sensor_i].Callback)
@@ -313,7 +299,7 @@ uint32_t MillisecLoop(uint32_t tick)
            }
            if (PT100Data[Sensor_i].Active == true)
            {
-               SPISendFPGARequest(Sensor_i,PT100Data[Sensor_i].Data,PT100Data[Sensor_i].Length);
+               TemperatureSensorReadFromFPGA(Sensor_i);
                PT100Data[Sensor_i].Active = false;
                if (PT100Data[Sensor_i].DataRequired == true)
                {
@@ -333,6 +319,8 @@ uint32_t MillisecLoop(uint32_t tick)
     Dancer_Data[WINDER_DANCER] = Read_Dancer_Position(WINDER_DANCER);
     if (Hundred_msTick)
     {
+        for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
+            MillisecReadFromTempSensor(Sensor_i, NULL);
     }
 
     if (Onesecond_Tick)
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
index 6949a4abe..cf49e697a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.h
@@ -18,8 +18,7 @@ int32_t MillisecWriteToMotor(TimerMotors_t MotorId, unsigned long Data, int Leng
 int32_t MillisecSetMotorSpeed(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback);
 int32_t MillisecReadFromMotor(TimerMotors_t MotorId, unsigned long Data, int Length, MSecFptr Callback);
 
-int32_t MillisecWriteToTempSensor(uint32_t TempSensorId, unsigned long Data, int Length, MSecFptr Callback);
-int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, unsigned long Data, int Length, MSecFptr Callback);
+int32_t MillisecReadFromTempSensor(uint32_t TempSensorId, MSecFptr Callback);
 
 uint32_t getMotorStatusData(int MotorId);
 uint32_t getMotorSpeedData(int MotorId);