Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r740929e7f04220e1a74e1a6f8ce71129f40a7be1 -r5e8f96e11c797bddeddfc009c87f20df3b7a8664
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 740929e7f04220e1a74e1a6f8ce71129f40a7be1)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5e8f96e11c797bddeddfc009c87f20df3b7a8664)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      21-Sep-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      21-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -125,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 );
 
@@ -400,6 +403,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