Index: firmware/App/HDCommon.h
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -38,7 +38,7 @@
 //    #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
     // TODO convert the new configuration way
-    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio
+//    #define DISABLE_ALARM_AUDIO             1           // Disable alarm audio                                // TODo sw config implemented
 //    #define SKIP_POST                       1           // Skip POST tests - all pass
 //    #define DONT_SKIP_NV_POST               1           // Do not skip NV Data POST
     #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms
@@ -58,9 +58,9 @@
     #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_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range                         // TODO sw config implemented
-    #define DISABLE_VENOUS_PRESSURE_CHECK   1           // Do not error on venous pressure out of range                           // TODO sw config implemented
-//    #define USE_PBO_AS_PBA                  1           // PBo readings used for PBA, PBo replaced with fixed pressure (100 mmHg)
+//    #define DISABLE_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range                         // TODO sw config implemented
+//    #define DISABLE_VENOUS_PRESSURE_CHECK   1           // Do not error on venous pressure out of range                           // TODO sw config implemented
+    #define USE_PBO_AS_PBA                  1           // PBo readings used for PBA, PBo replaced with fixed pressure (100 mmHg)
 
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
@@ -86,16 +86,16 @@
     #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
     #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm
     #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
-//    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test                // TODO New config implemented
-//    #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm                    // TODO New config implemented
+//    #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test                  // TODO New config implemented
+//    #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm                      // TODO New config implemented
 
     // Skip Pre-Treatment and get to treatment as soon as possible
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.                         // TODO New config implemented
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water              // TODO New config implemented
-    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests     // TODO New config implemented
-    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
-    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.                         // TODO New config implemented
+//    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water              // TODO New config implemented
+//    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests     // TODO New config implemented
+//    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests            // TODO New config implemented
+//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime                     // TODO New config implemented
+//    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests      // TODO New config implemented
 
     #include <stdio.h>
     #include <strings.h>