Index: HDDefs.h
===================================================================
diff -u -ra419b56fd034a3ddd0740f7e87e7f5732a54dcb6 -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba
--- HDDefs.h	(.../HDDefs.h)	(revision a419b56fd034a3ddd0740f7e87e7f5732a54dcb6)
+++ HDDefs.h	(.../HDDefs.h)	(revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba)
@@ -53,6 +53,7 @@
 {
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
+    POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_RTC,                                     ///< Run RTC test state
@@ -208,8 +209,6 @@
     NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state
     NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state
     NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state
-    NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE,                ///< No cartridge leak detectors self-test state
-    NO_CART_SELF_TESTS_BUBBLES_STATE,                       ///< No cartridge air bubbles self-test state
     NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state
     NO_CART_SELF_TESTS_HOME_VALVES_STATE,                   ///< No cartridge home valves state
     NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE,             ///< No cartridge home syringe pump state