Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5c430c3ac17fc8ad836fd70b8a3b8a12af44319e -r59357d3831aa60f17ccdfbe0eef1a005935b9a58
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5c430c3ac17fc8ad836fd70b8a3b8a12af44319e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 59357d3831aa60f17ccdfbe0eef1a005935b9a58)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      20-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -48,6 +48,13 @@
 #define ACK_REQUIRED                    TRUE        ///< Require an ACK.
 #define ACK_NOT_REQUIRED                FALSE       ///< Not require an ACK.
 
+/// UI response payload data structure
+typedef struct
+{
+    BOOL accepted;                                  ///< Accepted/Rejected
+    U32 rejectionReason;                            ///< Rejection reason if not accepted.
+} UI_RESPONSE_PAYLOAD_T;
+
 // ********** public function prototypes **********
 
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
@@ -166,14 +173,21 @@
 // MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL
 void handleStartStopDGHeatDisinfectActiveCool( MESSAGE_T* message );
 
-// MSG_ID_REQUEST_CPLD_STATUS
-void handleCpldStatusRequest( MESSAGE_T *message );
+// MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG
+void handleReceiveChemFlushSampleResultsFromHD( MESSAGE_T *message );
 
+// MSG_ID_DG_SET_RO_MODE_ONLY
+void handleSetROOnlyMode( MESSAGE_T* message );
+
+// MSG_ID_DG_REQUEST_RO_MODE_ONLY_STATUS
+void requestROOnlyModeStatusFromUI( void );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
 void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
+void setTesterStatusToLoggedOut( void );
 
 // MSG_ID_DG_ALARM_STATE_OVERRIDE
 void handleTestAlarmStateOverrideRequest( MESSAGE_T *message );
@@ -382,11 +396,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 );
@@ -418,9 +434,6 @@
 // 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 );
 
@@ -451,6 +464,41 @@
 // MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE
 void handleTestDGHeatersDutyCycleOverrideRequest( MESSAGE_T *message );
 
+// MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE
+void handleDGRTCControlReg1StatusOverrideRequest( MESSAGE_T * message );
+
+// MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE
+void handleDGRTCControlReg3StatusOverrideRequest( MESSAGE_T * message );
+
+#ifndef _RELEASE_
+// MSG_ID_DG_NELSON_DISINFECT_SUPPORT
+void handleTestDGNelsonDisinfectSupport( MESSAGE_T *message );
+#endif
+
+// MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS
+void handleTestDGSetDialysateMixingRatios( MESSAGE_T *message );
+
+// MSG_ID_DG_SET_TEST_CONFIGURATION
+void handleTestDGSetTestConfig( MESSAGE_T *message );
+
+// MSG_ID_DG_GET_TEST_CONFIGURATION
+void handleTestDGGetTestConfig( MESSAGE_T* message );
+
+// MSG_ID_DG_RESET_ALL_TEST_CONFIGURATIONS
+void handleTestDGResetAllTestConfigs( MESSAGE_T* message );
+
+// MSG_ID_DG_DIALIN_CHECK_IN
+void handleTestDGDialinCheckIn( MESSAGE_T* message );
+
+// MSG_ID_DG_GET_LOAD_CELLS_TARE_VALUES
+void handleTestDGGetLoadCellsTareValues( MESSAGE_T* message );
+
+// MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES
+void handleTestDGSetLoadCellsTareValues( MESSAGE_T* message );
+
+// MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE
+void handleTestDGSetConductivitySensorCalTable( MESSAGE_T* message );
+
 /**@}*/
 
 #endif