Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r1fac9ba116252c4919505b7b8fee80c175c81c86 -r06338303884d9955097ea055b25976bc99e83274
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 1fac9ba116252c4919505b7b8fee80c175c81c86)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 06338303884d9955097ea055b25976bc99e83274)
@@ -25,7 +25,7 @@
 #include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -58,12 +58,12 @@
 
 // ********** private data **********
 
-// DG status
-static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
+// DG status
+static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
-static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // DG sensor data
 static F32 dgDialysateTemp;                                                 ///< Dialysate temperature reported by the DG.
@@ -125,12 +125,12 @@
     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;
+    dgStarted                       = FALSE;
+    dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
-    dgTrimmerTempCheckTimerCtr      = 0;
-    dgActiveReservoirSet            = DG_RESERVOIR_2;
-    dgActiveReservoir               = DG_RESERVOIR_2;
+    dgTrimmerTempCheckTimerCtr      = 0;
+    dgActiveReservoirSet            = DG_RESERVOIR_1;
+    dgActiveReservoir               = DG_RESERVOIR_1;
     dgDialysateTemp                 = 0.0F;
     dgCurrentOpMode                 = DG_MODE_INIT;
     dgSubMode                       = 0;
@@ -459,14 +459,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the latest dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -510,14 +510,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: disinfectsStatus
+ * The getDialysateTemperature function returns the DG dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the latest dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r13781ef1a6a277573d0d8b6ea58af67ed0340c67 -r06338303884d9955097ea055b25976bc99e83274
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 13781ef1a6a277573d0d8b6ea58af67ed0340c67)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 06338303884d9955097ea055b25976bc99e83274)
@@ -76,6 +76,9 @@
 /// Interval (in task intervals) at which to publish standby mode data to CAN bus.
 static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 };
 
+static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY );              ///< HD/DG 6-month service interval in seconds.
+static BOOL homingInitiated;                                                                   ///< Flag indicates actuator homing has been initiated from standby mode.
+
 // ********** private function prototypes **********
 
 static HD_STANDBY_STATE_T handleStandbyModeStartState( void );