Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc1e2dfcd544f59788ad1a58e1e8339a475ba4266 -r9b6d9a0db373b39c3d04dd07516fde59b292bbc5
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c1e2dfcd544f59788ad1a58e1e8339a475ba4266)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9b6d9a0db373b39c3d04dd07516fde59b292bbc5)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Sean Nash
-* @date    (last)      08-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      15-Aug-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -372,9 +372,15 @@
 // MSG_ID_UI_RECIRC_CMD
 void handleTreatmentRecircCmd( MESSAGE_T *message );
 
+// MSG_ID_UI_POST_TX_NEXT_REQUEST
+void handlePostTxNextCmd( MESSAGE_T *message );
+
 // MSG_ID_HD_RECIRC_CMD_RESPONSE
 BOOL sendTreatmentRecircCmdResponse( BOOL accepted, U32 rejReason );
 
+// MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE
+BOOL sendPostTxNextCmdResponse( BOOL accepted, U32 rejReason );
+
 // MSG_ID_UI_TX_END_CMD:
 void handleTreatmentEndCmd( MESSAGE_T *message );
 
@@ -467,14 +473,17 @@
 // MSG_ID_DG_START_STOP_FLUSH
 BOOL sendDGStartFlushModeCommand( BOOL start );
 
+// MSG_ID_DG_PARK_CONCENTRATE_PUMPS
+BOOL sendDGParkConcentratePumpsCommand( void );
+
 // MSG_ID_DG_START_STOP_HEAT_DISINFECT
 BOOL sendDGStartHeatDisinfectModeCommand( BOOL start );
 
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT
 BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
 
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH
-BOOL sendDGStartChemicalDisinfectFlushModeCommand( BOOL start );
+BOOL sendDGStartStopChemicalDisinfectFlushModeCommand( BOOL start );
 
 // MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
 void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
@@ -506,11 +515,13 @@
 // MSG_ID_HD_SEND_SW_CONFIG_RECORD
 BOOL sendHDSWConfigRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* swRcrdAddress );
 
+#ifndef _RELEASE_
 // MSG_ID_HD_GET_SW_CONFIG_RECORD
 void handleGetHDSoftwareConfigRecord( MESSAGE_T *message );
 
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
+#endif
 
 // MSG_ID_HD_SEND_USAGE_INFO_RECORD
 BOOL sendHDUsageRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
@@ -545,11 +556,24 @@
 // MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG
 void handleSendChemFlushPassFailToDG( U32 status );
 
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL
+BOOL sendDGStopActiveCoolModeCommand( void );
+
+// MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST
+BOOL sendDGStartStopDGROPermeateSampleModeCommand( BOOL start );
+
+// MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST
+BOOL sendRequestROPermeateSampleCollectionToDG( U32 status );
+
+// MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD
+void handleReceiveROPermeateSampleReadyToDispenseFromDG( MESSAGE_T* message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
 void handleTesterLogInRequest( MESSAGE_T *message );
-BOOL isTestingActivated( void );
+BOOL isTestingActivated( void );
+void setTesterStatusToLoggedOut( void );
 
 // MSG_ID_OFF_BUTTON_STATE_OVERRIDE
 void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
@@ -983,6 +1007,12 @@
 // MSG_ID_HD_SET_TEST_CONFIGURATION
 void handleTestHDSetTestConfig( MESSAGE_T *message );
 
+// MSG_ID_HD_SIGNAL_RECOVER_FROM_FAULT_MODE
+void handleTestHDSetRecoverFromFaultModeSignal( MESSAGE_T* message );
+
+// MSG_ID_HD_RAM_STATUS_OVERRIDE
+void handleTestHDRAMStatusOverrideRequest( MESSAGE_T* message );
+
 /**@}*/
 
 #endif