Index: NVDataMgmt.c
===================================================================
diff -u -rd2f6246090e76d8a512a8a5dbda3d713fa3b8e0d -r91b5217ca561a4c3d3b1ea2d363038b7df962ee9
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d2f6246090e76d8a512a8a5dbda3d713fa3b8e0d)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 91b5217ca561a4c3d3b1ea2d363038b7df962ee9)
@@ -488,27 +488,27 @@
 
 // Record check helper functions
 static BOOL areRecordsValid( void );
-static BOOL isPolynomialRecordValid( POLYNOMIAL_CAL_PAYLOAD_T* record, BOOL isRecordNeeded );
+static BOOL isPolynomialRecordValid( POLYNOMIAL_CAL_PAYLOAD_T* record );
 
 #ifdef _DG_
 static BOOL isDGCalibrationRecordValid( void );
-static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record, BOOL isRecordNeeded );
-static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record, BOOL isRecordNeeded );
-static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record, BOOL isRecordNeeded );
-static BOOL isDGDrainLineVolRecordValid( DG_DRAIN_LINE_VOLUME_T* record, BOOL isRecordNeeded );
-static BOOL isDGReservoirVolRecordValid( DG_RESERVOIR_VOLUME_DATA_T* record, BOOL isRecordNeeded );
-static BOOL isDGGenericVolRecordValid( DG_GENERIC_VOLUME_DATA_T* record, BOOL isRecordNeeded );
-static BOOL isDGAcidConcentrateRecordValid( DG_ACID_CONCENTRATE_T* record, BOOL isRecordNeeded );
-static BOOL isDGBicarbConcentrateRecordValid( DG_BICARB_CONCENTRATE_T* record, BOOL isRecordNeeded );
-static BOOL isDGFilterRecordValid( DG_FILTER_CAL_RECORD_T* record, BOOL isRecordNeeded );
-static BOOL isDGFanRecordValid( DG_FAN_CAL_RECORD_T* record, BOOL isRecordNeeded );
-static BOOL isDGAccelerometerSensorRecordValid( DG_ACCELEROMETER_SENSOR_CAL_RECORD_T* record, BOOL isRecordNeeded );
+static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record );
+static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record );
+static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record );
+static BOOL isDGDrainLineVolRecordValid( DG_DRAIN_LINE_VOLUME_T* record );
+static BOOL isDGReservoirVolRecordValid( DG_RESERVOIR_VOLUME_DATA_T* record );
+static BOOL isDGGenericVolRecordValid( DG_GENERIC_VOLUME_DATA_T* record );
+static BOOL isDGAcidConcentrateRecordValid( DG_ACID_CONCENTRATE_T* record );
+static BOOL isDGBicarbConcentrateRecordValid( DG_BICARB_CONCENTRATE_T* record );
+static BOOL isDGFilterRecordValid( DG_FILTER_CAL_RECORD_T* record );
+static BOOL isDGFanRecordValid( DG_FAN_CAL_RECORD_T* record );
+static BOOL isDGAccelerometerSensorRecordValid( DG_ACCELEROMETER_SENSOR_CAL_RECORD_T* record );
 #endif
 #ifdef _HD_
 static BOOL isHDCalibrationRecordValid( void );
-static BOOL isHDValveRecordValid( HD_VALVE_CAL_PAYLOAD_T* record, BOOL isRecordNeeded );
-static BOOL isHDPumpRecordValid( HD_PUMP_CAL_PAYLOAD_T* record, BOOL isRecordNeeded );
-static BOOL isHDAccelerometerSensorValid( HD_ACCELEROMETER_SENSOR_CAL_RECORD_T* record, BOOL isRecordNeeded );
+static BOOL isHDValveRecordValid( HD_VALVE_CAL_PAYLOAD_T* record );
+static BOOL isHDPumpRecordValid( HD_PUMP_CAL_PAYLOAD_T* record );
+static BOOL isHDAccelerometerSensorValid( HD_ACCELEROMETER_SENSOR_CAL_RECORD_T* record );
 #endif
 
 /*********************************************************************//**
@@ -2960,7 +2960,7 @@
  * right now otherwise, FALSE
  * @return TRUE if the records' data is valid otherwise FALSE
  *************************************************************************/
-static BOOL isPolynomialRecordValid( POLYNOMIAL_CAL_PAYLOAD_T* record, BOOL isRecordNeeded )
+static BOOL isPolynomialRecordValid( POLYNOMIAL_CAL_PAYLOAD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(POLYNOMIAL_CAL_PAYLOAD_T) - sizeof(U16) );
@@ -2978,27 +2978,10 @@
         // Recalculate the CRC with the default values
         record->crc              = crc16 ( (U08*)record, sizeof(POLYNOMIAL_CAL_PAYLOAD_T) - sizeof(U16) );
 
-        if ( isRecordNeeded == TRUE )
-        {
-            // Alarm if the CRC did not pass
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3030,115 +3013,115 @@
         // valid, the values should be set to benign values. This variable is used to decide
         // whether a write should be scheduled or not so it should not be overwritten with a TRUE
         // once a record set it to FALSE
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_FLOW_SENSORS_CAL_RECORD_T* flow = &dgCalibrationRecord.dgCalibrationGroups.flowSensorsCalRecord;
     record = (POLYNOMIAL_CAL_PAYLOAD_T*)&flow->flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ];
-    isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+    isHardwareRecordValid = isPolynomialRecordValid( record );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_LOAD_CELLS_CAL_RECORD_T* load = &dgCalibrationRecord.dgCalibrationGroups.loadCellsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_LOAD_CELLS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&load->loadCells[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_TEMP_SENSORS_CAL_RECORD_T* temperature = &dgCalibrationRecord.dgCalibrationGroups.tempSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_TEMP_SENSORS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&temperature->tempSensors[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_COND_SENSORS_CAL_RECORD_T* cond = &dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_COND_SENSORS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&cond->condSensors[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_CONC_PUMPS_CAL_RECORD_T* concPump = &dgCalibrationRecord.dgCalibrationGroups.concentratePumpsRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_DG_CONC_PUMPS; i++ )
     {
-        isHardwareRecordValid = isDGConcPumpRecordValid( &concPump->concentratePumps[ i ], FALSE );
+        isHardwareRecordValid = isDGConcPumpRecordValid( &concPump->concentratePumps[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_DRAIN_PUMP_CAL_RECORD_T* drainPump = &dgCalibrationRecord.dgCalibrationGroups.drainPumpRecord;
-    isCalRecordValid = isDGDrainPumpRecordValid( drainPump, FALSE ) != TRUE ? FALSE : isCalRecordValid;
+    isCalRecordValid = isDGDrainPumpRecordValid( drainPump ) != TRUE ? FALSE : isCalRecordValid;
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_RO_PUMP_CAL_RECORD_T* roPump = &dgCalibrationRecord.dgCalibrationGroups.roPumpRecord;
-    isHardwareRecordValid = isDGROPumpRecordValid( roPump, FALSE );
+    isHardwareRecordValid = isDGROPumpRecordValid( roPump );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_DRAIN_LINE_VOLUME_T* drainLineVol = &dgCalibrationRecord.dgCalibrationGroups.drainLineVolumeRecord;
-    isHardwareRecordValid = isDGDrainLineVolRecordValid( drainLineVol, FALSE );
+    isHardwareRecordValid = isDGDrainLineVolRecordValid( drainLineVol );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_RESERVOIR_VOLUME_RECORD_T* reservoirVol = &dgCalibrationRecord.dgCalibrationGroups.reservoirVolumesRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_RSRVRS; i++ )
     {
-        isHardwareRecordValid = isDGReservoirVolRecordValid( &reservoirVol->reservoir[ i ], FALSE );
+        isHardwareRecordValid = isDGReservoirVolRecordValid( &reservoirVol->reservoir[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_GENERIC_VOLUME_RECORD_T* genericVol = &dgCalibrationRecord.dgCalibrationGroups.genericVolumeRecord;
     for ( i = 0; i < 4; i++ )
     {
-        isHardwareRecordValid = isDGGenericVolRecordValid( &genericVol->genericVolume[ i ], FALSE );
+        isHardwareRecordValid = isDGGenericVolRecordValid( &genericVol->genericVolume[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_ACID_CONCENTRATES_RECORD_T* acidConc = &dgCalibrationRecord.dgCalibrationGroups.acidConcentratesRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_ACID_CONCENTRATES; i++ )
     {
-        isHardwareRecordValid = isDGAcidConcentrateRecordValid( &acidConc->acidConcentrate[ i ], TRUE );
+        isHardwareRecordValid = isDGAcidConcentrateRecordValid( &acidConc->acidConcentrate[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_BICARB_CONCENTRATES_RECORD_T* bicarbConc = &dgCalibrationRecord.dgCalibrationGroups.bicarbConcentratesRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_BICARB_CONCENTRATES; i++ )
     {
-        isHardwareRecordValid = isDGBicarbConcentrateRecordValid( &bicarbConc->bicarbConcentrate[ i ], TRUE );
+        isHardwareRecordValid = isDGBicarbConcentrateRecordValid( &bicarbConc->bicarbConcentrate[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     DG_FILTER_CAL_RECORD_T* roFilter = &dgCalibrationRecord.dgCalibrationGroups.filtersRecord.roFilter;
-    isHardwareRecordValid = isDGFilterRecordValid( roFilter, FALSE );
+    isHardwareRecordValid = isDGFilterRecordValid( roFilter );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_FILTER_CAL_RECORD_T* ultraFilter = &dgCalibrationRecord.dgCalibrationGroups.filtersRecord.ultraFilter;
-    isHardwareRecordValid = isDGFilterRecordValid( ultraFilter, FALSE );
+    isHardwareRecordValid = isDGFilterRecordValid( ultraFilter );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_FILTER_CAL_RECORD_T* sedimentFilter = &dgCalibrationRecord.dgCalibrationGroups.filtersRecord.sedimentFilter;
-    isHardwareRecordValid = isDGFilterRecordValid( sedimentFilter, FALSE );
+    isHardwareRecordValid = isDGFilterRecordValid( sedimentFilter );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_FILTER_CAL_RECORD_T* carbonFilter = &dgCalibrationRecord.dgCalibrationGroups.filtersRecord.carbonFilter;
-    isHardwareRecordValid = isDGFilterRecordValid( carbonFilter, FALSE );
+    isHardwareRecordValid = isDGFilterRecordValid( carbonFilter );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_FILTER_CAL_RECORD_T* carbonPolishFilter = &dgCalibrationRecord.dgCalibrationGroups.filtersRecord.carbonPolishFilter;
-    isHardwareRecordValid = isDGFilterRecordValid( carbonPolishFilter, FALSE );
+    isHardwareRecordValid = isDGFilterRecordValid( carbonPolishFilter );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_FANS_CAL_RECORD_T* fan = &dgCalibrationRecord.dgCalibrationGroups.fansRecord;
-    isHardwareRecordValid = isDGFanRecordValid( &fan->fan1, FALSE );
+    isHardwareRecordValid = isDGFanRecordValid( &fan->fan1 );
 
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
-    isHardwareRecordValid = isDGFanRecordValid( &fan->fan2, FALSE );
+    isHardwareRecordValid = isDGFanRecordValid( &fan->fan2 );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     DG_ACCELEROMETER_SENSOR_CAL_RECORD_T* accelerometer = &dgCalibrationRecord.dgCalibrationGroups.accelerometerCalRecord;
-    isHardwareRecordValid = isDGAccelerometerSensorRecordValid( accelerometer, FALSE );
+    isHardwareRecordValid = isDGAccelerometerSensorRecordValid( accelerometer );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     return isCalRecordValid;
@@ -3151,12 +3134,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_CONC_PUMPS_CAL_DATA_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record, BOOL isRecordNeeded )
+static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_CONC_PUMPS_CAL_DATA_T) - sizeof(U16) );
@@ -3169,27 +3149,10 @@
         record->calibrationTime     = RECORD_DEFAULT_TIME;
         record->crc                 = crc16 ( (U08*)record, sizeof(DG_CONC_PUMPS_CAL_DATA_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3200,12 +3163,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_DRAIN_PUMP_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_DRAIN_PUMP_CAL_RECORD_T) - sizeof(U16) );
@@ -3219,27 +3179,10 @@
         record->calibrationTime     = RECORD_DEFAULT_TIME;
         record->crc                 = crc16 ( (U08*)record, sizeof(DG_DRAIN_PUMP_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3250,12 +3193,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_RO_PUMP_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_RO_PUMP_CAL_RECORD_T) - sizeof(U16) );
@@ -3270,27 +3210,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_RO_PUMP_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3301,12 +3224,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_DRAIN_LINE_VOLUME_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGDrainLineVolRecordValid( DG_DRAIN_LINE_VOLUME_T* record, BOOL isRecordNeeded )
+static BOOL isDGDrainLineVolRecordValid( DG_DRAIN_LINE_VOLUME_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_DRAIN_LINE_VOLUME_T) - sizeof(U16) );
@@ -3319,24 +3239,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_DRAIN_LINE_VOLUME_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass
-        activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3347,12 +3253,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_RESERVOIR_VOLUME_DATA_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGReservoirVolRecordValid( DG_RESERVOIR_VOLUME_DATA_T* record, BOOL isRecordNeeded )
+static BOOL isDGReservoirVolRecordValid( DG_RESERVOIR_VOLUME_DATA_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_RESERVOIR_VOLUME_DATA_T) - sizeof(U16) );
@@ -3368,24 +3271,10 @@
         record->calibrationTime     = RECORD_DEFAULT_TIME;
         record->crc                 = crc16 ( (U08*)record, sizeof(DG_RESERVOIR_VOLUME_DATA_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass
-        activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3396,12 +3285,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_GENERIC_VOLUME_DATA_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGGenericVolRecordValid( DG_GENERIC_VOLUME_DATA_T* record, BOOL isRecordNeeded )
+static BOOL isDGGenericVolRecordValid( DG_GENERIC_VOLUME_DATA_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_GENERIC_VOLUME_DATA_T) - sizeof(U16) );
@@ -3414,27 +3300,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_GENERIC_VOLUME_DATA_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3445,12 +3314,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_ACID_CONCENTRATE_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGAcidConcentrateRecordValid( DG_ACID_CONCENTRATE_T* record, BOOL isRecordNeeded )
+static BOOL isDGAcidConcentrateRecordValid( DG_ACID_CONCENTRATE_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_ACID_CONCENTRATE_T) - sizeof(U16) );
@@ -3465,24 +3331,10 @@
         record->calibrationTime  = RECORD_DEFAULT_TIME;
         record->crc              = crc16 ( (U08*)record, sizeof(DG_ACID_CONCENTRATE_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass
-        activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3493,12 +3345,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_BICARB_CONCENTRATE_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGBicarbConcentrateRecordValid( DG_BICARB_CONCENTRATE_T* record, BOOL isRecordNeeded )
+static BOOL isDGBicarbConcentrateRecordValid( DG_BICARB_CONCENTRATE_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_BICARB_CONCENTRATE_T) - sizeof(U16) );
@@ -3520,17 +3369,6 @@
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3541,12 +3379,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_FILTER_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGFilterRecordValid( DG_FILTER_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isDGFilterRecordValid( DG_FILTER_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_FILTER_CAL_RECORD_T) - sizeof(U16) );
@@ -3561,27 +3396,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_FILTER_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3592,12 +3410,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_FAN_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGFanRecordValid( DG_FAN_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isDGFanRecordValid( DG_FAN_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_FAN_CAL_RECORD_T) - sizeof(U16) );
@@ -3611,27 +3426,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_FAN_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3642,12 +3440,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: DG_ACCELEROMETER_SENSOR_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isDGAccelerometerSensorRecordValid( DG_ACCELEROMETER_SENSOR_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isDGAccelerometerSensorRecordValid( DG_ACCELEROMETER_SENSOR_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(DG_ACCELEROMETER_SENSOR_CAL_RECORD_T) - sizeof(U16) );
@@ -3662,27 +3457,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(DG_ACCELEROMETER_SENSOR_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 #endif
@@ -3705,14 +3483,14 @@
     HD_PUMPS_CAL_RECORD_T* pump = &hdCalibrationRecord.hdCalibrationGroups.pumpsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_HD_PUMPS; i++ )
     {
-        isHardwareRecordValid = isHDPumpRecordValid( &pump->hdPumps[ i ], FALSE );
+        isHardwareRecordValid = isHDPumpRecordValid( &pump->hdPumps[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     HD_VALVES_CAL_RECORD_T* valve = &hdCalibrationRecord.hdCalibrationGroups.valvesCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_HD_VALVES; i++ )
     {
-        isHardwareRecordValid = isHDValveRecordValid( &valve->hdvalves[ i ], FALSE );
+        isHardwareRecordValid = isHDValveRecordValid( &valve->hdvalves[ i ] );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
@@ -3726,42 +3504,42 @@
         // valid, the values should be set to benign values. This variable is used to decide
         // whether a write should be scheduled or not so it should not be overwritten with a TRUE
         // once a record set it to FALSE
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     HD_FLOW_SENSORS_CAL_RECORD_T* flow = &hdCalibrationRecord.hdCalibrationGroups.flowSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_HD_FLOW_SENSORS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&flow->hdFlowSensors[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     HD_PRESSURE_SENSORS_CAL_RECORD_T* pressure = &hdCalibrationRecord.hdCalibrationGroups.pressureSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_HD_PRESSURE_SESNSORS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&pressure->hdPressureSensors[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
     HD_TEMP_SENSORS_CAL_RECORD_T* temperature = &hdCalibrationRecord.hdCalibrationGroups.tempSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_HD_TEMP_SENSORS; i++ )
     {
         record = (POLYNOMIAL_CAL_PAYLOAD_T*)&temperature->hdTemperatureSensors[ i ];
-        isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid = isCalRecordValid == FALSE ? FALSE :isHardwareRecordValid;
     }
 
     HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T* heparinForce = &hdCalibrationRecord.hdCalibrationGroups.heparinForceSensorCalRecord;
     record = (POLYNOMIAL_CAL_PAYLOAD_T*)&heparinForce->hdHeparinForceSensor;
-    isHardwareRecordValid = isPolynomialRecordValid( record, TRUE );
+    isHardwareRecordValid = isPolynomialRecordValid( record );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
 
     HD_ACCELEROMETER_SENSOR_CAL_RECORD_T* accelerometer = &hdCalibrationRecord.hdCalibrationGroups.accelerometerCalRecord;
-    isHardwareRecordValid = isHDAccelerometerSensorValid( accelerometer, TRUE );
+    isHardwareRecordValid = isHDAccelerometerSensorValid( accelerometer );
     isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
 
     return isCalRecordValid;
@@ -3774,12 +3552,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: HD_PUMP_CAL_PAYLOAD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isHDPumpRecordValid( HD_PUMP_CAL_PAYLOAD_T* record, BOOL isRecordNeeded )
+static BOOL isHDPumpRecordValid( HD_PUMP_CAL_PAYLOAD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(HD_PUMP_CAL_PAYLOAD_T) - sizeof(U16) );
@@ -3795,27 +3570,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(HD_PUMP_CAL_PAYLOAD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3826,12 +3584,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: HD_VALVE_CAL_PAYLOAD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isHDValveRecordValid( HD_VALVE_CAL_PAYLOAD_T* record, BOOL isRecordNeeded )
+static BOOL isHDValveRecordValid( HD_VALVE_CAL_PAYLOAD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(HD_VALVE_CAL_PAYLOAD_T) - sizeof(U16) );
@@ -3844,27 +3599,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(HD_VALVE_CAL_PAYLOAD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 
@@ -3875,12 +3613,9 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param record: HD_ACCELEROMETER_SENSOR_CAL_RECORD_T pointer
- * @param isRecordNeeded: flag to define whether the record has to be
- * checked for cal date and raise an alarm if the CRC was not right or
- * the cal date was set to default
  * @return TRUE if the record is valid otherwise FALSE
  *************************************************************************/
-static BOOL isHDAccelerometerSensorValid( HD_ACCELEROMETER_SENSOR_CAL_RECORD_T* record, BOOL isRecordNeeded )
+static BOOL isHDAccelerometerSensorValid( HD_ACCELEROMETER_SENSOR_CAL_RECORD_T* record )
 {
     BOOL status   = TRUE;
     U16 calcCRC   = crc16 ( (U08*)record, sizeof(HD_ACCELEROMETER_SENSOR_CAL_RECORD_T) - sizeof(U16) );
@@ -3895,27 +3630,10 @@
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof(HD_ACCELEROMETER_SENSOR_CAL_RECORD_T) - sizeof(U16) );
 
-        // Alarm if the CRC did not pass and the record is needed
-        if ( TRUE == isRecordNeeded )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID );
-        }
-
         // Set the to FALSE since the record is not valid
         status = FALSE;
     }
 
-    // Check if the record is needed. If it is needed, it should have a valid
-    // calibration time associated with it.
-    if ( TRUE == isRecordNeeded )
-    {
-        // Check if the calibration time of the record is the default value
-        if ( record->calibrationTime == RECORD_DEFAULT_TIME )
-        {
-            activateAlarmNoData( ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID );
-        }
-    }
-
     return status;
 }
 #endif