Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r750a8b61a1e9a63823ecc6ed441cd01524ffc02b -r95eefee71702fbf031025dc35ebaf553dfb050b7 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 750a8b61a1e9a63823ecc6ed441cd01524ffc02b) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 95eefee71702fbf031025dc35ebaf553dfb050b7) @@ -272,9 +272,6 @@ initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); - initPersistentAlarm( ALARM_ID____AVAILABLE_28, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, - INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); - initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); @@ -360,16 +357,15 @@ /*********************************************************************//** * @brief - * The isInletWaterTemperatureInRange function checks inlet water temperature value + * The checkInletWaterTemperature function checks inlet water temperature value * and triggers an alarm when temperature value is out of allowed range. * @details Inputs: none * @details Outputs: none - * @return TRUE if the temperature are in range otherwise, FALSE + * @return none *************************************************************************/ -BOOL isInletWaterTemperatureInRange( void ) +void checkInletWaterTemperature( void ) { #ifndef DISABLE_WATER_QUALITY_CHECK - BOOL status = TRUE; F32 temperature = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ); BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE ); BOOL isWaterTempInLowRange = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE ); @@ -396,14 +392,6 @@ { checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, FALSE, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ); } - - if ( ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) || - ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) ) ) - { - status = FALSE; - } - - return status; #endif } @@ -942,8 +930,7 @@ // Check both temperature and to be in range if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorIndex ].maxAllowedTemperature ) ) { - // TODO investigate - //checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature ); + checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature ); } }