update TemperatureSensor.c

2 files changed, 34 insertions, 13 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
index e75143d43..61aca580a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
@@ -16,7 +16,7 @@
 #include "modules/control/millisecTask.h"
 #include "PT100RTD.h"
 
-uint32_t TemperatureSensorReadFromFPGA_Res(TEMPERATURE_SENSOR_ID_ENUM SensorId,uint32_t Data);
+uint32_t TemperatureSensorReadFromFPGA_Res(TEMPERATURE_SENSOR_ID_ENUM SensorId);
 //uint32_t TemperatureSendSensorDummyClk(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
 
 typedef enum
@@ -83,7 +83,7 @@ uint8_t FPGA_SensorInitConfigReg()
     return OK;
 }
 
-uint32_t TemperatureSensorsInit(void)
+uint32_t TemperatureSensorsReset(void)
 {
     #ifndef EVALUATION_BOARD
     uint8_t i;
@@ -96,8 +96,8 @@ uint32_t TemperatureSensorsInit(void)
 
         }
     #endif
-   SysCtlDelay(100);
-   FPGA_SensorInitConfigReg();
+   SysCtlDelay(100); // Must deley after hard reset
+   //FPGA_SensorInitConfigReg();
 
     return OK;
 }
@@ -371,15 +371,17 @@ int32_t RTD(uint32_t Resistance_mult_by_100) //Resistance * 100
 }
 
 
-uint32_t TemperatureSensorReadFromFPGA_Res(TEMPERATURE_SENSOR_ID_ENUM SensorId,uint32_t Data)
+uint32_t TemperatureSensorReadFromFPGA_Res(TEMPERATURE_SENSOR_ID_ENUM SensorId)
 {
     uint32_t Status = OK;
 
     int32_t Current_Measurement_C = 0;
 
     uint32_t Resistance_mult_by_100;
+    uint32_t Data = 0;
 
     //uint32_t Data;
+    TemperatureSendSensorDummyClk(SensorId);//TODO check if it is ok to add it here without deley !!!!!!!
 
     SPIGetFPGAResponse(SensorId, &Data);
 
@@ -451,12 +453,26 @@ uint32_t TemperatureSensorReadRegFromFPGA(TEMPERATURE_SENSOR_ID_ENUM SensorId, u
     return Status;
 }
 
+void FPGA_SensorInitConfig()
+{
+    int Sensor=0,Register = 0;
+
+    FPGA_SensorInitConfigReg(); // Initial the configuration registers
+
+    for(Register=0;Register<=SENSOR_CONFIG_REG3;Register++)
+    {
+        for(Sensor=0;Sensor<MAX_TEMPERATURE_SENSOR_ID;Sensor++)
+        {
+            FPGA_SensorConfig_callback( (TEMPERATURE_SENSOR_ID_ENUM)(Sensor), Register);
+        }
+    }
+}
 
 void Debug_Start_PT00()
 {
     SysCtlDelay(10000);
 
-    //TemperatureSensorsInit(); // No need to reset
+    //TemperatureSensorsReset(); // No need to reset
     FPGA_SensorInitConfigReg(); // Initial the configuration registers
 
     //Config the registers for TEMP_SENSE_ANALOG_DYEINGH_TEMP1
@@ -483,13 +499,13 @@ void Debug_Start_PT00()
     TemperatureSensorReadFromFPGA(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
     SysCtlDelay(5000);
 
-    uint32_t Data = 0;
+    //uint32_t Data = 0;
 
     while(1)
     {
         TemperatureSendSensorDummyClk(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
         SysCtlDelay(5000);
-        TemperatureSensorReadFromFPGA_Res(TEMP_SENSE_ANALOG_DYEINGH_TEMP1,Data);
+        TemperatureSensorReadFromFPGA_Res(TEMP_SENSE_ANALOG_DYEINGH_TEMP1);
         SysCtlDelay(100000);
     }
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h
index 03ccb7feb..b36de0390 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h
@@ -98,13 +98,18 @@ typedef struct
 TempSensConfigStruc  TempSensConfig[MAX_TEMPERATURE_SENSOR_ID];
 
 
-uint32_t TemperatureSensorsInit(void);
-//set the motor configuration
-uint32_t TemperatureSensorConfig(TEMPERATURE_SENSOR_ID_ENUM SensorId, TempSensConfigStruc *TemperatureSensorConfig);
+uint32_t TemperatureSensorsReset(void); // No need to use !!! (No need to reset)
 
-uint32_t TemperatureSensorRead(TEMPERATURE_SENSOR_ID_ENUM SensorId);
+void FPGA_SensorInitConfig();// set the registers
 
-uint32_t TemperatureSensorReadFromFPGA(TEMPERATURE_SENSOR_ID_ENUM SensorId);
+uint32_t TemperatureSensorReadFromFPGA(TEMPERATURE_SENSOR_ID_ENUM SensorId); // send read command
+
+uint32_t TemperatureSensorReadFromFPGA_Res(TEMPERATURE_SENSOR_ID_ENUM SensorId);//get read respose
+
+uint32_t TemperatureSensorRead(TEMPERATURE_SENSOR_ID_ENUM SensorId); // read from buffer
+
+//The temparature will be at:
+//TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP1].Temperature_C_mult_by_100