Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -r766708fceb0bdf1af8c7897df29d4f5036bfd3db
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
@@ -32,19 +32,29 @@
 
 // ********** public definitions **********
 
-#define DRAIN_RESERVOIR_TO_VOLUME_ML        200                 ///< Drain reservoir to this volume (in mL) during treatment.
+#define DRAIN_RESERVOIR_TO_VOLUME_ML        200     ///< Drain reservoir to this volume (in mL) during treatment.
 #ifndef V1_5_SYSTEM
-#define FILL_RESERVOIR_TO_VOLUME_ML         1700                ///< Fill reservoir to this volume (in mL) during treatment.
+#define FILL_RESERVOIR_TO_VOLUME_ML         1700    ///< Fill reservoir to this volume (in mL) during treatment.
 #else
-#define FILL_RESERVOIR_TO_VOLUME_ML         1300                ///< Fill reservoir to this volume (in mL) during treatment.
+#define FILL_RESERVOIR_TO_VOLUME_ML         1300    ///< Fill reservoir to this volume (in mL) during treatment.
 #endif
 
+/// Enumeration of load cell sensors.
+typedef enum Load_Cells
+{
+    LOAD_CELL_RESERVOIR_1_PRIMARY = 0,              ///< Primary load cell for reservoir 1.
+    LOAD_CELL_RESERVOIR_1_BACKUP,                   ///< Backup load cell for reservoir 1.
+    LOAD_CELL_RESERVOIR_2_PRIMARY,                  ///< Primary load cell for reservoir 2.
+    LOAD_CELL_RESERVOIR_2_BACKUP,                   ///< Backup load cell for reservoir 2.
+    NUM_OF_LOAD_CELLS                               ///< Number of load cell sensors.
+} LOAD_CELL_T;
+
 /// Enumeration of DG reservoirs.
 typedef enum DG_Reservoirs
 {
-    DG_RESERVOIR_1 = 0,        ///< Reservoir #1.
-    DG_RESERVOIR_2,            ///< Reservoir #2.
-    NUM_OF_DG_RESERVOIRS       ///< Number of reservoirs.
+    DG_RESERVOIR_1 = 0,                             ///< Reservoir #1.
+    DG_RESERVOIR_2,                                 ///< Reservoir #2.
+    NUM_OF_DG_RESERVOIRS                            ///< Number of reservoirs.
 } DG_RESERVOIR_ID_T;
 
 /// Enumeration of DG pressure sensors.
@@ -115,11 +125,13 @@
 
 // ********** public function prototypes **********
 
-void initDGInterface( void );
-void initPreTreatmentReservoirMgmt( void );
-void execPreTreatmentReservoirMgmt( void );
-void initTreatmentReservoirMgmt( void );
-void execTreatmentReservoirMgmt( void );
+void initDGInterface( void );
+
+void execDGInterfaceMonitor( void );
+
+void initPreTreatmentReservoirMgmt( void );
+void initTreatmentReservoirMgmt( void );
+void execTreatmentReservoirMgmt( void );
 
 DG_OP_MODE_T getDGOpMode( void );
 U32 getDGSubMode( void );
@@ -129,6 +141,9 @@
 U32 getDGROPumpPressureSetPt( void );
 F32 getDGROPumpFlowRateMlMin( void );
 U32 getDGDrainPumpRPMSetPt( void );
+F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID );
+F32 getReservoirWeightSmallFilter( DG_RESERVOIR_ID_T resID );
+F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
 
 void setDGOpMode( U32 opMode, U32 subMode );
 void setDialysateTemperatureReadings( F32 temp1, F32 temp2 );
@@ -137,17 +152,21 @@
 void setDGPressures( F32 roIn, F32 roOut, F32 drainIn, F32 drainOut );
 void setDGROPumpData( U32 presSetPt, F32 flowRate );
 void setDGDrainPumpData( U32 rpmSetPt );
+void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup );
 
 void cmdSetDGDialysateTargetTemps( F32 primaryHtrTemp, F32 trimmerHtrTemp );
 void cmdStartDG( void );
 void cmdStopDG( void );
 void cmdSetDGActiveReservoir( DG_RESERVOIR_ID_T resID );
 void cmdStartDGFill( U32 fillToVolMl );
-void cmdStartDGDrain( U32 drainToVolMl );
+void cmdStartDGDrain( U32 drainToVolMl, BOOL tareLoadCell );
 void cmdStartDGTrimmerHeater( void );
 void cmdStopDGTrimmerHeater( void );
 void cmdDGSampleWater( void );
 
+BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value );
+BOOL testResetDialOutLoadCellWeightOverride( U32 sensor );
+
 /**@}*/
 
 #endif