Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -rfab0257d4913c021698418277e742c2a61e0368e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fab0257d4913c021698418277e742c2a61e0368e)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-May-2023
+* @date    (last)      20-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -99,7 +99,7 @@
 void handleDGSerialNumberRequest( void );
 
 // MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
-void handleDGServiceScheduleRequest( MESSAGE_T *message );
+void handleDGServiceScheduleRequestToUI( MESSAGE_T *message );
 
 // MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS
 void handleDGSendConcentrateMixingRatios( MESSAGE_T *message );
@@ -182,6 +182,18 @@
 // MSG_ID_DG_REQUEST_RO_MODE_ONLY_STATUS
 void requestROOnlyModeStatusFromUI( void );
 
+// MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST
+void handleStartStopDGROPermeateSample( MESSAGE_T* message );
+
+// MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST
+void handleReceiveROPermeatSampleDispenseRequest( MESSAGE_T* message );
+
+// MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD
+void sendROPermeateSampleDispenseReadyToHD( void );
+
+// MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD
+void handleSendDGServiceRecordToHD( MESSAGE_T* message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -396,11 +408,13 @@
 // MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE
 void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message );
 
+#ifndef _RELEASE_
 // MSG_ID_DG_GET_SW_CONFIG_RECORD
 void handleGetDGSoftwareConfigRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_SW_CONFIG_RECORD
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
+#endif
 
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message );
@@ -497,6 +511,9 @@
 // MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE
 void handleTestDGSetConductivitySensorCalTable( MESSAGE_T* message );
 
+// MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE
+void handleTestDGSetRecoverFromFaultModeSignal( MESSAGE_T* message );
+
 /**@}*/
 
 #endif