Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re6c4c61c793a91f9ed9dfe969e01bdeee565347d -r44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 44f739bf3e9dfe0bfb5910a6a32fc4c5b1533af3)
@@ -76,7 +76,7 @@
 #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_DRIFT_C       2.0F                                                 ///< Dialysate temperature sensors maximum allowed drift in C.
+#define DIALYSATE_TEMPERATURE_SENSORS_MAX_DRIFT_C       1.0F                                                 ///< Dialysate temperature sensors maximum allowed drift 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.
 
@@ -399,11 +399,11 @@
 {
     if ( ACID == bottle )
     {
-        usedAcidVolumeML.data = 0.0;
+        usedAcidVolumeML.data = 0.0F;
     }
     else if ( BICARB == bottle )
     {
-        usedBicarbVolumeML.data = 0.0;
+        usedBicarbVolumeML.data = 0.0F;
     }
     else
     {
@@ -528,8 +528,8 @@
         else
         {
             // Initialization
-            totalBicarbConductivity       = 0.0;
-            averageBicarbConductivity     = 0.0;
+            totalBicarbConductivity       = 0.0F;
+            averageBicarbConductivity     = 0.0F;
             bicarbConductivitySampleCount = 0;
 
             // Set pumps flow rate to prepare for bicarb conductivity testing
@@ -584,8 +584,8 @@
         {
             // Initialization
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
-            totalBicarbConductivity       = 0.0;
-            totalAcidConductivity         = 0.0;
+            totalBicarbConductivity       = 0.0F;
+            totalAcidConductivity         = 0.0F;
             bicarbConductivitySampleCount = 0;
             acidConductivitySampleCount   = 0;
 
@@ -635,7 +635,7 @@
 
         averageBicarbConductivity = totalBicarbConductivity / bicarbConductivitySampleCount;
         averageAcidConductivity   = totalAcidConductivity / acidConductivitySampleCount;
-        pctDiffInConductivity     = fabs( 2.0 * ( averageAcidConductivity - averageBicarbConductivity ) /
+        pctDiffInConductivity     = fabs( 2.0F * ( averageAcidConductivity - averageBicarbConductivity ) /
                                                 ( averageAcidConductivity + averageBicarbConductivity ) );
 
         if ( ( TRUE == isValueWithinPercentRange( averageAcidConductivity, ACID_TEST_CD2_TCD, FIVE_PERCENT_FACTOR ) ) &&
@@ -906,10 +906,8 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut ) )
-        {
-            activateAlarmNoData( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE );
-        }
+        checkPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut, fabs( TDi - TRo ),
+                              DIALYSATE_TEMPERATURE_SENSORS_MAX_DRIFT_C );
     }
 }