Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r3bdc6566ae1bccafce60d942c23be54a8d1c2acf -r773bd9e1eebab013afa0b303231be73e8016c84c
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 3bdc6566ae1bccafce60d942c23be54a8d1c2acf)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 773bd9e1eebab013afa0b303231be73e8016c84c)
@@ -23,6 +23,7 @@
 #include "Heaters.h"
 #include "LoadCell.h"
 #include "ModeFill.h"
+#include "ModeGenIdle.h"
 #include "NVDataMgmtDGRecords.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -62,8 +63,6 @@
 #define ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER      1.06                                                 ///< Acid and bicarbonate concentrates make up around 6% to total volume.
 #define FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE          0.1                                                  ///< Flow integrated volume has 10% tolerance compare to load cell reading.
 
-#define CONDUCTIVITY_WHEN_ACID_JUG_EMPTY                10000.0                                              ///< The conductivity value when the acid jug is empty.
-#define CONDUCTIVITY_WHEN_BICARB_JUG_EMPTY              12000.0                                              ///< The conductivity value when the bicarb jug is empty.
 #define ACID_TEST_CD1_TCD                               12252.1                                              ///< Used for testing CD1 acid theoretical conductivity.
 #define ACID_TEST_CD2_TCD                               ACID_TEST_CD1_TCD                                    ///< Used for testing CD2 acid theoretical conductivity.
 #define BICARB_TEST_CD2_TCD                             6820.91                                              ///< Used for testing CD2 bicarb theoretical conductivity.
@@ -97,7 +96,6 @@
     F32  fillFlowRateAverage;                                                                                ///< Fill flow average value.
     F32  fillLastTemperature;                                                                                ///< Fill last temperature value.
     BOOL isThisFirstFill;                                                                                    ///< Fill flag to indicate whether it is the first fill or not.
-    BOOL fillAvgConductivityOutOfRange;                                                                      ///< Fill average conductivity out of range.
     BOOL fillEmtyAcidBottleDetected;                                                                         ///< Fill acid bottle empty detected.
     BOOL fillEmtyBicarbBottleDetected;                                                                       ///< Fill bicarb bottle empty detected.
 } FILL_CONDITION_STATUS_T;
@@ -379,7 +377,6 @@
     fillStatus.fillTemperatureAverage    = getHeaterTargetTemperature( DG_TRIMMER_HEATER );
     fillStatus.fillLastTemperature       = getHeaterTargetTemperature( DG_TRIMMER_HEATER ) + RESERVOIR_EXTRA_TEMPERATURE;
     fillStatus.isThisFirstFill           = TRUE;
-    fillStatus.fillAvgConductivityOutOfRange = FALSE;
     fillStatus.fillEmtyAcidBottleDetected = FALSE;
     fillStatus.fillEmtyBicarbBottleDetected = FALSE;
 }
@@ -399,19 +396,6 @@
 
 /*********************************************************************//**
  * @brief
- * The isAvgConductivityOutOfRange function returns the boolean flag that indicates
- * whether the average conductivity is out of range.
- * @details Inputs: none
- * @details Outputs: none
- * @return fillStatus.fillAvgConductivityOutOfRange
- *************************************************************************/
-BOOL isAvgConductivityOutOfRange( void )
-{
-    return fillStatus.fillAvgConductivityOutOfRange;
-}
-
-/*********************************************************************//**
- * @brief
  * The isEmptyAcidBottle function returns the boolean flag that indicates
  * whether the acid bottle is empty.
  * @details Inputs: none
@@ -759,10 +743,8 @@
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        //activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );  // trigger empty acid bottle alarm at the end of drain mode and set both bottles need prime
         fillStatus.isThisFirstFill = TRUE;                            // empty bottles need replaced, set isThisFirstFill to FALSE so that prime, flush, acid & bicarb test are needed
         fillStatus.fillEmtyAcidBottleDetected = TRUE;                 // set this variable to FALSE when user presses OK on the alarm to confirm bottle has been replaced and resume
-        //requestNewOperationMode( DG_MODE_GENE );
     }
 
     if ( ( ( BICARB_CONCENTRATION_BOTTLE_VOLUME_ML - getF32OverrideValue( &usedBicarbVolumeML ) ) <= CONCENTRATION_BOTTLE_LOW_VOLUME_ML ) )  // || // SRSDG 438
@@ -771,13 +753,13 @@
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        //activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );  // trigger empty bicarb bottle alarm at the end of drain mode and set both bottles need prime
         fillStatus.isThisFirstFill = TRUE;
         fillStatus.fillEmtyBicarbBottleDetected = TRUE;
-        //requestNewOperationMode( DG_MODE_GENE );  // Fill -> Generation Idle
     }
 #endif
 
+    setBadAvgConductivityDetectedFlag( FALSE );
+
     // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode  // SRSDG 398
     if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
     {
@@ -786,9 +768,6 @@
         F32 avgAcidConductivity                      = acidConductivityTotal  / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
 
-        fillStatus.fillAvgConductivityOutOfRange     = FALSE;  // init to FALSE when fill has reached target
-
-
 #ifndef DISABLE_FLOW_CHECK_IN_FILL
         if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )  // SRSDG 439
         {
@@ -799,17 +778,17 @@
 #ifndef DISABLE_DIALYSATE_CHECK  // SRSDG 400
         if ( TRUE == isValueWithinPercentRange( avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
         {
-            fillStatus.fillAvgConductivityOutOfRange = TRUE;  // flag to signal idle mode to handle bad fill
             fillStatus.isThisFirstFill = TRUE;
+            setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
             setThisFisrtFillFlag( TRUE );
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1
             activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
         }
 
         if ( TRUE == isValueWithinPercentRange( avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
         {
-            fillStatus.fillAvgConductivityOutOfRange = TRUE;  // flag to signal idle mode to handle bad fill
             fillStatus.isThisFirstFill = TRUE;
+            setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
             setThisFisrtFillFlag( TRUE );
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1 then
             activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );