aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Heaters
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-12 20:34:27 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-12 20:34:27 +0200
commit3f8b5c336b2eddda520ee46cd53b29e33ff591c6 (patch)
tree0a2b51f016612dd94d358556646320483af92a44 /Software/Embedded_SW/Embedded/Modules/Heaters
parent2599eff3d05cc407f8b98f164c7c220a42b46624 (diff)
parentcaf3f04b4c20fa4a2c52d2066eb0eb9dfab637c8 (diff)
downloadTango-3f8b5c336b2eddda520ee46cd53b29e33ff591c6.tar.gz
Tango-3f8b5c336b2eddda520ee46cd53b29e33ff591c6.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Heaters')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index f3ab7a851..021dd243f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -53,7 +53,7 @@
#define PRESSURE_SENSOR_CP 0.269
#define PRESSURE_SENSOR_B 0.45
#define V0_DEFAULT_VALUE 1050
-#define FAN_MIN_RPM_THRESHOLD 3200
+#define FAN_MIN_RPM_THRESHOLD 4000
extern uint16_t Head_Fan_Tach[2];
extern uint8_t Head_Fan_PWM_Command[2];
@@ -354,13 +354,12 @@ void HeadBlowersCfg()
uint32_t PressureSensorInit(int blowerId)
{
- uint32_t V0;
+ uint32_t rpm, V0 = 0;
- if (HeadBlowersGetRPM(blowerId) < FAN_MIN_RPM_THRESHOLD) {
+ rpm = HeadBlowersGetRPM(blowerId);
+ if (rpm < FAN_MIN_RPM_THRESHOLD) {
V0 = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]);
V0 /= 10;
- } else {
- V0 = V0_DEFAULT_VALUE;
}
return V0;
}