Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -reeb4e9c7c8ca2bc41168353c3d30f311080972b2
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision eeb4e9c7c8ca2bc41168353c3d30f311080972b2)
@@ -56,6 +56,8 @@
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 50 / TASK_GENERAL_INTERVAL )                      ///< Interval (ms/task time) at which the concentrate pump is controlled.
 #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
+#define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
+
 /// Enumeration of concentrate pump states.
 typedef enum ConcentratePumpState
 {
@@ -101,7 +103,6 @@
 static CONCENTRATE_PUMP_STATE_T handleConcentratePumpOnState( CONCENTRATE_PUMPS_T pumpId );
 
 static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount );
-static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -149,8 +150,12 @@
     // Check if a new calibration is available
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
-        // Get the new calibration data and check its validity
-        processCalibrationData();
+        // Get the calibration values of acid and bicarb
+        getNVRecord2Driver( GET_CAL_ACID_CONCENTREATES, (U08*)&acidConcentrateCalRecord, sizeof( acidConcentrateCalRecord ),
+                            NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
+
+        getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
+                            NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
     }
 
     if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) )
@@ -177,9 +182,9 @@
         F32 cp2Speed     = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
 
         data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0 : cp1SetSpeed );
-        data.cp1MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1Speed * -1.0 : cp1Speed );
+        data.cp1MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1Speed    * -1.0 : cp1Speed );
         data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
-        data.cp2MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2Speed * -1.0 : cp2Speed );
+        data.cp2MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2Speed    * -1.0 : cp2Speed );
 
 #ifndef DISABLE_DIALYSATE_CHECK
         F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) - concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
@@ -236,9 +241,14 @@
 SELF_TEST_STATUS_T execConcenratePumpsSelfTest( void )
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+    BOOL calStatus            = FALSE;
 
-    BOOL calStatus = processCalibrationData();
+    calStatus |= getNVRecord2Driver( GET_CAL_ACID_CONCENTREATES, (U08*)&acidConcentrateCalRecord, sizeof( acidConcentrateCalRecord ),
+                                     ( CAL_DATA_ACID_CONCENTRATE_1 + 1 ), ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
 
+    calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
+                                     ( CAL_DATA_BICARB_CONCENTRATE_1 + 1 ), ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
+
     if ( TRUE == calStatus )
     {
         result = SELF_TEST_STATUS_PASSED;
@@ -533,67 +543,7 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The processCalibrationData function gets the calibration data and makes
- * sure it is valid by checking the calibration date. The calibration date
- * should not be 0.
- * @details Inputs: none
- * @details Outputs: acidConcentrateCalRecord, bicarbConcentrateCalRecord
- * @return TRUE if the calibration record is valid, otherwise FALSE
- *************************************************************************/
-static BOOL processCalibrationData( void )
-{
-    BOOL status = TRUE;
 
-    // Get the calibration record from NVDataMgmt
-    DG_ACID_CONCENTRATES_RECORD_T acidCalRecord     = getDGAcidConcentratesRecord();
-    DG_BICARB_CONCENTRATES_RECORD_T bicarbCalRecord = getDGBicarbConcentratesRecord();
-
-    // Check if the calibration data that was received from NVDataMgmt is legitimate
-    // The calibration date item should not be zero. If the calibration date is 0,
-    // then the data is not stored in the NV memory or it was corrupted.
-    if ( 0 == acidCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].calibrationTime )
-    {
-#ifndef SKIP_CAL_CHECK
-        activateAlarmNoData( ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
-        status = FALSE;
-#endif
-    }
-
-    // NOTE: Right now only acid concentrate 1 is used, therefore there is no for loop
-    acidConcentrateCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].startVolume =
-            acidCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].startVolume;
-
-    acidConcentrateCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio =
-            acidCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio;
-
-    acidConcentrateCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].reserverdSpace =
-            acidCalRecord.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].reserverdSpace;
-
-    // Check the validity of the bicarb concentrate values
-    if ( 0 == bicarbCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].calibrationTime )
-    {
-#ifndef SKIP_CAL_CHECK
-        activateAlarmNoData( ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
-        status = FALSE;
-#endif
-    }
-
-    // NOTE: Right now only bicarb concentrate 1 is used, therefore there is no for loop
-    bicarbConcentrateCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].startVolume =
-            bicarbCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].startVolume;
-
-    bicarbConcentrateCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio =
-            bicarbCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
-
-    bicarbConcentrateCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].reservedSpace =
-            bicarbCalRecord.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].reservedSpace;
-
-    return status;
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/