Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -ra4669c80291e85fa5ce17d77ebcfd0c882831202 -r9826fc85bd1497ec617ae0e825f78b91972de2b3
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a4669c80291e85fa5ce17d77ebcfd0c882831202)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9826fc85bd1497ec617ae0e825f78b91972de2b3)
@@ -51,7 +51,7 @@
 #define MAX_REDUNDANT_LOAD_CELL_DIFF              50.0F                                           ///< Maximum difference in redundant load cells when determining if fill completed.
 #define MAX_DRAIN_RPM_MLP                         2400.0F                                         ///< Maximum drain RPM in mL/min.
 #define DATA_PUBLISH_COUNTER_START_COUNT          5                                               ///< Data publish counter start count.
-#define ENVIRONMENT_TEMPERATURE_C                 23.5F                                           ///< Device's environment temperature in C. // TODO add this to the cal records
+#define NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK   1                                               ///< Number of acid and bicarb non-volatile data to check.
 
 // ********** private data **********
 
@@ -98,6 +98,8 @@
 static BOOL tareLoadCellRequest;                                                                  ///< Flag indicates if load cell tare has been requested by HD.
 static DG_RESERVOIR_VOLUME_RECORD_T reservoirsCalRecord;                                          ///< DG reservoirs non-volatile record.
 static DG_HEATING_CAL_RECORD_T heatingConstsCalRecord;                                            ///< DG heating calibration record.
+static DG_ACID_CONCENTRATES_RECORD_T acidConcentrateCalRecord;                                    ///< Acid concentrate calibration record.
+static DG_BICARB_CONCENTRATES_RECORD_T bicarbConcentrateCalRecord;                                ///< Bicarb concentrate calibration record.
 static F32 targetFillFlowRateLPM;                                                                 ///< Target fill flow rate in L/min.
 static BOOL isThisTheFirstCycle;                                                                  ///< Boolean flag to indicate whether this is the first cycle.
 static RESERVOIRS_PREVIOUS_STATUS reservoirPreviousStatus[ NUM_OF_DG_RESERVOIRS ];                ///< Reservoirs previous status.
@@ -147,7 +149,8 @@
     // publish active reservoir, fill/drain volume targets at 1 Hz.
     if ( ++dataPublishCounter >= RESERVOIR_DATA_PUB_INTERVAL )
     {
-        RESERVOIR_DATA_T data;
+        RESERVOIR_DATA_T data;
+
         data.activeReservoir            = getU32OverrideValue( &activeReservoir );
         data.fillToVolumeMl             = getU32OverrideValue( &fillVolumeTargetMl );
         data.drainToVolumeMl            = getU32OverrideValue( &drainVolumeTargetMl );
@@ -180,10 +183,15 @@
 
     calStatus |= getNVRecord2Driver( GET_CAL_RSRVRS_VOL_RECORD, (U08*)&reservoirsCalRecord, sizeof( reservoirsCalRecord ),
                                      NUM_OF_CAL_DATA_RSRVRS, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD );
-
     calStatus |= getNVRecord2Driver( GET_CAL_HEATING_RECORD, (U08*)&heatingConstsCalRecord, sizeof( heatingConstsCalRecord ),
                                      NUM_OF_CAL_DATA_RSRVRS, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD );
 
+    // Get the calibration values of acid and bicarb
+    calStatus |= getNVRecord2Driver( GET_CAL_ACID_CONCENTREATES, (U08*)&acidConcentrateCalRecord, sizeof( acidConcentrateCalRecord ),
+                                     NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
+    calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
+                                     NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
+
     if ( TRUE == calStatus )
     {
         result = SELF_TEST_STATUS_PASSED;
@@ -564,45 +572,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getReservoirActualTemperature function calculates the reservoir's
- * actual temperature.
- * @details Inputs: none
- * @details Outputs: heatersTempCalc
- * @return reservoir actual temperature
- *************************************************************************/
-F32 getReservoirActualTemperature( void )
-{
-    F32 UFTimeConstant  = 0.0;
-    F32 targetFillVolML = getTargetFillVolumeML();
-    F32 tempLastFill    = getLastFillTemperature();
-    F32 tempAvgFill     = getAvgFillTemperature();
-    F32 UFTauCPerMS     = heatingConstsCalRecord.ultrafilterTempTauCPerMin / ( SEC_PER_MIN * MS_PER_SECOND );
-    F32 RsrvrTauCPerMS  = heatingConstsCalRecord.reservoirTempTauCPerMin / ( SEC_PER_MIN * MS_PER_SECOND );
-
-    // Only do the calculations if the fill volume is not 0.0 so the final value will not be a nan.
-    if ( targetFillVolML > NEARLY_ZERO )
-    {
-        heatersTempCalc.timeUFDecayMS          = (F32)heatersTempCalc.timeReservoirCycleMS - heatersTempCalc.timeReservoirFillMS;
-        UFTimeConstant                         = heatersTempCalc.timeUFDecayMS * UFTauCPerMS;
-        heatersTempCalc.tempUFFill             = tempLastFill + UFTimeConstant;
-
-        F32 ultrafilterPart                    = ( heatingConstsCalRecord.ultrafilterVolmL / targetFillVolML ) * heatersTempCalc.tempUFFill;
-        F32 fillPart                           = ( ( targetFillVolML - heatingConstsCalRecord.ultrafilterVolmL ) / targetFillVolML ) * tempAvgFill;
-        F32 tempReservoir0Actual               = ultrafilterPart + fillPart;
-
-        F32 tempReservoirEndfillActual         = tempReservoir0Actual + ( ( heatersTempCalc.timeReservoirFillMS * HALF ) * RsrvrTauCPerMS );
-        heatersTempCalc.tempReservoirUseActual = tempReservoirEndfillActual + ( heatersTempCalc.timeReservoirFill2SwitchMS * RsrvrTauCPerMS );
-    }
-    else
-    {
-        heatersTempCalc.tempReservoirUseActual = 0.0;
-    }
-
-    return heatersTempCalc.tempReservoirUseActual;
-}
-
-/*********************************************************************//**
- * @brief
  * The getPrimaryHeaterTargetTemperature function calculates the primary
  * heater target temperature and returns target temperature value.
  * @details Inputs: heatingConstsCalRecord
@@ -649,8 +618,11 @@
 
     if ( targetROFlowLPM > 0 )
     {
-        priTargetTemp = ( tempTarget * ( tgtTotalFlowLPM / targetROFlowLPM ) ) - ( ENVIRONMENT_TEMPERATURE_C * ( tgtAicdFlowLPM / targetROFlowLPM ) ) -
-                        ( ENVIRONMENT_TEMPERATURE_C * ( tgtBicarbFlowLPM / targetROFlowLPM ) );
+        F32 acidTemperature   = acidConcentrateCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidBottleTemperature;
+        F32 bicarbTemperature = bicarbConcentrateCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbBottleTemperature;
+
+        priTargetTemp = ( tempTarget * ( tgtTotalFlowLPM / targetROFlowLPM ) ) - ( acidTemperature * ( tgtAicdFlowLPM / targetROFlowLPM ) ) -
+                        ( bicarbTemperature * ( tgtBicarbFlowLPM / targetROFlowLPM ) );
     }
 
     return priTargetTemp;
@@ -680,10 +652,13 @@
 
     if ( tgtTotalFlowLPM > 0 )
     {
-        heatersTempCalc.tempFillMixAvgTrimmer = ( fillROAvgActual * ( tgtTotalFlowLPM / targetROFlowLPM ) )          +
-                                                ( ENVIRONMENT_TEMPERATURE_C * ( tgtAicdFlowLPM / targetROFlowLPM ) ) +
-                                                ( ENVIRONMENT_TEMPERATURE_C * ( tgtBicarbFlowLPM / targetROFlowLPM ) );
+        F32 acidTemperature   = acidConcentrateCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidBottleTemperature;
+        F32 bicarbTemperature = bicarbConcentrateCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbBottleTemperature;
 
+        heatersTempCalc.tempFillMixAvgTrimmer = ( fillROAvgActual * ( tgtTotalFlowLPM / targetROFlowLPM ) ) +
+                                                ( acidTemperature * ( tgtAicdFlowLPM / targetROFlowLPM ) )  +
+                                                ( bicarbTemperature * ( tgtBicarbFlowLPM / targetROFlowLPM ) );
+
         heatersTempCalc.tempRsrvr0ActualTrimmer = ( ( heatingConstsCalRecord.ultrafilterVolmL / targetFillVolML ) * tempUFFill )        +
                                                   ( ( ( targetFillVolML - heatingConstsCalRecord.ultrafilterVolmL ) / targetFillVolML ) *
                                                         heatersTempCalc.tempFillMixAvgTrimmer );
@@ -711,6 +686,34 @@
 
 /*********************************************************************//**
  * @brief
+ * The getAcidConcentrateCalRecord function fills the provided buffer with
+ * the acid concentrate record.
+ * @details Inputs: acidConcentrateCalRecord
+ * @details Outputs: none
+ * @param acidRecord which is the pointer to the provided buffer
+ * @return none
+ *************************************************************************/
+void getAcidConcentrateCalRecord( DG_ACID_CONCENTRATES_RECORD_T* acidRecord )
+{
+    memcpy( acidRecord, &acidConcentrateCalRecord, sizeof( DG_ACID_CONCENTRATES_RECORD_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getBicarbConcentrateCalRecord function fills the provided buffer with
+ * the bicarb concentrate record.
+ * @details Inputs: bicarbConcentrateCalRecord
+ * @details Outputs: none
+ * @param bicarbRecord which is the pointer to the provided buffer
+ * @return none
+ *************************************************************************/
+void getBicarbConcentrateCalRecord( DG_BICARB_CONCENTRATES_RECORD_T* bicarbRecord )
+{
+    memcpy( bicarbRecord, &bicarbConcentrateCalRecord, sizeof( DG_BICARB_CONCENTRATES_RECORD_T ) );
+}
+
+/*********************************************************************//**
+ * @brief
  * The hasTargetFillVolumeReached function checks if the target fill volume
  * for specific reservoir has been reached.
  * @details Inputs: fillVolumeTargetMl