Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1978e8476dc44688ed69531c236c154829ab8a76 -rf760ffc4b10556e5186e9ceb90294262063440ca
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1978e8476dc44688ed69531c236c154829ab8a76)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @author  (last)      Sean Nash
+* @date    (last)      18-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -17,7 +17,8 @@
 
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
-
+
+#include "AirPump.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "BloodLeak.h"
@@ -63,9 +64,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
@@ -83,13 +81,16 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionRequest( MESSAGE_T *message );
 
+// MSG_ID_REQUEST_FW_VERSIONS
+BOOL sendFWVersionRequest( void );
+
 // MSG_ID_HD_UI_VERSION_INFO_RESPONSE
 void handleUIVersionResponse( MESSAGE_T *message );
 
 // MSG_ID_HD_UI_VERSION_INFO_REQUEST
 BOOL sendUIVersionRequest( void );
 
-// MSG_ID_REQUEST_FW_VERSIONS
+// MSG_ID_HD_SERIAL_NUMBER
 void handleHDSerialNumberRequest( void );
 
 // MSG_ID_UI_REQUEST_SERVICE_INFO
@@ -132,19 +133,25 @@
 // MSG_ID_DG_POST_FINAL_TEST_RESULT
 void handleDGPOSTFinalResult( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT
+BOOL sendUIRequestPOSTFinalResult( void );
+
 // MSG_ID_UI_POST_FINAL_TEST_RESULT
 void handleUIPOSTFinalResult( MESSAGE_T *message );
 
 // MSG_ID_LOAD_CELL_READINGS
-void handleLoadCellReadingsFromDG( MESSAGE_T *message );
+void handleLoadCellReadingsFromDG( MESSAGE_T *message );
+
+// MSG_ID_DG_HEATERS_DATA
+void handleDGHeatersData( MESSAGE_T *message );
 
 // MSG_ID_DG_TEMPERATURE_DATA:
 void handleDGTemperatureData( MESSAGE_T *message );
 
 // MSG_ID_RO_PUMP_DATA:
 void handleROPumpData( MESSAGE_T *message );
 
-// MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+// MSG_ID_DG_FLOW_SENSORS_DATA
 void handleDialysateFlowData( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_DATA:
@@ -354,7 +361,7 @@
 BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
-BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
+BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd );
 
 // MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
@@ -369,7 +376,7 @@
 BOOL sendDGStartStopCommand( BOOL start );
 
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
 
 // MSG_ID_DG_SAMPLE_WATER_CMD
 BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
@@ -392,9 +399,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();
+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,12 +435,36 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
+// MSG_ID_HD_SEND_USAGE_INFO_RECORD
+BOOL sendHDUsageRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
 
-#ifdef EMC_TEST_BUILD
-// MSG_ID_CAN_ERROR_COUNT
-BOOL broadcastCANErrorCount( U32 count );
-#endif
-
+// 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 );
+
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+BOOL sendDGUsageInfoRequestToDG( void );
+
+// MSG_ID_HD_REQUEST_DG_SERVICE_INFO
+BOOL sendDGServiceRequestToDG( void );
+
+// MSG_ID_DG_SERVICE_SCHEDULE_DATA
+void handleDGServiceScheduleData( MESSAGE_T *message );
+
+// MSG_ID_DG_USAGE_DATA
+void handleDGUsageInfoData( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SERVICE_TIME
+void handleSetHDServiceTime( MESSAGE_T *message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -461,8 +498,8 @@
 // MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE
 void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET
-void handleHDSetArterialPressureOffsetRequest( MESSAGE_T *message );
+// MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE
+void handleHDDialInPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
@@ -804,8 +841,29 @@
 void handleSetBloodLeakEmbeddedModeCommand( MESSAGE_T* message );
 
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
-BOOL handleSendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
+// 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 );
+
+// MSG_ID_HD_NV_RECORD_CRC_OVERRIDE
+void handleTestHDNVRecordCRCOverride( MESSAGE_T *message );
+
+// MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE
+void handleAirPumpIntervalOverrideRequest( MESSAGE_T* message );
+
+// MSG_ID_HD_AIR_PUMP_SET_STATE
+void handleAirPumpSetState( MESSAGE_T * message );
+
 /**@}*/
 
 #endif