Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Mar-2022
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -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 );
 
@@ -419,6 +422,10 @@
 // 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 );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -565,10 +572,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 +779,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 +788,27 @@
 // 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 handleSendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
+
 /**@}*/
 
 #endif