Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r750a8b61a1e9a63823ecc6ed441cd01524ffc02b -r95eefee71702fbf031025dc35ebaf553dfb050b7
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 750a8b61a1e9a63823ecc6ed441cd01524ffc02b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
@@ -238,18 +238,17 @@
 
 /*********************************************************************//**
  * @brief
- * The isInletWaterConductivityInRange function checks inlet water conductivity value
+ * The checkInletWaterConductivity function checks inlet water conductivity value
  * and triggers an alarm when conductivity value is not within the specified
  * values.
  * @details Inputs: CPi sensor conductivity
  * @details Outputs: Trigger warning alarm if conductivity is in the warning
  * range. Trigger alarm if conductivity is below minimum conductivity.
- * @return TRUE if the inlet water conductivity is in range otherwise, FALSE
+ * @return none
  *************************************************************************/
-BOOL isInletWaterConductivityInRange( void )
+void checkInletWaterConductivity( void )
 {
 #ifndef DISABLE_WATER_QUALITY_CHECK
-    BOOL status                  = TRUE;
     F32 conductivity             = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
     BOOL isConductTooLow         = ( conductivity < MAX_COND_SENSOR_CPI_WARNING_LOW ? TRUE : FALSE );
     BOOL isConductInWarningRange = ( conductivity > MAX_COND_SENSOR_CPI_WARNING_HIGH ? TRUE : FALSE );
@@ -273,14 +272,6 @@
     {
         checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH );
     }
-
-    if ( ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) ) ||
-         ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) ) )
-    {
-        status = FALSE;
-    }
-
-    return status;
 #endif
 }