Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -ra60ec05d359c0d3f014015e9080b6dbcef0fea28 -r477515fb4a6518b538fd218a1638ba2958e82d1c
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision a60ec05d359c0d3f014015e9080b6dbcef0fea28)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 477515fb4a6518b538fd218a1638ba2958e82d1c)
@@ -541,7 +541,7 @@
     if ( resID < NUM_OF_DG_RESERVOIRS )
     {
         dgActiveReservoirSet = resID;
-        sendDGSwitchReservoirCommand( resID );
+        sendDGSwitchReservoirCommand( (U32)resID );
         // reset treatment reservoir mgmt. state machine on reservoir switch
         currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE;
     }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra60ec05d359c0d3f014015e9080b6dbcef0fea28 -r477515fb4a6518b538fd218a1638ba2958e82d1c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a60ec05d359c0d3f014015e9080b6dbcef0fea28)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 477515fb4a6518b538fd218a1638ba2958e82d1c)
@@ -577,7 +577,7 @@
  * @param activeReservoir : reservoir ID to set as active.
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGSwitchReservoirCommand( DG_RESERVOIR_ID_T activeReservoir )
+BOOL sendDGSwitchReservoirCommand( U32 activeReservoir )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -586,9 +586,9 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_SWITCH_RESERVOIR_CMD;
-    msg.hdr.payloadLen = sizeof( DG_RESERVOIR_ID_T );
+    msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &activeReservoir, sizeof( DG_RESERVOIR_ID_T ) );
+    memcpy( payloadPtr, &activeReservoir, sizeof( U32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra60ec05d359c0d3f014015e9080b6dbcef0fea28 -r477515fb4a6518b538fd218a1638ba2958e82d1c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a60ec05d359c0d3f014015e9080b6dbcef0fea28)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 477515fb4a6518b538fd218a1638ba2958e82d1c)
@@ -91,7 +91,7 @@
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
-BOOL sendDGSwitchReservoirCommand( DG_RESERVOIR_ID_T activeReservoir );
+BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
 
 // MSG_ID_DG_FILL_CMD
 BOOL sendDGFillCommand( U32 fillToVolumeMl );