Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8ea2ea3096334f18a1bd38018bc4359e16374d83 -r66cc826068b54bc436cde0fae70a05ba6c1ac974
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8ea2ea3096334f18a1bd38018bc4359e16374d83)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      02-Mar-2022
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -20,11 +20,13 @@
 #include "reg_system.h"
 
 #include "Accel.h"
+#include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
 #include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
+#include "ModeFill.h"
 #include "ModeFlush.h"
 #include "ModeGenIdle.h"
 #include "ModeInitPOST.h"
@@ -453,6 +455,7 @@
     payload.minor = (U08)DG_VERSION_MINOR;
     payload.micro = (U08)DG_VERSION_MICRO;
     payload.build = (U16)DG_VERSION_BUILD;
+    payload.compatibilityRev = (U32)SW_COMPATIBILITY_REV;
     getFPGAVersions( &payload.fpgaId, &payload.fpgaMajor, &payload.fpgaMinor, &payload.fpgaLab );
 
     // create a message record
@@ -3278,13 +3281,43 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetFansDutyCycleOverrideRequest function handles a
- * request to override the fans duty cycle.
+ * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
+ * request to override the acid volume.
  * @details Inputs: none
  * @details Outputs: message handled
- * @param message a pointer to the message to handle
+ * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
+void handleTestUsedAcidVolumeMLOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetUsedAcidVolumeMLOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetUsedAcidVolumeMLOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+/*********************************************************************//**
+* The handleSetFansDutyCycleOverrideRequest function handles a
+* request to override the fans duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
 void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
@@ -3310,6 +3343,38 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The handleTestUsedBicarbVolumeMLOverrideRequest function handles a
+ * request to override the used bicarb volume.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestUsedBicarbVolumeMLOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetUsedBicarbVolumeMLOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetUsedBicarbVolumeMLOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetDGSoftwareConfigRecord function handles a request to get the DG
 * software configuration record.
@@ -3372,4 +3437,36 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestHDCommunicationStatusOverrideRequest function handles a request 
+ * request to override the HD Communication Status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestHDCommunicationStatusOverrideRequest(MESSAGE_T *message)
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetHDCommunicationStatus(payload.state.u32);
+        }
+        else
+        {
+            result = testResetHDCommuncationStatus();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/