Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r550a5df210ac26217412e5e312d0a08864c5682e
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 550a5df210ac26217412e5e312d0a08864c5682e)
@@ -45,6 +45,8 @@
 #define CONCENTRATE_PUMP_PULSE_PER_REV                      2.0                                                 ///< Number of pulses generate for every revolution.
 #define CONCENTRATE_PUMP_STEP_PER_REV                       200.0                                               ///< Number of steps for every revolution.
 #define CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION       100.0                                               ///< Hall sense period resolution in microseconds.
+#define CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT      1000.0                                              ///< Hall sensors minimum allowed value.
+#define CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS  5000                                                ///< Hall sensors out of range time in milliseconds.
 
 #define CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP               8.0                                                 ///< Number of micro-steps ( fractions of step) per step.
 #define CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION             ( 0.5 / ( US_PER_SECOND * SEC_PER_MIN ) )           ///< Convert step period resolution (0.5 us) to minute.
@@ -58,6 +60,8 @@
 
 #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
 
+#define DATA_PUBLISH_COUNTER_START_COUNT                    0                                                   ///< Data publish counter start count.
+
 /// Enumeration of concentrate pump states.
 typedef enum ConcentratePumpState
 {
@@ -93,6 +97,7 @@
 static CONCENTRATE_PUMP_T concentratePumps[ NUM_OF_CONCENTRATE_PUMPS ];                                         ///< Array of concentrate pumps' data structure.
 static DG_ACID_CONCENTRATES_RECORD_T acidConcentrateCalRecord;                                                  ///< Acid concentrate calibration record.
 static DG_BICARB_CONCENTRATES_RECORD_T bicarbConcentrateCalRecord;                                              ///< Bicarb concentrate calibration record.
+static DG_CONC_PUMPS_CAL_RECORD_T concentratePumpsCalRecord;                                                    ///< Concentrate pumps calibration record.
 
 // ********** private function prototypes **********
 
@@ -115,7 +120,7 @@
 {
     CONCENTRATE_PUMPS_T pumpId;
 
-    concentratePumpMonitorTimerCounter = 0;
+    concentratePumpMonitorTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
     concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].control      = &setFPGACP1Control;
     concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].setStepSpeed = &setFPGACP1SetStepSpeed;
@@ -136,6 +141,7 @@
 
     initPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS );
 }
 
 /*********************************************************************//**
@@ -194,7 +200,7 @@
         checkPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, cp2Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp2Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
 #endif
 
-        concentratePumpMonitorTimerCounter = 0U;
+        concentratePumpMonitorTimerCounter = 0;
         broadcastData( MSG_ID_DG_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) );
     }
 }
@@ -243,12 +249,15 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
     BOOL calStatus            = FALSE;
 
-    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_ACID_CONCENTREATES, (U08*)&acidConcentrateCalRecord, sizeof( DG_ACID_CONCENTRATES_RECORD_T ),
+                                     NUMBER_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 ),
-                                     ( CAL_DATA_BICARB_CONCENTRATE_1 + 1 ), ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
+    calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( DG_BICARB_CONCENTRATES_RECORD_T ),
+                                     NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
 
+    calStatus |= getNVRecord2Driver( GET_CAL_CONCENTRATE_PUMPS_RECORD, (U08*)&concentratePumpsCalRecord, sizeof( DG_CONC_PUMPS_CAL_RECORD_T ),
+                                     NUM_OF_CAL_DATA_DG_CONC_PUMPS, ALARM_ID_NO_ALARM );
+
     if ( TRUE == calStatus )
     {
         result = SELF_TEST_STATUS_PASSED;
@@ -534,9 +543,19 @@
  *************************************************************************/
 static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount )
 {
-    F32 const pulseWidthInSecond = (F32)( pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION ) / US_PER_SECOND;
-    concentratePumps[ pumpId ].measuredPumpSpeed.data = ( 1 / pulseWidthInSecond ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
+    F32 pulseWidthInSecond = ( (F32)pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION ) / US_PER_SECOND;
+    concentratePumps[ pumpId ].measuredPumpSpeed.data = ( 1.0 / pulseWidthInSecond ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
 
+    /* TODO will implement in DEN-12224
+    // BOOL isPulseWidthOut   = ( pulseWidthInSecond <= CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
+    //checkPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, isPulseWidthOut, pulseWidthInSecond, CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT );
+
+    if ( FALSE == isPulseWidthOut )
+    {
+        concentratePumps[ pumpId ].measuredPumpSpeed.data = ( 1.0 / pulseWidthInSecond ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
+    }
+    TODO will implement in DEN-12224 */
+
     if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
     {
         concentratePumps[ pumpId ].measuredPumpSpeed.data = 0.0;