Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r5addd92e279ebc0871364fee70e3ac74db21001a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5addd92e279ebc0871364fee70e3ac74db21001a)
@@ -1365,15 +1365,17 @@
 
 /*********************************************************************//**
  * @brief
- * The sendDialysateTempTargetsToDG function constructs a dialysate temperature
- * set points message for DG and queues the msg for transmit on the appropriate CAN channel.
+ * The sendDialysateTempTargetsAndReservoirCycleTimeToDG function constructs a
+ * dialysate temperature set points message and the active reservoir cycle time
+ * for DG and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: Dialysate temperature set points msg constructed and queued.
- * @param primary temperature set point for primary heater
- * @param trimmer temperature set point for trimmer heater
+ * @param trimmer temperature set point for trimmer heater
+ * @param rsrvrCycleTime active reservoir cycle time in milliseconds
+ * @param rsrvrWait2Switch time to switch the inactive and active reservoirs in milliseconds
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer )
+BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1382,11 +1384,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS;
-    msg.hdr.payloadLen = sizeof( F32 ) + sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_T );
 
-    memcpy( payloadPtr, &primary, sizeof( F32 ) );
-    payloadPtr += sizeof( F32 );
-    memcpy( payloadPtr, &trimmer, sizeof( F32 ) );
+    memcpy( payloadPtr, params, sizeof( DG_CMD_DIALYSATE_HEATING_PARAMS_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 );
@@ -2324,11 +2324,11 @@
  *************************************************************************/
 void handleDialysateFlowData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(DIALYSATE_FLOW_METER_DATA_T) )
+    if ( message->hdr.payloadLen == sizeof( DIALYSATE_FLOW_METER_DATA_T ) )
     {
         DIALYSATE_FLOW_METER_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof(DIALYSATE_FLOW_METER_DATA_T) );
+        memcpy( &payload, message->payload, sizeof( DIALYSATE_FLOW_METER_DATA_T ) );
         setDialysateFlowData( payload.measuredDialysateFlowRate );
     }
 }