aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-05-31 09:30:17 +0300
committerAvi Levkovich <avi@twine-s.com>2020-05-31 09:30:17 +0300
commitee4b4556508475c251444812823da204ffbb9e2b (patch)
treee9b181df7e60afa9e6c389bcec1b14b41345ae8d /Software/Embedded_SW
parent985df74483b6813af53f799c5063d0865f6caabb (diff)
downloadTango-ee4b4556508475c251444812823da204ffbb9e2b.tar.gz
Tango-ee4b4556508475c251444812823da204ffbb9e2b.zip
Add calculation for Head Staple spun pressure sensors [mV]
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
index ca2b24eae..ef37ffcee 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
@@ -432,7 +432,7 @@ int32_t RTD(uint32_t Resistance_mult_by_100) //Resistance * 100
uint32_t CalculateTemperatures(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t Data)
{
- int32_t Current_Measurement_C = 0;
+ int32_t Current_Measurement_C = 0, temp = 0;
uint32_t Resistance_mult_by_100;
@@ -460,8 +460,11 @@ uint32_t CalculateTemperatures(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t Dat
//if((Head_Type == HEAD_TYPE_STAPLE_SPUN) && (( SensorId == HEAD_PT100_ZONE_5_0X84_0) || ( SensorId == HEAD_PT100_ZONE_7_0X86_0)))//pressure sensors
{
//Head Staple spun pressure sensors
- TempSensorResponse[SensorId].Temperature_C_mult_by_100 = TempSensorResponse[SensorId].PT100_ADC_Reading_Bits;
- Current_Measurement_C = TempSensorResponse[SensorId].PT100_ADC_Reading_Bits;
+ //bits to mvolts
+ temp = TempSensorResponse[SensorId].PT100_ADC_Reading_Bits* 3.3 *1000;
+ temp /= 8388608;//mV
+ TempSensorResponse[SensorId].Temperature_C_mult_by_100 = temp;///mV
+ Current_Measurement_C = temp;///mV
}
else
{