Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rab6ac1bb140201e5737d594b3456038ea9e4725f -r2496e9225fa1b2c627d625def02515a0f0dd5793
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ab6ac1bb140201e5737d594b3456038ea9e4725f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2496e9225fa1b2c627d625def02515a0f0dd5793)
@@ -19,11 +19,13 @@
 #include <string.h>     // for memcpy()
 
 #include "DrainPump.h"
+#include "Heaters.h"
 #include "LoadCell.h"
 #include "MsgQueues.h"
 #include "ModeStandby.h"
 #include "ModeRecirculate.h"
 #include "OperationModes.h"
+#include "Pressures.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
 #include "RTC.h"
@@ -91,6 +93,12 @@
     U32 drainToVolumeMl;
 } RESERVOIR_DATA_T;
 
+typedef struct
+{
+    U32 targetPrimaryHeaterTemp;
+    U32 targetTrimmerHeaterTemp;
+} TARGET_TEMPS_PAYLOAD_T;
+
 #pragma pack(pop)
 
 // ********** private data **********
@@ -580,7 +588,18 @@
  *************************************************************************/
 void handleSetDialysateTemperatureCmd( MESSAGE_T *message )
 {
-    // TODO - parse and send temp targets to heaters module
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(TARGET_TEMPS_PAYLOAD_T) )
+    {
+        TARGET_TEMPS_PAYLOAD_T payload;
+
+        result = TRUE;
+        memcpy( &payload, message->payload, sizeof(TARGET_TEMPS_PAYLOAD_T) );
+        //setPrimaryHeaterTargetTemperature( (F32)payload.targetPrimaryHeaterTemp );
+        //setTrimmerHeaterTargetTemperature( (F32)payload.targetTrimmerHeaterTemp );
+    }
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
 /*************************************************************************
@@ -635,7 +654,7 @@
 
         result = TRUE;
         memcpy( &reservoirID, message->payload, sizeof(U32) );
-        setActiveReservoir( (RESERVOIR_ID_T)reservoirID );
+        setActiveReservoirCmd( (RESERVOIR_ID_T)reservoirID );
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
@@ -659,7 +678,7 @@
 
         result = TRUE;
         memcpy( &fillToVolumeMl, message->payload, sizeof(U32) );
-        startFill( fillToVolumeMl );
+        startFillCmd( fillToVolumeMl );
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
@@ -684,7 +703,7 @@
         result = TRUE;
         memcpy( &drainToVolMl, message->payload, sizeof(U32) );
 
-        startDrain( drainToVolMl );
+        startDrainCmd( drainToVolMl );
     }
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }