Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r06dc7b658ce158806edc2c907f9b4462275f7bb9 -r427b37ad929a8d88b5fcb9ae21a4f4146ffd2fef
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 06dc7b658ce158806edc2c907f9b4462275f7bb9)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 427b37ad929a8d88b5fcb9ae21a4f4146ffd2fef)
@@ -7,8 +7,8 @@
 *
 * @file    DGInterface.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      19-Oct-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      25-Oct-2022
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -119,6 +119,7 @@
 
 static void checkDGRestart( void );
 static void checkDGTrimmerHeaterStatus( void );
+static void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag );
 
 /*********************************************************************//**
  * @brief
@@ -201,7 +202,7 @@
  * @param flag to signal the fresh data processing
  * @return None
  *************************************************************************/
-void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag )
+static void checkDGDataFreshness( ALARM_ID_T alarmID, BOOL *dgFreshDataFlag )
 {
     if ( TRUE == *dgFreshDataFlag )
     {
@@ -803,14 +804,16 @@
  * @param resID ID of reservoir to set as active (reservoir for HD to draw from)
  * @return none
  *************************************************************************/
-void cmdSetDGActiveReservoir( DG_RESERVOIR_ID_T resID )
+void cmdSetDGActiveReservoir( DG_SWITCH_RSRVRS_CMD_T *cmd )
 {
+    DG_RESERVOIR_ID_T resID = (DG_RESERVOIR_ID_T)cmd->reservoirID;
+
     if ( resID < NUM_OF_DG_RESERVOIRS )
     {
-        dgActiveReservoirSet = resID;
+        dgActiveReservoirSet                           = resID;
         dgCmdResp[ DG_CMD_SWITCH_RESERVOIR ].commandID = DG_CMD_NONE;
 
-        sendDGSwitchReservoirCommand( (U32)resID );
+        sendDGSwitchReservoirCommand( cmd );
     }
     else
     {