Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r02654dc5b372b3af948ebd28aabb95cc4b51c785 -r3b70632c04247a6973960e1f37ae73eb4384a6b7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 02654dc5b372b3af948ebd28aabb95cc4b51c785)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2021
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -100,7 +100,7 @@
 
 static volatile BOOL dgIsOnlyCANNode = TRUE;                                ///< flag indicating whether DG is alone on CAN bus.
 static U32 canXmitRetryCtr = 0;                                             ///< counter for CAN transmit retries.
-static volatile BOOL hdIsCommunicating = FALSE;                             ///< has HD sent a message since last check
+static OVERRIDE_U32_T hdCommunicationStatus = {0, 0, 0, 0};                 ///< has HD sent a message since last check
 static volatile U32 timeOfLastHDCheckIn = 0;                                ///< last time we received an HD broadcast
 
 // ********** private function prototypes **********
@@ -153,7 +153,7 @@
  *************************************************************************/
 BOOL isHDCommunicating( void )
 {
-    return hdIsCommunicating;
+    return getU32OverrideValue(&hdCommunicationStatus);
 }
 
 /*********************************************************************//**
@@ -496,7 +496,7 @@
                     // if message from HD broadcast channel, update HD comm status
                     if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == MSG_IN_BUFFERS[ i ] )
                     {
-                        hdIsCommunicating = TRUE;
+                        hdCommunicationStatus.data = (U32)TRUE;
                         timeOfLastHDCheckIn = getMSTimerCount();
                     }
                 }
@@ -654,8 +654,7 @@
 {
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
-        hdIsCommunicating = FALSE;
-        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
+        hdCommunicationStatus.data = FALSE;
     }
 }
 
@@ -672,7 +671,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
     }
 }
 
@@ -779,9 +778,9 @@
             {
                 U16 msgID;
 
-                memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+                memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16 ) ], sizeof( U16 ) );
 #ifndef DISABLE_ACK_ALARM
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
 #endif
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
@@ -837,6 +836,10 @@
             handleDrainCmd( message );
             break;
 
+        case MSG_ID_HD_OP_MODE:
+            handleSetHDOperationMode( message );
+            break;
+
         case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleStartStopTreatmentMsg( message );
             break;
@@ -881,6 +884,10 @@
             handleDGScheduledRunsRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1149,10 +1156,18 @@
                 handleTestAlarmInfoSendIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE:
-                handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
+            case MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET:
+                handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
+                handleTestUsedAcidVolumeMLOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE:
+                handleTestUsedBicarbVolumeMLOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_GET_SW_CONFIG_RECORD:
                 handleGetDGSoftwareConfigRecord( message );
                 break;
@@ -1165,11 +1180,81 @@
                 handleSetFansDutyCycleOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE:
+                handleTestHDCommunicationStatusOverrideRequest( message );
+                break;
+
+            case MSG_ID_DG_GET_USAGE_INFO_RECORD:
+                handleGetDGUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_DG_SET_USAGE_INFO_RECORD:
+                handleSetDGUsageInfoRecord( message );
+                break;
+
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
         }
     }
 }
 
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/*********************************************************************//**
+ * @brief
+ * The testSetHDCommunicationStatus function sets the override
+ * of the HD communication status.
+ * @details Inputs: none
+ * @details Outputs: hdCommunicationStatus
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testSetHDCommunicationStatus( U32 value )
+{
+    BOOL result = FALSE;
+
+    if (TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        hdCommunicationStatus.ovData = value;
+        hdCommunicationStatus.override = OVERRIDE_KEY;
+
+    }
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetHDCommuncationStatus function resets the override
+ * of the HD communication status.
+ * @details Inputs: none
+ * @details Outputs: hdCommunicationStatus
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetHDCommuncationStatus( void )
+{
+    BOOL result = FALSE;
+
+    if (TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        hdCommunicationStatus.override = OVERRIDE_RESET;
+        hdCommunicationStatus.ovData = hdCommunicationStatus.ovInitData;
+
+    }
+    return result;
+}
+
 /**@}*/