diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-16 16:16:33 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-16 16:16:33 +0200 |
| commit | cbd5e135024f32e282866b07951bbf1645019a01 (patch) | |
| tree | 1538bfbcc698340ab0f2556bc6f7ad9270034097 /Software/Embedded_SW/Embedded/Modules/Heaters | |
| parent | 3f8b5c336b2eddda520ee46cd53b29e33ff591c6 (diff) | |
| download | Tango-cbd5e135024f32e282866b07951bbf1645019a01.tar.gz Tango-cbd5e135024f32e282866b07951bbf1645019a01.zip | |
fix alarm handling (resolves bugs #4085, #4097). dancer setup - per dancer
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Heaters')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c index 021dd243f..5be5f1232 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 4000 +#define FAN_MIN_RPM_THRESHOLD 3200 extern uint16_t Head_Fan_Tach[2]; extern uint8_t Head_Fan_PWM_Command[2]; @@ -92,8 +92,8 @@ void HeadBlowersInit() HeadBlowerControl[0].m_params.MAX = 200; HeadBlowerControl[0].m_params.MIN = -200; HeadBlowerControl[0].m_params.Kd = 0; - HeadBlowerControl[0].m_params.Kp = 350; - HeadBlowerControl[0].m_params.Ki = 25; + HeadBlowerControl[0].m_params.Kp = 800; + HeadBlowerControl[0].m_params.Ki = 80; HeadBlowerControl[0].m_params.IntegralErrorMultiplier = 10; HeadBlowerControl[0].m_params.ProportionalErrorMultiplier = 10; HeadBlowerControl[0].m_params.epsilon = 0; @@ -110,8 +110,8 @@ void HeadBlowersInit() HeadBlowerControl[1].m_params.MAX = 200; HeadBlowerControl[1].m_params.MIN = -200; HeadBlowerControl[1].m_params.Kd = 0; - HeadBlowerControl[1].m_params.Kp = 350; - HeadBlowerControl[1].m_params.Ki = 25; + HeadBlowerControl[1].m_params.Kp = 800; + HeadBlowerControl[1].m_params.Ki = 80; HeadBlowerControl[1].m_params.IntegralErrorMultiplier = 10; HeadBlowerControl[1].m_params.ProportionalErrorMultiplier = 10; HeadBlowerControl[1].m_params.epsilon = 0; @@ -354,12 +354,13 @@ void HeadBlowersCfg() uint32_t PressureSensorInit(int blowerId) { - uint32_t rpm, V0 = 0; + uint32_t V0; - rpm = HeadBlowersGetRPM(blowerId); - if (rpm < FAN_MIN_RPM_THRESHOLD) { + if (HeadBlowersGetRPM(blowerId) < FAN_MIN_RPM_THRESHOLD) { V0 = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]); V0 /= 10; + } else { + V0 = V0_DEFAULT_VALUE; } return V0; } |