Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r5cfa1f3d17db625f92f046868812717e3f1f51c3
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 5cfa1f3d17db625f92f046868812717e3f1f51c3)
@@ -26,6 +26,7 @@
 #include "Timers.h"
 #include "Valves.h"
 #include "ModeRecirculate.h"
+#include "ConductivitySensors.h"
 
 /**
  *  @addtogroup DGRecirculateMode
@@ -39,8 +40,8 @@
 
 // ********** private data **********
 
-static DG_RECIRCULATE_MODE_STATE_T recircState;                   ///< Currently active re-circulation state.
-static F32 flushLinesVolumeL = 0.0;                             ///< Volume of water pumped by RO pump during flush lines state.
+static DG_RECIRCULATE_MODE_STATE_T recircState;                ///< Currently active re-circulation state.
+static F32 flushLinesVolumeL = 0.0;                            ///< Volume of water pumped by RO pump during flush lines state.
 
 // ********** private function prototypes **********
 
@@ -105,6 +106,9 @@
  *************************************************************************/
 U32 execRecirculateMode( void )
 {
+    // check inlet water conductivity
+    checkInletWaterConductivity( recircState );
+
     // execute current re-circulate state
     switch ( recircState )
     {
@@ -125,7 +129,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, recircState )     // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, recircState )     // TODO - add s/w fault enum to 1st data param
             recircState = DG_RECIRCULATE_MODE_STATE_START;
             break;
     }