Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8 -ref398e685d6cfbdcb8c18fd9319819672c6c9d89
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ef398e685d6cfbdcb8c18fd9319819672c6c9d89)
@@ -1429,7 +1429,7 @@
  * @param activeReservoir reservoir ID to set as active
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGSwitchReservoirCommand( U32 activeReservoir )
+BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1438,9 +1438,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_SWITCH_RESERVOIR_CMD;
-    msg.hdr.payloadLen = sizeof( U32 );
+    msg.hdr.payloadLen = sizeof( DG_SWITCH_RSRVRS_CMD_T );
 
-    memcpy( payloadPtr, &activeReservoir, sizeof( U32 ) );
+    memcpy( payloadPtr, cmd, sizeof( DG_SWITCH_RSRVRS_CMD_T ) );
 
     // 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 );
@@ -1584,7 +1584,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD;
+    msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );