Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r5e8f96e11c797bddeddfc009c87f20df3b7a8664 -receb190a5d66fdbee779478ac8bb50a846ed9241
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 5e8f96e11c797bddeddfc009c87f20df3b7a8664)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
@@ -79,8 +79,6 @@
 #define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
-#define DIALYSATE_TEMPERATURE_SENSORS_MAX_DEVIATION_C   1.0F                                                 ///< Dialysate temperature sensors maximum allowed deviation in C.
-#define DIALYSATE_TEMP_SNSRS_OUT_OF_RANGE_TIMEOUT_MS    ( 10 * MS_PER_SECOND )                               ///< Dialysate temperature sensors drift timeout in milliseconds.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
 
 /// Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval.
@@ -151,7 +149,6 @@
 static DG_FILL_MODE_STATE_T handlePausedState( void );
 
 static BOOL areInletWaterConditionsAlarmsActive( void );
-static void checkDialysateTemperatureSensors( void );
 static void handleDialysateMixing( F32 measuredROFlowRate_mL_min, F32 acidMixingRatio, F32 bicarbMixingRatio );
 static void setFillInfoToRTCRAM( void );
 static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor );
@@ -189,8 +186,6 @@
     totalBicarbConductivity       = 0.0F;
     totalAcidConductivity         = 0.0F;
     havePauseActuatorsBeenSet     = FALSE;
-
-    initPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 0, DIALYSATE_TEMP_SNSRS_OUT_OF_RANGE_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -505,8 +500,8 @@
 
     if ( TRUE == didTimeout( concentratePrimingStartTime, PRIME_CONCENTRATE_LINES_TIME_OUT_MS ) )
     {
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
 
         // Set the RO pump flow rate in according to the roPumpFlushBubblesSpeed table to flush bubbles
         pumpSpeedIndex = 0;
@@ -599,7 +594,7 @@
         if ( TRUE == isConductivityInRange )
         {
             // Initialization
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
             totalBicarbConductivity       = 0.0F;
             totalAcidConductivity         = 0.0F;
             bicarbConductivitySampleCount = 0;
@@ -753,11 +748,12 @@
     DG_FILL_MODE_STATE_T result     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     DG_RESERVOIR_ID_T inactiveRsrvr = getInactiveReservoir();
     F32 acidConductivity            = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );         // TODO the systems team will let us know when we can use TD2 in DVT. Until then it is disabled
-    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); //getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
+    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
 
 #ifndef _RELEASE_
-    if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
+    if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_USING_TPO_FOR_PRIMARY_HEATER_CONTROL ) ) )
     {
         inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
     }
@@ -879,8 +875,8 @@
     {
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         setROPumpTargetFlowRateLPM( TARGET_RO_FLOW_RATE_IN_PAUSE_L, TARGET_RO_PRESSURE_PSI );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
         havePauseActuatorsBeenSet = TRUE;
     }
 
@@ -925,30 +921,6 @@
 
 /*********************************************************************//**
  * @brief
- * The checkDialysateTemperatureSensors function checks whether the
- * dialysate temperature sensors have drifted. If they are drifted, it raises
- * an alarm.
- * @details Inputs: none
- * @details Outputs: None
- * @return none
- *************************************************************************/
-static void checkDialysateTemperatureSensors( void )
-{
-    F32 TDi         = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
-    F32 TRo         = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
-    BOOL isDriftOut = ( fabs( TDi - TRo ) >= DIALYSATE_TEMPERATURE_SENSORS_MAX_DEVIATION_C ? TRUE : FALSE );
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        checkPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut, fabs( TDi - TRo ),
-                              DIALYSATE_TEMPERATURE_SENSORS_MAX_DEVIATION_C );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The isValueWithinPercentRange function validates if the test value
  * is within the percentage range specified by the baseValue and
  * percentFactor.
@@ -1071,7 +1043,7 @@
         usedAcidVolumeML.ovInitData = usedAcidVolumeML.data;
         usedAcidVolumeML.ovData     = value;
         usedAcidVolumeML.override   = OVERRIDE_KEY;
-        result = TRUE;
+        result                      = TRUE;
     }
 
     return result;
@@ -1093,9 +1065,9 @@
     {
         usedAcidVolumeML.data       = usedAcidVolumeML.ovInitData;
         usedAcidVolumeML.override   = OVERRIDE_RESET;
-        usedAcidVolumeML.ovInitData = 0.0;
-        usedAcidVolumeML.ovData     = 0.0;
-        result = TRUE;
+        usedAcidVolumeML.ovInitData = 0.0F;
+        usedAcidVolumeML.ovData     = 0.0F;
+        result                      = TRUE;
     }
 
     return result;
@@ -1119,7 +1091,7 @@
         usedBicarbVolumeML.ovInitData = usedBicarbVolumeML.data;
         usedBicarbVolumeML.ovData     = value;
         usedBicarbVolumeML.override   = OVERRIDE_KEY;
-        result = TRUE;
+        result                        = TRUE;
     }
 
     return result;
@@ -1141,9 +1113,9 @@
     {
         usedBicarbVolumeML.data       = usedBicarbVolumeML.ovInitData;
         usedBicarbVolumeML.override   = OVERRIDE_RESET;
-        usedBicarbVolumeML.ovInitData = 0.0;
-        usedBicarbVolumeML.ovData     = 0.0;
-        result = TRUE;
+        usedBicarbVolumeML.ovInitData = 0.0F;
+        usedBicarbVolumeML.ovData     = 0.0F;
+        result                        = TRUE;
     }
 
     return result;
@@ -1164,10 +1136,10 @@
 
     if ( TRUE == isTestingActivated() )
     {
-        U32 intvl = value / TASK_GENERAL_INTERVAL;
+        U32 intvl                            = value / TASK_GENERAL_INTERVAL;
         fillModeDataPublishInterval.ovData   = intvl;
         fillModeDataPublishInterval.override = OVERRIDE_KEY;
-        result = TRUE;
+        result                               = TRUE;
     }
 
     return result;
@@ -1189,7 +1161,7 @@
     {
         fillModeDataPublishInterval.override = OVERRIDE_RESET;
         fillModeDataPublishInterval.ovData   = fillModeDataPublishInterval.ovInitData;
-        result = TRUE;
+        result                               = TRUE;
     }
 
     return result;