Index: firmware/App/HDCommon.h
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -39,25 +39,24 @@
 //    #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                                // 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
+//    #define SKIP_POST                       1           // Skip POST tests - all pass                         // TODO remove this
+//    #define DISABLE_AIR_TRAP_LEVELING_ALARM 1           // Disable air trap level control alarms              // TODO sw config implemented
 //    #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_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message  // TODO sw config implemented
 //    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
 //    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
-    #define WORN_OUT_CARTRIDGE              1           // Running with an old worn out cartridge (max wear)
+//    #define WORN_OUT_CARTRIDGE              1           // Running with an old worn out cartridge (max wear)           // TODO sw config implemented
 //    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor
-    #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_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_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks                       // TODO sw config implemented
+//    #define DISABLE_PUMP_FLOW_CHECKS        1           // Do not error on HD pump flow checks                            // TODO sw config implemented
+//    #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks                           // TODO sw config implemented
+//    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks                       // TODO sw config implemented
+//    #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality                                     // TODO sw config implemented
+//    #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy       // TODO sw config implemented
+//    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks                                     // TODO sw config implemented
 //    #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)
@@ -78,7 +77,7 @@
 //    #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 DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently  // TODO New config implemented
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST