Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd7b793881e8414f2daf75825d5de4e25a25d10ac -rf760ffc4b10556e5186e9ceb90294262063440ca
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d7b793881e8414f2daf75825d5de4e25a25d10ac)
+++ 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)      03-Nov-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"
@@ -80,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
@@ -431,6 +435,9 @@
 // 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 );
+
 // MSG_ID_HD_SEND_ALARMS_COMMAND
 void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
@@ -455,6 +462,9 @@
 // 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
@@ -831,7 +841,7 @@
 void handleSetBloodLeakEmbeddedModeCommand( MESSAGE_T* message );
 
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
-BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
 // MSG_ID_HD_SEND_ALARMS_COMMAND
 void handleResendAllAlarmsCommand(  MESSAGE_T* message );
@@ -845,6 +855,15 @@
 // 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