Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Fans.c * -* @author (last) Dara Navaei -* @date (last) 12-Oct-2022 +* @author (last) Sean Nash +* @date (last) 08-Jan-2024 * * @author (original) Dara Navaei * @date (original) 25-Nov-2020 @@ -373,9 +373,9 @@ ************************************************************************/ static F32 getMaximumTemperature( void ) { - F32 temperature; + F32 temperature = 0.0F; + F32 maxTemperature = 0.0F; THERMISTORS_TEMP_SENSORS_T thermistor; - F32 maxTemperature; // Loop through the sensors and thermistors for ( thermistor = THERMISTOR_ONBOARD_NTC; thermistor < NUM_OF_THERMISTORS; thermistor++ ) @@ -389,18 +389,9 @@ temperature = getTemperatureValue( TEMPSENSORS_FPGA_BOARD_SENSOR ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - temperature = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A1_B1 ); + temperature = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - temperature = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A2_B2 ); - maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - - temperature = getTemperatureValue( TEMPSENSORS_INTERNAL_TRO_RTD ); - maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - - temperature = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD ); - maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - return maxTemperature; } @@ -457,7 +448,7 @@ // The RPM is expected to be 5500 @ 100% duty cycle // The nominal RPM = duty cycle * 5500 / 1.0 // The RPM tolerance is -25% to +50% of the nominal RPM - F32 dutyCycle = ( OVERRIDE_RESET == fansStatus.dutyCycle.override ? fansStatus.dutyCycle.data : fansStatus.dutyCycle.ovData ); + F32 dutyCycle = getF32OverrideValue( &fansStatus.dutyCycle ); F32 fansNominalRPM = dutyCycle * FANS_MAX_ALLOWED_RPM; F32 fansMinAllowedRPM = fansNominalRPM - ( fansNominalRPM * FANS_MIN_RPM_OUT_OF_RANGE_TOL ); F32 fansMaxAllowedRPM = fansNominalRPM + ( fansNominalRPM * FANS_MAX_RPM_OUT_OF_RANGE_TOL );