diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-31 18:32:20 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-31 18:32:20 +0300 |
| commit | 98880580fdb3b36efe6afcf313de76ffca255bb3 (patch) | |
| tree | f6c51ffad0894710bc674802be3a392f29a476fa /Software/Embedded_SW/Embedded/Drivers | |
| parent | 636615fd69d4cb758fdf51d35baad73ed71d8236 (diff) | |
| parent | bd4581645434385407abdc13ae47a8faf2726078 (diff) | |
| download | Tango-98880580fdb3b36efe6afcf313de76ffca255bb3.tar.gz Tango-98880580fdb3b36efe6afcf313de76ffca255bb3.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c index e06962ca5..abbfcb4db 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c @@ -469,12 +469,12 @@ uint32_t CalculateTemperatures(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t Dat //bits to mvolts float temp1 = 3.3;//3.3V ref float temp2 = 8388608.0;//2^23 (24bit) - float temp3 = 100.0;// V_mult_by_100 + float temp3 = 10000.0;// V_mult_by_100 temp = Data & 0x00FFFFFF;//24bit temp *= temp1; - temp /= temp2; temp *= temp3; + temp /= temp2; Current_Measurement_C = (int32_t)(temp);///V_mult_by_100 } |