Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 94a190522ce398399c7b93c59f788d7666ec0060)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -24,13 +24,15 @@
 #include "Fans.h"
 #include "FluidLeak.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -52,6 +54,8 @@
 
 // ********** public function prototypes **********
 
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
@@ -180,9 +184,15 @@
 // MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
 void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
+void handleTestDialysateMeasuredFlowOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
+void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_DRAIN_PUMP_SET_RPM
 void handleTestSetDrainPumpRPM( MESSAGE_T *message );
 
@@ -270,7 +280,10 @@
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE
+// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW
 void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
@@ -321,15 +334,21 @@
 // MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE
 void handleFilterFlushTimePeriodOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_FANS_RPM_OVERRIDE
-void handleFansRPMOverride( MESSAGE_T *message );
+// MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION
+void handleTestBlockMessagesRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_STOP_RTC_CLOCK
 void handleStopDGRTCClock( MESSAGE_T * message );
 
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif