Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1177293b3166db6a2bc6e19c6fdf488d064fd13c -rb7d279735312c0f04dd53d8903bf21c520b2beee
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1177293b3166db6a2bc6e19c6fdf488d064fd13c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b7d279735312c0f04dd53d8903bf21c520b2beee)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Hung Nguyen
-* @date    (last)      15-Feb-2022
+* @author  (last)      Darren Cox
+* @date    (last)      17-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -72,25 +72,6 @@
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0 * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
 
-/// Wet self-tests state machine.
-typedef enum Wet_Self_Tests_State
-{
-    WET_SELF_TESTS_START_STATE = 0,                         ///< Wet self-tests starting state.
-    WET_SELF_TESTS_SETUP_STATE,                             ///< Setup reservoirs for wet self-tests.
-    WET_SELF_TESTS_BUBBLES_STATE,                           ///< Wet self-test air bubble detectors state.
-    WET_SELF_TESTS_PRIME_CHECK_STATE,                       ///< Prime check wet self-tests state, checks for primed patient lines.
-    WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE,               ///< Blood leak detector self-test state.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE,          ///< Setup valve and start dialysate pump for first displacement.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE,                ///< Fill reservoir 2 with 100 mL of dialysate from reservoir 1 state.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE,         ///< After first displacement completed verify state.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE,         ///< Setup valve and start dialysate pump for second displacement.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE,               ///< Fill reservoir 1 with 300 mL of dialysate from reservoir 2 state.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE,        ///< After first displacement completed verify state.
-    WET_SELF_TESTS_STOPPED_STATE,                           ///< Wet self-test stopped state.
-    WET_SELF_TESTS_COMPLETE_STATE,                          ///< Wet self-test complete state.
-    NUM_OF_WET_SELF_TESTS_STATES                            ///< Number of wet self-tests states.
-} WET_SELF_TESTS_STATE_T;
-
 // ********** private data **********
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.
@@ -235,11 +216,15 @@
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
-#ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
-#else
-    useHeparin = FALSE;
-#endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+    }
+    else
+    {
+        useHeparin = FALSE;
+    }
+
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
     runPumpStartTime = 0;
     havePumpsStarted = FALSE;
@@ -281,7 +266,7 @@
             break;
 
         case NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE:
-            execDialInFlowTest();
+            // TODO as of now, the dialysate flow self test only gets the calibration record so it is only called in POST
             currentNoCartSelfTestsState = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE;
             break;
 
@@ -395,13 +380,15 @@
             // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
             if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
             {
-                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed.
-#ifdef SKIP_DRY_SELF_TESTS
-                // TODO: Remove once dry self-test is ready to use
-                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#else
-                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#endif
+                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
+                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
+                {
+                    currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+                }
+                else
+                {
+                    currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+                }
             }
             break;
 
@@ -632,7 +619,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if (( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) && (STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ))
     {
         state = NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
@@ -816,7 +803,7 @@
     selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
-    if ( STATE_CLOSED == getFPGADoorState() )
+    if (( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) && (STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ))
     {
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -845,7 +832,6 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
-
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
     if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
@@ -1082,11 +1068,14 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-#ifndef SKIP_DRY_SELF_TESTS
-        state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#else
-        state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#endif
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+        }
+        else
+        {
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+        }
     }
 
     return state;
@@ -1226,11 +1215,18 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-#ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
-#endif
+
+    if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
-        zeroBloodLeak();
+#ifndef _RELEASE_
+        // TODO do we need both of these?
+        if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
+#endif
+        {
+            zeroBloodLeak();
+        }
+
         state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         *result = SELF_TEST_STATUS_PASSED;
     }
@@ -1256,7 +1252,8 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
-    if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+    if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) ||
+         ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) )
     {
         settleStartTime = getMSTimerCount();
         state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;