Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r364c00d074d23989f2d714189a8c89964e32b458 -r1f1b53030a930c542646d9d88c7db0c3a945f150
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 364c00d074d23989f2d714189a8c89964e32b458)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1f1b53030a930c542646d9d88c7db0c3a945f150)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      25-May-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      07-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -154,6 +154,12 @@
 // MSG_ID_DG_SCHEDULED_RUNS_INFO
 void handleDGScheduledRunsRequest( 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_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
@@ -364,6 +370,12 @@
 // 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 );
+
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
@@ -385,12 +397,27 @@
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest(MESSAGE_T *message);
 
+// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
+void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
+
+// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
+void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_USAGE_INFO_RECORD
 void handleSetDGUsageInfoRecord( MESSAGE_T *message );
 
+// MSG_ID_DG_SET_OP_MODE_REQUEST
+void handleTestSetOpModeRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_RESERVOIR_TARE_REQUEST
+void handleTestTareReservoirRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_OP_MODE
+BOOL handleSetHDOperationMode( MESSAGE_T *message );
+
 // MSG_ID_HD_REQUEST_DG_ALARMS
 void handleResendAllAlarmsCommand( MESSAGE_T *message );