Index: firmware/App/Controllers/Thermistors.c =================================================================== diff -u -r374bab15ea30aba82ee139e8a494764db312f468 -r2fea76e972a450a97c74b2a9f627095032a3b586 --- firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 374bab15ea30aba82ee139e8a494764db312f468) +++ firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 2fea76e972a450a97c74b2a9f627095032a3b586) @@ -102,8 +102,7 @@ thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].betaValue = POWER_SUPPLY_THERMISTOR_BETA_VALUE; // Initialize a persistent alarm for thermistors temeprature out of range - initPersistentAlarm( PERSISTENT_ALARM_THERMISTOR_TEMPERATURE_OUT_OF_RANGE, ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE, - TRUE, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD ); + initPersistentAlarm( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD ); } /*********************************************************************//** @@ -234,7 +233,7 @@ // If the values are out of range, raise an alarm if ( temperature < MIN_ALLOWED_TEMPERATURE || temperature >= MAX_ALLOWED_TEMPERATURE ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE, thermistor, temperature ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, thermistor, temperature ); // If any thermistor/sensor is not in range, POST has failed thermistorsSelfTestReslt = SELF_TEST_STATUS_FAILED; } @@ -321,12 +320,9 @@ for ( thermistor = THERMISTOR_ONBOARD_NTC; thermistor < NUM_OF_THERMISTORS; thermistor++ ) { temperature = getThermistorTemperatureValue( thermistor ); + BOOL const isTempOutOfRange = ( temperature >= MAX_ALLOWED_TEMPERATURE ) && ( temperature < MIN_ALLOWED_TEMPERATURE ); - BOOL isTempOutOfUpperRange = temperature >= MAX_ALLOWED_TEMPERATURE; - BOOL isTempOutOfLowerRange = temperature < MIN_ALLOWED_TEMPERATURE; - - checkPersistentAlarm( PERSISTENT_ALARM_THERMISTOR_TEMPERATURE_OUT_OF_RANGE, isTempOutOfLowerRange, temperature, MIN_ALLOWED_TEMPERATURE ); - checkPersistentAlarm( PERSISTENT_ALARM_THERMISTOR_TEMPERATURE_OUT_OF_RANGE, isTempOutOfUpperRange, temperature, MAX_ALLOWED_TEMPERATURE ); + checkPersistentAlarm( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, isTempOutOfRange, temperature, MAX_ALLOWED_TEMPERATURE ); } }