Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r8e6488e189349e0f87f2fb21fa8176aced0b5a43 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,21 +7,24 @@
 *
 * @file ModeFill.c
 *
-* @author (last) Sean Nash
-* @date (last) 02-Jul-2020
+* @author (last) Quang Nguyen
+* @date (last) 13-Aug-2020
 *
 * @author (original) Leonardo Baloa
 * @date (original) 19-Nov-2019
 *
 ***************************************************************************/
 
+#include "ConductivitySensors.h"
 #include "FPGA.h"
 #include "LoadCell.h"
+#include "ModeFill.h"
 #include "OperationModes.h"
+#include "Pressures.h"
 #include "Reservoirs.h"
 #include "Timers.h"
 #include "Valves.h"
-#include "ModeFill.h"
+#include "TemperatureSensors.h"
 
 /**
  *  @addtogroup DGFillMode
@@ -85,6 +88,11 @@
  *************************************************************************/
 U32 execFillMode( void )
 {
+    // check inlet water conductivity, temperature, and pressure
+    checkInletWaterConductivity( fillState );
+    checkInletWaterTemperature();
+    checkInletPressure();
+
     // execute current Fill state
     switch ( fillState )
     {
@@ -153,7 +161,6 @@
         result = DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION;
     }
 
-
     // determine which load cell to use for fill volume - we want weight of inactive reservoir
     if ( RESERVOIR_1 == getActiveReservoir() )
     {