Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rb61c8330905634762e69ed10fb6614a77552fd54 -r7593a04d1121869dffb536f31c20c57cf571611b
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision b61c8330905634762e69ed10fb6614a77552fd54)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 7593a04d1121869dffb536f31c20c57cf571611b)
@@ -18,6 +18,7 @@
 #include <math.h> // To check for NaN
 
 #include "Battery.h"
+#include "CPLD.h"
 #include "DialInFlow.h"
 #include "Dialysis.h"
 #include "DGDefs.h"
@@ -203,7 +204,7 @@
  *************************************************************************/
 static void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag )
 {
-    if ( TRUE == *dgFreshDataFlag )
+    if ( ( TRUE == *dgFreshDataFlag ) || ( getCPLDACPowerLossDetected() != FALSE ) )
     {
         *dgFreshDataFlag = FALSE;
         checkPersistentAlarm( alarmID, FALSE, 0.0, 0.0 );
@@ -233,27 +234,28 @@
  *************************************************************************/
 void execDGInterfaceMonitor( void )
 {
-    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 );
+    // 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 );
 
-        // Trigger alarm if not receiving new dialysate temperature data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
+    // Trigger alarm if not receiving new dialysate temperature data message in timely manner
+    checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
 
-        // Trigger alarm if not receiving new reservoirs data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag );
+    // Trigger alarm if not receiving new reservoirs data message in timely manner
+    checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag );
 
-        // Trigger alarm if not receiving new DG op mode message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
+    // Trigger alarm if not receiving new DG op mode message in timely manner
+    checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
 
-        // Check to see if DG has restarted
-        checkDGRestart();
+    // Check to see if DG has restarted
+    checkDGRestart();
 
-        // Check the status of the trimmer heater
-        if ( ++dgTrimmerTempCheckTimerCtr >= DG_TRIMMER_HTR_CHECK_INTERVAL )
+    // Check the status of the trimmer heater
+    if ( ++dgTrimmerTempCheckTimerCtr >= DG_TRIMMER_HTR_CHECK_INTERVAL )
+
+    {
+        dgTrimmerTempCheckTimerCtr = 0;
+        if ( getCPLDACPowerLossDetected() != TRUE )
         {
-            dgTrimmerTempCheckTimerCtr = 0;
             checkDGTrimmerHeaterStatus();
         }
     }
@@ -1258,25 +1260,21 @@
     U32 trimmerState  = dgHeatersData.trimmerHeaterState;
     DG_OP_MODE_T dgOp = getDGOpMode();
 
-    if ( getCPLDACPowerLossDetected() != TRUE )
+    if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
     {
-        if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
+        // In heat disinfect and chemical disinfect, the trimmer heater is controlled by the DG itself so no commands from HD should be sent
+        // regarding the trimmer heater.
+        if ( ( TRUE == dgTrimmerHeaterOn ) && ( HEATER_EXEC_STATE_OFF == trimmerState ) )
         {
-            // In heat disinfect and chemical disinfect, the trimmer heater is controlled by the DG itself so no commands from HD should be sent
-            // regarding the trimmer heater.
-            if ( ( TRUE == dgTrimmerHeaterOn ) && ( HEATER_EXEC_STATE_OFF == trimmerState ) )
-            {
-                cmdStartDGTrimmerHeater();
-            }
-            else if ( ( FALSE == dgTrimmerHeaterOn ) && ( trimmerState != HEATER_EXEC_STATE_OFF ) )
-            {
-                cmdStopDGTrimmerHeater();
-            }
+            cmdStartDGTrimmerHeater();
         }
+        else if ( ( FALSE == dgTrimmerHeaterOn ) && ( trimmerState != HEATER_EXEC_STATE_OFF ) )
+        {
+            cmdStopDGTrimmerHeater();
+        }
     }
 }
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/