Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra64f4bd62ca1b6065cd8946f5130674e578bc2d7 -r1c628bfd5d6414b74b8cbd083f66839888a8236b
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a64f4bd62ca1b6065cd8946f5130674e578bc2d7)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1c628bfd5d6414b74b8cbd083f66839888a8236b)
@@ -24,8 +24,8 @@
 
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
-#define HD_VERSION_MICRO        5
-#define HD_VERSION_BUILD        20
+#define HD_VERSION_MICRO        0
+#define HD_VERSION_BUILD        0
 
 // ********** development build switches **********
 
@@ -37,26 +37,26 @@
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #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 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 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
 //    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // After POST and homing, open all 4 valves
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
 //    #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
-//    #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
-//    #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
+    #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks
+//    #define ENABLE_ALTERNATE_FLOW           1           // Enable calculation of speed/pressure based flow and publish in lieu of MC motor speed
+    #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
 //    #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_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
-//    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
-    #define SKIP_CAL_CHECK               1
+    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
+    #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
@@ -76,7 +76,7 @@
 //    #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
     #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests