Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r070554b23739bf16ea2bf9528ebabda1ce0ffeb3 -r16efeb7b3a19e02ae83a553a77f01a3550ff7850
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 070554b23739bf16ea2bf9528ebabda1ce0ffeb3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 16efeb7b3a19e02ae83a553a77f01a3550ff7850)
@@ -264,11 +264,13 @@
  * Outputs : blood flow data msg constructed and queued.
  * @param flowStPt : Current set point for blood flow
  * @param measFlow : Latest measured blood flow
+ * @param measRotorSpd : Latest measured blood pump rotoro speed
  * @param measSpd : Latest measured blood pump speed
- * @param measSpd : Latest measured blood pump motor current
+ * @param measMCspd : Latest measured blood pump motor controller speed
+ * @param measSpd : Latest measured blood pump motor controller current
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measSpd, F32 measCurr )
+BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -279,15 +281,19 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_BLOOD_FLOW_DATA;
-    msg.hdr.payloadLen = sizeof(U32) + sizeof(F32) + sizeof(F32) + sizeof(F32);
+    msg.hdr.payloadLen = sizeof(U32) + sizeof(F32) + sizeof(F32) + sizeof(F32) + sizeof(F32) + sizeof(F32);
 
     memcpy( payloadPtr, &flowStPt, sizeof(U32) );
     payloadPtr += sizeof(U32);
     memcpy( payloadPtr, &measFlow, sizeof(F32) );
     payloadPtr += sizeof(F32);
+    memcpy( payloadPtr, &measRotorSpd, sizeof(F32) );
+    payloadPtr += sizeof(F32);
     memcpy( payloadPtr, &measSpd, sizeof(F32) );
     payloadPtr += sizeof(F32);
-    memcpy( payloadPtr, &measCurr, sizeof(F32) );
+    memcpy( payloadPtr, &measMCSpd, sizeof(F32) );
+    payloadPtr += sizeof(F32);
+    memcpy( payloadPtr, &measMCCurr, sizeof(F32) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding)
     msgSize = serializeMessage( msg, data );
@@ -583,7 +589,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredSpeedOverrideRequest, testSetMeasuredBloodPumpSpeedOverride, testResetMeasuredBloodPumpSpeedOverride )
+DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredSpeedOverrideRequest, testSetMeasuredBloodPumpMCSpeedOverride, testResetMeasuredBloodPumpMCSpeedOverride )
 
 /*************************************************************************
  * @brief handleTestBloodPumpMeasuredCurrentOverrideRequest
@@ -595,7 +601,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredCurrentOverrideRequest, testSetMeasuredBloodPumpCurrentOverride, testResetMeasuredBloodPumpCurrentOverride )
+DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredCurrentOverrideRequest, testSetMeasuredBloodPumpMCCurrentOverride, testResetMeasuredBloodPumpMCCurrentOverride )
 
 /*************************************************************************
  * @brief handleTestBloodFlowBroadcastIntervalOverrideRequest