Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27 -rc282822f36836a8127f447c8ac5b8a50e851be63
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -14,9 +14,10 @@
 * @date (original) 08-Apr-2020
 *
 ***************************************************************************/
-
-#include "DialInFlow.h"
+
+#include "DialInFlow.h"
 #include "DGDefs.h"
+#include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
@@ -36,8 +37,8 @@
 #define RESERVOIR_SETTLE_TIME_MS            5000                ///< Time (in ms) allotted for reservoir to settle (after fill, before drain).
 
 #define SIZE_OF_SMALL_LOAD_CELL_AVG         8                   ///< Small load cell moving average has 8 samples.
-#define SIZE_OF_LARGE_LOAD_CELL_AVG         32                  ///< Large load cell moving average has 32 samples.
-
+#define SIZE_OF_LARGE_LOAD_CELL_AVG         32                  ///< Large load cell moving average has 32 samples.
+
 /// States of the treatment reservoir management state machine.
 typedef enum TreatmentReservoirMgmt_States
 {
@@ -83,14 +84,14 @@
 static F32 lgFilteredReservoirWeightInGrams[ NUM_OF_DG_RESERVOIRS ];
 
 // Load cell filtering data
-/// Holds load cell samples for small load cell moving average
+/// Holds load cell samples for small load cell moving average.
 static F32 smLoadCellReadings[ NUM_OF_DG_RESERVOIRS ][ SIZE_OF_SMALL_LOAD_CELL_AVG ];
-static U32 smLoadCellReadingsIdx = 0;                               ///< index for next sample in small load cell rolling average sample array
-static F32 smLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];         ///< rolling total - used to calc small load cell moving average
-/// Holds load cell samples for large load cell moving average
+static U32 smLoadCellReadingsIdx = 0;                               ///< Index for next sample in small load cell rolling average sample array.
+static F32 smLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];         ///< Rolling total - used to calc small load cell moving average.
+/// Holds load cell samples for large load cell moving average.
 static F32 lgLoadCellReadings[ NUM_OF_DG_RESERVOIRS ][ SIZE_OF_LARGE_LOAD_CELL_AVG ];
-static U32 lgLoadCellReadingsIdx = 0;                               ///< index for next sample in large load cell rolling average sample array
-static F32 lgLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];         ///< rolling total - used to calc large load cell moving average
+static U32 lgLoadCellReadingsIdx = 0;                               ///< Index for next sample in large load cell rolling average sample array.
+static F32 lgLoadCellReadingsTotal[ NUM_OF_DG_RESERVOIRS ];         ///< Rolling total - used to calc large load cell moving average.
 
 // DG pumps data
 static F32 dgROPumpFlowRateMlMin = 0.0;                             ///< Latest RO water flow rate reported by the DG.
@@ -456,7 +457,7 @@
  * @param loadCellID ID of load cell to get
  * @return the current load cell weight in grams
  *************************************************************************/
-F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID )
+F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID )
 {
     F32 result = 0.0;
 
@@ -665,6 +666,8 @@
 void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup )
 {
     DG_RESERVOIR_ID_T res;
+    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
+    BOOL inTreatment = ( MODE_TREA == getCurrentOperationMode() ? TRUE : FALSE );
 
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_1_PRIMARY ].data = res1Primary;
     loadCellWeightInGrams[ LOAD_CELL_RESERVOIR_1_BACKUP ].data = res1Backup;
@@ -674,8 +677,7 @@
     // feed new weight samples into filters and update moving averages
     for ( res = DG_RESERVOIR_1; res < NUM_OF_DG_RESERVOIRS; res++ )
     {
-        F32 wt = ( res == DG_RESERVOIR_1 ? res1Primary : res2Primary );
-
+        F32  wt = ( res == DG_RESERVOIR_1 ? res1Primary : res2Primary );
         smLoadCellReadingsTotal[ res ] -= smLoadCellReadings[ res ][ smLoadCellReadingsIdx ];
         lgLoadCellReadingsTotal[ res ] -= lgLoadCellReadings[ res ][ lgLoadCellReadingsIdx ];
         smLoadCellReadings[ res ][ smLoadCellReadingsIdx ] = wt;