diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-12 20:34:27 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-12 20:34:27 +0200 |
| commit | 3f8b5c336b2eddda520ee46cd53b29e33ff591c6 (patch) | |
| tree | 0a2b51f016612dd94d358556646320483af92a44 | |
| parent | 2599eff3d05cc407f8b98f164c7c220a42b46624 (diff) | |
| parent | caf3f04b4c20fa4a2c52d2066eb0eb9dfab637c8 (diff) | |
| download | Tango-3f8b5c336b2eddda520ee46cd53b29e33ff591c6.tar.gz Tango-3f8b5c336b2eddda520ee46cd53b29e33ff591c6.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
3 files changed, 18 insertions, 11 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 6d811bc2d..cfd4db0e6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -532,10 +532,10 @@ void CopyTemperaturesToMonitor(void) DiagnosticsMonitor.n_headzone12temperature = HeaterCounterIndex[HEATER_TYPE__HeaterZone12]; - DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5]; - DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7]; - headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0); - headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0); + DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7]; + DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5]; + headblower1airflow = PressureSensorGetPressure(HEAD_FAN_RIGHT); + headblower2airflow = PressureSensorGetPressure(HEAD_FAN_LEFT); DiagnosticsMonitor.headblower1airflow = &headblower1airflow; DiagnosticsMonitor.headblower2airflow = &headblower2airflow; 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; } diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index dfdbd91af..98326a1da 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -491,8 +491,16 @@ uint32_t InitSequenceArcAirflowCalibration(void) MCU_E2PromRead(EEPROM_PRESSURE_SENSOR_V0_1, &V0[1]); ReportWithPackageFilter(InitFilter,"load initial values from EEPROM", __FILE__,__LINE__, (int)V0[0], RpMessage, (int)V0[1], 0); } - PressureSensorV0[0] = V0[0]; - PressureSensorV0[1] = V0[1]; + if ((V0[0] > 1000) && (V0[0] < 1200)) { + PressureSensorV0[0] = V0[0]; + } else { + PressureSensorV0[0] = 1100; + } + if ((V0[1] > 1000) && (V0[1] < 1200)) { + PressureSensorV0[1] = V0[1]; + } else { + PressureSensorV0[1] = 1100; + } return OK; } uint32_t InitSequenceInitialBlowerActivation(void) |