Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd5f2ac4d84453feb1b782f35f9d69432977a95f6 -re2e31bba8ccc7b60ba6036377799c71f9ceee63f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d5f2ac4d84453feb1b782f35f9d69432977a95f6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e2e31bba8ccc7b60ba6036377799c71f9ceee63f)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      07-Sep-2022
+* @date    (last)      21-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -32,7 +32,6 @@
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
-#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -95,7 +94,7 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleDGSerialNumberRequest( void );
 
-// MSG_ID_UI_REQUEST_SERVICE_INFO
+// MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
 void handleDGServiceScheduleRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS
@@ -126,8 +125,11 @@
 BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
 
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+BOOL handleDGStartStopTrimmerHeater( MESSAGE_T *message );
 
+// MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD
+void handleHDStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+
 // MSG_ID_DG_SEND_CALIBRATION_DATA
 BOOL sendDGCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
 
@@ -137,9 +139,6 @@
 // MSG_ID_DG_SEND_SERVICE_RECORD
 BOOL sendDGServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
 
-// MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD
-BOOL sendDGScheduledRunsRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* scheduledRcrdAddress );
-
 // MSG_ID_DG_POST_SINGLE_TEST_RESULT
 BOOL sendPOSTTestResult( DG_POST_STATE_T test, BOOL passed );
 
@@ -152,18 +151,21 @@
 // MSG_ID_DG_SEND_USAGE_INFO_RECORD
 BOOL sendDGUsageInfoRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* usageInfoAddress );
 
-// MSG_ID_DG_SCHEDULED_RUNS_INFO
-void handleDGScheduledRunsRequest( MESSAGE_T *message );
-
 // MSG_ID_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
 // MSG_ID_UI_REQUEST_SERVICE_MODE
 void handleServiceModeRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_REQUEST_CPLD_STATUS
+void handleCpldStatusRequest( MESSAGE_T *message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -197,17 +199,14 @@
 // MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
 void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-void handleTestDialysateMeasuredFlowOverrideRequest( MESSAGE_T *message );
+void handleTestMeasuredFlowOverrideRequest( 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 );
+void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
 void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
@@ -338,12 +337,6 @@
 // MSG_ID_DG_SET_SERVICE_RECORD
 void handleSetDGServiceRecord( MESSAGE_T *message );
 
-// MSG_ID_DG_GET_SCHEDULED_RUNS_RECORD
-void handleGetDGScheduledRunsRecord( MESSAGE_T *message );
-
-// MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD
-void handleSetDGScheduledRunsRecord( MESSAGE_T *message );
-
 // MSG_ID_DG_START_STOP_CHEM_DSINFECT
 BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
 
@@ -390,8 +383,11 @@
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
-void handleTestHDCommunicationStatusOverrideRequest(MESSAGE_T *message);
+void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
+void handleSetPrimaryAndTrimmerHeatersTargetTemperature( MESSAGE_T *message );
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
@@ -410,6 +406,31 @@
 // MSG_ID_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
+// MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE
+void handleTestDrainPumpMeasuredCurrentOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE
+void handleTestGenIdlePublishIntervalOverride( MESSAGE_T * message );
+
+// MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE
+void handleTestDGDrainPumpCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE
+void handleTestDGDrainPumpDirectionOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE
+void handleTestDGValvesSensedStateOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE
+void handleTestDGFillModeBroadcastOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE
+void handleTestDGROPumpFeedbackVoltageOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE
+void handleTestDGFillIntegratedVolumeOverrideRequest( MESSAGE_T *message );
+
+
 /**@}*/
 
 #endif