Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision f308cc4c35eab630ebbbde405cfe47d049afeafb)
@@ -7,20 +7,23 @@
 *
 * @file ModeDrain.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) 20-Dec-2019
 *
 ***************************************************************************/
 
+#include "ConductivitySensors.h"
 #include "DrainPump.h"
 #include "LoadCell.h"
 #include "ModeDrain.h"
 #include "OperationModes.h"
+#include "Pressures.h"
 #include "Reservoirs.h"
 #include "Valves.h"
+#include "TemperatureSensors.h"
 
 /**
  *  @addtogroup DGDrainMode
@@ -81,6 +84,11 @@
  *************************************************************************/
 U32 execDrainMode( void )
 {
+    // check inlet water conductivity, temperature, and pressure
+    checkInletWaterConductivity( drainState );
+    checkInletWaterTemperature();
+    checkInletPressure();
+
     // execute current drain state
     switch ( drainState )
     {
@@ -93,7 +101,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, drainState )     // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, drainState ) // TODO - add s/w fault enum to 1st data param
             drainState = DG_DRAIN_STATE_START;
             break;
     }
@@ -116,11 +124,7 @@
     LOAD_CELL_ID_T drainWeightLoadCell = LOAD_CELL_A1;
 
     // determine which load cell to use for drain volume - we want weight of inactive reservoir
-#ifndef BETA_V1_BUILD
     if ( RESERVOIR_1 == getActiveReservoir() )
-#else
-    if ( RESERVOIR_2 == getActiveReservoir() )
-#endif
     {
         drainWeightLoadCell = LOAD_CELL_B1;
     }