Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r6a8d904f4316ed9d9f2f14f99afde63bef38eace
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6a8d904f4316ed9d9f2f14f99afde63bef38eace)
@@ -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    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      11-Nov-2022
+* @date    (last)      14-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -900,7 +900,7 @@
                 U16 msgID;
 
                 memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
@@ -1163,6 +1163,10 @@
             handleUIConfirmationResponse( message );
             break;
 
+        case MSG_ID_HD_SET_SERVICE_TIME:
+            handleSetHDServiceTime( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1376,7 +1380,7 @@
                 handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE:
+            case MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE:
                 handleHDDialInPumpRotorCountOverrideRequest( message );
                 break;
 
@@ -1688,6 +1692,18 @@
                 handleTestDialOutSetPWM( message );
                 break;
 
+            case MSG_ID_HD_NV_RECORD_CRC_OVERRIDE:
+                handleTestHDNVRecordCRCOverride( message );
+                break;
+
+            case MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE:
+                handleAirPumpIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_AIR_PUMP_SET_STATE:
+                handleAirPumpSetState( message );
+                break;
+
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore