Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9b468e9886795094503fd62e6b47829876d740a3 -re6f3a632890f96a5aa282922d11df148bdd06587
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9b468e9886795094503fd62e6b47829876d740a3)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
@@ -43,9 +43,6 @@
 #define TARGET_RO_PRESSURE_PSI                          130                                         ///< Target pressure for RO pump.
 #define TARGET_RO_FLOW_RATE_L                           0.8                                         ///< Target flow rate for RO pump.
 
-#define DIALYSATE_ACID_CONCENTRATE_RATIO                ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )    ///< Ratio between RO water and acid concentrate.
-#define DIALYSATE_BICARB_CONCENTRATE_RATIO              ( 4.06812 / FRACTION_TO_PERCENT_FACTOR )    ///< Ratio between RO water and bicarbonate concentrate.
-
 #define DIALYSATE_FILL_TIME_OUT                         ( 5 * SEC_PER_MIN * MS_PER_SECOND )         ///< Time out period when reservoir is not filled with correct dialysate.
 #define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS        ( 5 * MS_PER_SECOND )                       ///< Persistent period for empty bottle detect.
 ///< Persistent time interval for concentrate pumps prime.
@@ -267,8 +264,10 @@
 static DG_FILL_MODE_STATE_T handleBicarbPumpCheckState( void )
 {
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_BICARB_PUMP_CHECK;
+    DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
     F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32 const bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * DIALYSATE_BICARB_CONCENTRATE_RATIO + CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
+    F32 const bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio +
+                                          CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
 
 #ifndef DISABLE_DIALYSATE_CHECK
     F32 const bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
@@ -319,8 +318,10 @@
 static DG_FILL_MODE_STATE_T handleAcidPumpCheckState( void )
 {
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_ACID_PUMP_CHECK;
+    DG_ACID_CONCENTRATES_RECORD_T acid = getAcidConcentrateCalRecord();
     F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32 const acidPumpFlowRate_mL_min = measuredROFlowRate_mL_min * DIALYSATE_ACID_CONCENTRATE_RATIO + CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
+    F32 const acidPumpFlowRate_mL_min = measuredROFlowRate_mL_min * acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio +
+                                        CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
 
 #ifndef DISABLE_DIALYSATE_CHECK
     F32 const acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
@@ -559,9 +560,13 @@
 static void handleDialysateMixing( F32 measuredROFlowRate_mL_min )
 {
 #ifndef DISABLE_MIXING
+    // TODO what should we do with start volume from the structure?
+    DG_ACID_CONCENTRATES_RECORD_T acid     = getAcidConcentrateCalRecord();
+    DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
+
     // Set concentrate pumps speed based off RO pump flow rate
-    F32 const acidCP1PumpFlowRate = DIALYSATE_ACID_CONCENTRATE_RATIO * measuredROFlowRate_mL_min;
-    F32 const bicarbCP2PumpFlowRate = DIALYSATE_BICARB_CONCENTRATE_RATIO * measuredROFlowRate_mL_min;
+    F32 const acidCP1PumpFlowRate = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio * measuredROFlowRate_mL_min;
+    F32 const bicarbCP2PumpFlowRate = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio * measuredROFlowRate_mL_min;
 
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, acidCP1PumpFlowRate );
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, bicarbCP2PumpFlowRate );