Index: firmware/App/HDCommon.h
===================================================================
diff -u -r1eac55db00559965a7dc6752fc42a2c54d56f4b9 -rabbad386f4cc94f315300dffef321fe8c03fbd52
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1eac55db00559965a7dc6752fc42a2c54d56f4b9)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision abbad386f4cc94f315300dffef321fe8c03fbd52)
@@ -38,8 +38,8 @@
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
     #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
-//    #define SKIP_POST                       1           // Skip POST tests - all pass
-    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
+    #define SKIP_POST                       1           // Skip POST tests - all pass
+    #define IGNORE_CAL_TIMESTAMP            1           // Ignores calibration time stamp by setting an epoch time temporarily
 //    #define USE_LIBRARY_TIME_FUNCTIONS      1           // Use the C library functions mktime() and gmtime() for epoch<=>date conversions
     #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms
 //    #define DISABLE_3WAY_VALVES             1           // Disable 3-way valves
@@ -56,7 +56,7 @@
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
 //    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
-    #define DISABLE_CAL_CHECK               1           // Disable calibration checks
+    #define SKIP_CAL_CHECK               1
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define RAW_FLOW_SENSOR_DATA            1           // Test build will not filter flow sensor data
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time