Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4ec54dc76acf9a434fb860c51739a7dd6f72afd6 -r29b65975bb4d6a5720ef39119a9af49fafc902fa
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4ec54dc76acf9a434fb860c51739a7dd6f72afd6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 29b65975bb4d6a5720ef39119a9af49fafc902fa)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @date    (last)      18-Oct-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -63,9 +63,6 @@
 #define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 #define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
-#define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-
 // ********** public function prototypes **********
 
 // Serialize message
@@ -395,6 +392,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 );
 
@@ -422,18 +428,18 @@
 // 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_SEND_ALARMS_COMMAND
+void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
+// MSG_ID_UI_CONFIRMATION_RESULT
+void handleUIConfirmationResponse( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_UI_CONFIRMATION
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
+
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );
 
-#ifdef EMC_TEST_BUILD
-// MSG_ID_CAN_ERROR_COUNT
-BOOL broadcastCANErrorCount( U32 count );
-#endif
-
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -467,9 +473,6 @@
 // MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE
 void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET
-void handleHDSetArterialPressureOffsetRequest( MESSAGE_T *message );
-
 // MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
@@ -815,6 +818,15 @@
 // MSG_ID_HD_SEND_ALARMS_COMMAND
 void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
+// MSG_ID_HD_BLOOD_PUMP_SET_PWM
+void handleTestBloodPumpSetPWM( MESSAGE_T* message );
+
+// MSG_ID_HD_DIAL_IN_SET_PWM
+void handleTestDialInSetPWM( MESSAGE_T* message );
+
+// MSG_ID_HD_DIAL_OUT_SET_PWM
+void handleTestDialOutSetPWM( MESSAGE_T* message );
+
 /**@}*/
 
 #endif