Index: firmware/App/HDCommon.h
===================================================================
diff -u -rbad0628d7a6484bfa8a550fd2a589f56d0a6c53d -r3f2b9de757500da37e0ed8881e4e906d94f3076c
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision bad0628d7a6484bfa8a550fd2a589f56d0a6c53d)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
@@ -23,9 +23,9 @@
 // ********** version **********
 
 #define HD_VERSION_MAJOR        0
-#define HD_VERSION_MINOR        5
-#define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9037
+#define HD_VERSION_MINOR        6
+#define HD_VERSION_MICRO        5
+#define HD_VERSION_BUILD        15
 
 // ********** development build switches **********
 
@@ -40,6 +40,7 @@
     #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 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
@@ -53,10 +54,10 @@
 //    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
-//    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
+    #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