Index: firmware/App/DGCommon.h
===================================================================
diff -u -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4 -r34afdc9754641c3bbc867db3176e5b7af537b744
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 34afdc9754641c3bbc867db3176e5b7af537b744)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2022 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    DGCommon.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      09-Nov-2021
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -25,41 +25,46 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        16
+#define DG_VERSION_BUILD        24
 
 // ********** build switches **********
 
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
-//    #define BOARD_WITH_NO_HARDWARE          1
-//    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
-//    #define DISABLE_HEATERS_AND_TEMPS       1
-//    #define DISABLE_ACCELS                  1
-//    #define SKIP_POST                       1
-    #define SKIP_CAL_CHECK               1
-//    #define ENABLE_DIP_SWITCHES             1
-//    #define EMC_TEST_BUILD                  1
-    #define ALARMS_DEBUG                    1
-//    #define HEATERS_DEBUG                   1
-//    #define PRESSURES_DEBUG                 1
- //   #define IGNORE_DRAIN_PUMP_MONITOR       1
-//    #define IGNORE_HEATERS_MONITOR          1
-    #define IGNORE_RO_PUMP_MONITOR          1
-    #define DISABLE_RO_RATIO_CHECK          1
-//    #define DISABLE_COND_SENSOR_CHECK       1
-//    #define DISABLE_WATER_QUALITY_CHECK     1
-    #define DISABLE_RTC_CONFIG              1
-    #define THD_USING_TRO_CONNECTOR         1
-    #define DISABLE_FLOW_CHECK_IN_FILL      1
-    #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
-//    #define NEW_FMD_FLOW_SENSOR             1
+//    #define BOARD_WITH_NO_HARDWARE          1            // Build switch
+//    #define TASK_TIMING_OUTPUT_ENABLED      1            // Build switch   // re-purposes drain pump enable pin for task timing
+//    #define DISABLE_HEATERS_AND_TEMPS       1            // Implement
+//    #define DISABLE_ACCELS                  1            // Implement
+//    #define SKIP_POST                       1            // Not needed
+    #define SKIP_CAL_CHECK               1                 // Implement
+//    #define ENABLE_DIP_SWITCHES             1            // Not needed
+//    #define EMC_TEST_BUILD                  1            // Build switch
+    #define ALARMS_DEBUG                    1              // Not needed
+//    #define HEATERS_DEBUG                   1            // Not needed
+//    #define PRESSURES_DEBUG                 1            // Not needed
+ //   #define IGNORE_DRAIN_PUMP_MONITOR       1            // Build switch
+    #define IGNORE_HEATERS_MONITOR          1              // Build switch
+    #define IGNORE_RO_PUMP_MONITOR          1              // Build switch
+    #define DISABLE_RO_RATIO_CHECK          1              // Implement
+    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom    // Implement
+    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom    // Implement
+    #define DISABLE_RTC_CONFIG              1              // Not needed
+    #define THD_USING_TRO_CONNECTOR         1              // Build switch
+    #define DISABLE_FLOW_CHECK_IN_FILL      1              // Implement
+    #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1          // Not needed
+//    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
+    #define DISABLE_HEATERS_EFFICIENCY      1
+    #define DISABLE_HEAT_DISINFECT_CONDUCTIVITY 1           // Implement
 
+//    #define DISABLE_PRIME_CONCENT_LINES        1
+//    #define DISABLE_BICARB_CONDUCTIVITY_TEST   1
+//    #define DISABLE_ACID_CONDUCTIVITY_TEST     1
     // Turn these flags on to disable dialysate mixing
-    #define DISABLE_DIALYSATE_CHECK         1
-    #define DISABLE_MIXING                  1
-    //#define DISABLE_FLOW_CONTROL_TREATMENT  1
-    #define DISABLE_ACK_ALARM 1
+    #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom  // Implement
+//    #define DISABLE_MIXING                  1                     // Implement
+    //#define DISABLE_FLOW_CONTROL_TREATMENT  1                     // Not needed
+    #define DISABLE_ACK_ALARM 1                                     // Build switch
 
     #include <stdio.h>
     #include <strings.h>
@@ -90,6 +95,7 @@
     U08 fpgaMajor;                          ///< DG FPGA major revision
     U08 fpgaMinor;                          ///< DG FPGA minor revision
     U08 fpgaLab;                            ///< DG FPGA lab revision
+    U32 compatibilityRev;                   ///< DG compatibility revision
 } DG_VERSIONS_T;
 #pragma pack(pop)