Index: firmware/App/HDCommon.h
===================================================================
diff -u -rf9570a9717805d0759622da836a33ee04f3fa40f -re8053e6bdafd0638102e01c4250dfd74c0850ba1
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f9570a9717805d0759622da836a33ee04f3fa40f)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e8053e6bdafd0638102e01c4250dfd74c0850ba1)
@@ -8,7 +8,7 @@
 * @file    HDCommon.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      23-May-2022
+* @date    (last)      22-Sep-2022
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        50
+#define HD_VERSION_BUILD        58
 
 // ********** development build switches **********
 
@@ -42,12 +42,9 @@
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
-      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
+//      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
 //      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
-      // TODO stays as a build switch until the calibration structure is updated with the build
-      #define SKIP_CAL_CHECK                  1           // Implement software configuration
-
     #include <stdio.h>
     #include <strings.h>
 #endif