Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r43a84133216095b12529dbfcc957bb3738bbc3a2 -r11e082f2ae04aae2948ee53f4d3c3fd3f784914a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 43a84133216095b12529dbfcc957bb3738bbc3a2)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 11e082f2ae04aae2948ee53f4d3c3fd3f784914a)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      18-Feb-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      13-Jul-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -74,9 +74,6 @@
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
-// Serialize message
-U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
-
 // MSG_ID_DG_CHECK_IN
 void handleDGCheckIn( MESSAGE_T *message );
 
@@ -135,6 +132,9 @@
 // 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 );
 
@@ -255,6 +255,9 @@
 // MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM
 void handleConsumableInstallConfirm( MESSAGE_T *message );
 
+// MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE
+BOOL sendConsumableInstallCmdResponse( BOOL accepted, U32 reason );
+
 // MSG_ID_UI_INSTALLATION_CONFIRM
 void handleInstallationConfirm( MESSAGE_T *message );
 
@@ -369,7 +372,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,6 +395,9 @@
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT
 BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
 
+// MSG_ID_HD_REQUEST_DG_SERVICE_MODE
+BOOL sendDGServiceModeRequest();
+
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
@@ -419,6 +425,10 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
+
+// MSG_ID_HD_REQUEST_DG_ALARMS
+BOOL sendRequestForDGResendAlarms( void );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -565,10 +575,8 @@
 // MSG_ID_HD_VALVES_SET_POSITION
 void handleSetHDValvePositionOverrideRequest( MESSAGE_T *message );
 
-#ifdef DEBUG_ENABLED
 // MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
-#endif
 
 // MSG_ID_HD_SOFTWARE_RESET_REQUEST
 void handleHDSoftwareResetRequest( MESSAGE_T *message );
@@ -774,9 +782,6 @@
 // MSG_ID_HD_STOP_RTC_CLOCK
 void handleStopHDRTCClock( MESSAGE_T *message );
 
-// MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OVERRIDE
-void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE
 void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message );
 
@@ -786,6 +791,30 @@
 // MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS
 BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params);
 
+// MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET
+void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_GET_USAGE_INFO_RECORD
+void handleGetHDUsageInfoRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_USAGE_INFO_RECORD
+void handleSetHDUsageInfoRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SEND_USAGE_INFO_RECORD
+BOOL handleSendHDUsageInfoRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* usageInfoAddress );
+
+// MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE
+void handleSetBloodLeak2EmbeddedMode( MESSAGE_T* message );
+
+// MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND
+void handleSetBloodLeakEmbeddedModeCommand( MESSAGE_T* message );
+
+// MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
+
+// MSG_ID_HD_SEND_ALARMS_COMMAND
+void handleResendAllAlarmsCommand(  MESSAGE_T* message );
+
 /**@}*/
 
 #endif