Index: firmware/App/HDCommon.h
===================================================================
diff -u -r0777f4cdb777147312925391be3422cc5b52a401 -r3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 0777f4cdb777147312925391be3422cc5b52a401)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3cdfce9c1c4fa0fd205756eb458ac5d3bffc9045)
@@ -48,17 +48,17 @@
     #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
 //    #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)
 //    #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_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
-    #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
     #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_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
     #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)
@@ -73,12 +73,13 @@
 //    #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
+    #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
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 //    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
     #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
 
     // Skip Pre-Treatment and get to treatment as soon as possible
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.