Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rdef06013312d270b1704787a4473caf5612dd6ac -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision def06013312d270b1704787a4473caf5612dd6ac)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      James Walter Taylor
-* @date    (last)      11-Apr-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -217,7 +217,7 @@
 U32 transitionToFillMode( void )
 {
     initFillMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
@@ -609,11 +609,14 @@
             bicarbConductivitySampleCount = 0;
 
             // Set pumps flow rate to prepare for bicarb conductivity testing
-            setROPumpTargetFlowRateLPM( RO_PUMP_400_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
 
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_40_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
+            // Prior to collecting data for bicarb test, change the CD2 calibration table
+            setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST );
+
             // State transition
             concentrateTestStartTime = getMSTimerCount();
             result                   = DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY;
@@ -680,6 +683,10 @@
             setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_20_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+
+            // Set back the conductivity of CD2 calibration table to the normal calibration table
+            setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
             // State transition
             concentrateTestStartTime = getMSTimerCount();
             result                   = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY;