Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
@@ -32,24 +32,34 @@
     MSG_ID_BLOOD_FLOW_DATA,                     // 5
     MSG_ID_DG_CHECK_IN,                         // 6
     MSG_ID_UI_CHECK_IN,                         // 7
+    MSG_ID_DIALYSATE_FLOW_DATA,                 // 8
 
     // service/test CAN messages
 
-    MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,       // 0x8000
+    MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,                       // 0x8000
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,
-    MSG_ID_HD_MESSAGE,                          // 0x8001
-    MSG_ID_OFF_BUTTON_STATE_OVERRIDE,           // 0x8002
-    MSG_ID_STOP_BUTTON_STATE_OVERRIDE,          // 0x8003
-    MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,         // 0x8004
-    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,      // 0x8005
-    MSG_ID_ALARM_STATE_OVERRIDE,                // 0x8006
-    MSG_ID_ALARM_TIME_OVERRIDE,                 // 0x8007
-    MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE,          // 0x8008
-    MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE,            // 0x8009
-    MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE,      // 0x800A
-    MSG_ID_BLOOD_PUMP_MEAS_CURR_OVERRIDE,       // 0x800B
-    MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE,   // 0x800C
-    MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE, // 0x800D
+    MSG_ID_HD_MESSAGE,                                          // 0x8001
+    MSG_ID_OFF_BUTTON_STATE_OVERRIDE,                           // 0x8002
+    MSG_ID_STOP_BUTTON_STATE_OVERRIDE,                          // 0x8003
+    MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,                         // 0x8004
+    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,                      // 0x8005
+    MSG_ID_ALARM_STATE_OVERRIDE,                                // 0x8006
+    MSG_ID_ALARM_TIME_OVERRIDE,                                 // 0x8007
+    MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE,                          // 0x8008
+    MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE,                            // 0x8009
+    MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE,                   // 0x800A
+    MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE,                    // 0x800B
+    MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE,                   // 0x800C
+    MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE,                 // 0x800D
+    MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE,                      // 0x800E
+    MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE,                // 0x800F
+    MSG_ID_DIAL_FLOW_SET_PT_OVERRIDE,                           // 0x8010
+    MSG_ID_DIAL_FLOW_MEAS_OVERRIDE,                             // 0x8011
+    MSG_ID_DIAL_PUMP_MC_MEAS_SPEED_OVERRIDE,                    // 0x8012
+    MSG_ID_DIAL_PUMP_MC_MEAS_CURR_OVERRIDE,                     // 0x8013
+    MSG_ID_DIAL_FLOW_SEND_INTERVAL_OVERRIDE,                    // 0x8014
+    MSG_ID_DIAL_PUMP_MEAS_SPEED_OVERRIDE,                       // 0x8015
+    MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE,                 // 0x8016
     END_OF_MSG_IDS
 } MSG_ID_T;
 
@@ -62,13 +72,16 @@
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 // MSG_ID_ALARM_TRIGGERED
-BOOL broadcastAlarmTriggered( ALARM_ID_T alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 // MSG_ID_ALARM_CLEARED
-BOOL broadcastAlarmCleared( ALARM_ID_T alarm );
+BOOL broadcastAlarmCleared( U16 alarm );
 
 // MSG_ID_BLOOD_FLOW_DATA
-BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr );
+BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC );
 
+// MSG_ID_DIALYSATE_FLOW_DATA
+BOOL broadcastDialInFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC );
+
 // MSG_ID_DG_CHECK_IN
 void handleDGCheckIn( MESSAGE_T *message );
 // MSG_ID_UI_CHECK_IN
@@ -113,13 +126,41 @@
 // MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE
 void handleTestBloodFlowMeasuredOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE
-void handleTestBloodPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+// MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
+void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_BLOOD_PUMP_MEAS_CURR_OVERRIDE
-void handleTestBloodPumpMeasuredCurrentOverrideRequest( MESSAGE_T *message );
+// MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE
+void handleTestBloodPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE
 void handleTestBloodFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE
+void handleTestBloodPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+void handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_FLOW_SET_PT_OVERRIDE
+void handleTestDialFlowSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_FLOW_MEAS_OVERRIDE
+void handleTestDialFlowMeasuredOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_PUMP_MC_MEAS_SPEED_OVERRIDE
+void handleTestDialPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_PUMP_MC_MEAS_CURR_OVERRIDE
+void handleTestDialPumpMCMeasuredCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_FLOW_SEND_INTERVAL_OVERRIDE
+void handleTestDialFlowBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_PUMP_MEAS_SPEED_OVERRIDE
+void handleTestDialPumpMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
+void handleTestDialPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
+
+
 #endif