Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -7,8 +7,8 @@
 *
 * @file    Dialysis.c
 *
-* @author  (last)      Hung Nguyen
-* @date    (last)      15-Feb-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      22-Feb-2022
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -47,7 +47,7 @@
 static const U32 UF_ACCURACY_CHECK_INTERVAL     = ((1 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 
 #define MAX_SALINE_VOLUME_DELIVERED             800                             ///< Maximum saline volume delivered for a treatment.
-#define SALINE_BOLUS_RATE_ML_MIN                150                             ///< Fixed rate for saline bolus delivery.
+#define SALINE_BOLUS_RATE_ML_MIN                300                             ///< Fixed rate for saline bolus delivery.
 #define MAX_BOLUS_ERROR_PCT                     0.2                             ///< Maximum error in saline bolus volume delivered (as a percentage of target).
 
 #define MAX_ACTIVE_LOAD_CELL_CHANGE_G           50.0                            ///< Maximum delta between new and previous measured UF volume.
@@ -184,6 +184,8 @@
  *************************************************************************/
 void transitionToDialysis( void )
 {
+    PUMP_CONTROL_MODE_T mode = PUMP_CONTROL_MODE_CLOSED_LOOP;
+
     // Set last UF timestamp so UF ref is resumed from this time
     lastUFTimeStamp = getMSTimerCount();
     // Send dialysate outlet pump latest UF volumes
@@ -200,21 +202,25 @@
     setValvePosition( VBA, VALVE_POSITION_B_OPEN );
     setValvePosition( VBV, VALVE_POSITION_B_OPEN );
     // Restart pumps
-#ifndef RUN_PUMPS_OPEN_LOOP
-#ifndef RUN_BP_OPEN_LOOP
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP ) )
+    {
+        mode = PUMP_CONTROL_MODE_OPEN_LOOP;
+    }
 #endif
-#ifndef RUN_DPI_OPEN_LOOP
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+
+    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, mode );
+
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP ) )
+    {
+        mode = PUMP_CONTROL_MODE_OPEN_LOOP;
+    }
 #endif
-#else
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
+
+    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode );
+
     setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     // Start Heparin pump as appropriate
     startHeparinPump();
@@ -286,21 +292,24 @@
     // Make rate changes in real time if currently performing dialysis.
     if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
     {
-#ifndef RUN_PUMPS_OPEN_LOOP
-#ifndef RUN_BP_OPEN_LOOP
-        setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-        setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        PUMP_CONTROL_MODE_T mode = PUMP_CONTROL_MODE_CLOSED_LOOP;
+
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP ) )
+        {
+            mode = PUMP_CONTROL_MODE_OPEN_LOOP;
+        }
 #endif
-#ifndef RUN_DPI_OPEN_LOOP
-        setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-        setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, mode );
+
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP ) )
+        {
+            mode = PUMP_CONTROL_MODE_OPEN_LOOP;
+        }
 #endif
-#else
-        setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
+        setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode );
+
         setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     }
 }
@@ -942,15 +951,14 @@
             salineBolusAbortRequested = FALSE;
             result = SALINE_BOLUS_STATE_IDLE;
         }
-#ifndef DISABLE_PUMP_FLOW_CHECKS
         // Determine if saline bolus is under/over delivering
-        else if ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl )
+        else if ( ( fabs( expectedSalineBolusVolume_mL - bolusSalineVolumeDelivered_mL ) > maxBolusErrorMl ) &&
+                  ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
             activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE );
             errorFound = TRUE;
             result = SALINE_BOLUS_STATE_IDLE;
         }
-#endif
     }
 
     // Are we stopping the bolus?
@@ -1041,9 +1049,12 @@
     // Check UF rate over last hour
     if ( uFMeasRate > MAX_UF_RATE_ML_PER_HOUR )
     {
-#ifndef DISABLE_UF_ALARMS
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+        }
     }
     // Increment timer and see if time to start another 1 hour check period
     if ( ++uFAccuracyCheckTimerCtr >= UF_ACCURACY_CHECK_INTERVAL )
@@ -1056,9 +1067,12 @@
     // Check total UF volume error
     if ( ( fabs( refUFVolume - measUFVolume ) ) >= (F32)MAX_UF_ACCURACY_ERROR_ML )
     {
-#ifndef DISABLE_UF_ALARMS
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_VOLUME_ACCURACY_ERROR, refUFVolume, measUFVolume );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_UF_VOLUME_ACCURACY_ERROR, refUFVolume, measUFVolume );
+        }
     }
 }
 
@@ -1077,17 +1091,21 @@
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
     LOAD_CELL_ID_T loadCell = ( activeRes == DG_RESERVOIR_1 ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
     F32 latestResVolume = getLoadCellWeight( loadCell );
-#ifndef DISABLE_UF_ALARMS
     F32 deltaVolume = latestResVolume - resLastVolume[ activeRes ];
 
     // ensure volume change is not too excessive - indication that load cell was impacted by some kind of shock
     if ( fabs(deltaVolume) > MAX_ACTIVE_LOAD_CELL_CHANGE_G )
     {
-        ALARM_ID_T deltaAlarm = ( getDGActiveReservoir() == DG_RESERVOIR_1 ? ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM : ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM );
-        SET_ALARM_WITH_1_F32_DATA( deltaAlarm, deltaVolume );
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            ALARM_ID_T deltaAlarm = ( getDGActiveReservoir() == DG_RESERVOIR_1 ? ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM :
+                                                                                 ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM );
+            SET_ALARM_WITH_1_F32_DATA( deltaAlarm, deltaVolume );
+        }
     }
     else
-#endif
     {
         // Calculate UF volumes and provide to dialysate outlet pump controller
         measUFVolume = measUFVolumeFromPriorReservoirs + ( latestResVolume - resStartVolume[ activeRes ] );