Index: firmware/App/HDCommon.h
===================================================================
diff -u -r708c23e585468515a8467d0056d712b2846b56da -r85b9b8c296b53a034da675bf76948a5075f5c1b0
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 708c23e585468515a8467d0056d712b2846b56da)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 85b9b8c296b53a034da675bf76948a5075f5c1b0)
@@ -39,7 +39,7 @@
 //    #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 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
@@ -64,20 +64,20 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
 //    #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
-//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
-    #define V2_0_SYSTEM                     1           // Build for v2.0 system
+//    #define V2_0_SYSTEM                     1           // Build for v2.0 system
     #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
-//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
     #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
-//    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
-//    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
-//    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
-//    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
+    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
+    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
+    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
     #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps