Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r1b76127ac6833e64fb04749707ae899052402f3e -r4d0c621f5994e1de8bf7d3337678f7835292ce73
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 1b76127ac6833e64fb04749707ae899052402f3e)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 4d0c621f5994e1de8bf7d3337678f7835292ce73)
@@ -8,7 +8,7 @@
 * @file    DGInterface.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      07-Jul-2023
+* @date    (last)      14-Aug-2023
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -17,7 +17,7 @@
 
 #include <math.h> // To check for NaN
 
-#include "Battery.h"
+#include "CPLD.h"
 #include "DialInFlow.h"
 #include "Dialysis.h"
 #include "DGDefs.h"
@@ -96,8 +96,8 @@
 static BOOL dgOpModeDataFreshFlag = FALSE;                                  ///< Flag to signal the handleDGOpMode() to process fresh dg op mode data
 
 // Reservoir data
-static DG_RESERVOIR_ID_T dgActiveReservoir = DG_RESERVOIR_2;                ///< Latest active reservoir reported by the DG.
-static DG_RESERVOIR_ID_T dgActiveReservoirSet = DG_RESERVOIR_2;             ///< Active reservoir commanded.
+static DG_RESERVOIR_ID_T dgActiveReservoir;                                 ///< Latest active reservoir reported by the DG.
+static DG_RESERVOIR_ID_T dgActiveReservoirSet;                              ///< Active reservoir commanded.
 
 static DG_DISINFECT_UI_STATES_T disinfectsStatus;                           ///< DG disinfects status.
 static DG_MIXING_RATIOS_T dgMixingRatios;                                   ///< DG mixing ratios.
@@ -124,6 +124,7 @@
 {
     U32 i, j;
 
+    // NOTE: the active reservoir is set to reservoir 1 since DG will send active reservoir 1 as active on power up
     dgStarted                       = FALSE;
     dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
@@ -226,7 +227,7 @@
  *************************************************************************/
 void execDGInterfaceMonitor( void )
 {
-    if ( isACPowerLost() != TRUE )
+    if ( getCPLDACPowerLossDetected() != TRUE )
     {
         // Trigger alarm if not receiving new load cell data message in timely manner
         checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
@@ -1310,7 +1311,7 @@
     U32 trimmerState  = dgHeatersData.trimmerHeaterState;
     DG_OP_MODE_T dgOp = getDGOpMode();
 
-    if ( isACPowerLost() != TRUE )
+    if ( getCPLDACPowerLossDetected() != TRUE )
     {
         if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
         {