Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500 -r402885eda2ed755a079c854d1228ac5f76cbec7c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0bce81180c0ba2b25f5d501ed6aa6b2f9a8b2500)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 402885eda2ed755a079c854d1228ac5f76cbec7c)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @date    (last)      22-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -398,6 +398,15 @@
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT
 BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
 
+// MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
+void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
+
+// MSG_ID_HD_REQUEST_DG_SERVICE_MODE
+BOOL sendDGServiceModeRequest( void );
+
+// MSG_ID_UI_REQUEST_SERVICE_MODE
+void handleUIServiceModeRequest( MESSAGE_T *message );
+
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
@@ -425,9 +434,6 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
-// MSG_ID_UI_REQUEST_SERVICE_MODE
-void handleUIServiceModeRequest( MESSAGE_T *message );
-void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
 
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );