Index: NVDataMgmt.c =================================================================== diff -u -r19f9abb8e8c09a0d703eb330aab85bb89a7a9807 -r681347e90f2c9cb327ea40aa31801acaa9c5cff8 --- NVDataMgmt.c (.../NVDataMgmt.c) (revision 19f9abb8e8c09a0d703eb330aab85bb89a7a9807) +++ NVDataMgmt.c (.../NVDataMgmt.c) (revision 681347e90f2c9cb327ea40aa31801acaa9c5cff8) @@ -597,7 +597,6 @@ static BOOL isDGServiceRecordValid( void ); static BOOL isDGUsageRecordValid( void ); static BOOL isDGCalibrationRecordValid( void ); -static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record ); // TODO Remove static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record ); static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record ); static BOOL isDGPreROPurgeVolumeRecordValid( DG_PRE_RO_PURGE_VOLUME_T* record ); @@ -3121,7 +3120,7 @@ DG_CONC_PUMPS_CAL_RECORD_T* concPump = &dgCalibrationRecord.dgCalibrationGroups.concentratePumpsRecord; for ( i = 0; i < NUM_OF_CAL_DATA_DG_CONC_PUMPS; i++ ) { - record = (POLYNOMIAL_CAL_PAYLOAD_T*)&concPump->concentratePumps[ i ]; + record = &concPump->concentratePumps[ i ]; isHardwareRecordValid = isPolynomialRecordValid( record ); isCalRecordValid = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid; } @@ -3231,35 +3230,6 @@ /*********************************************************************//** * @brief - * The isDGConcPumpRecordValid function checks whether the calibration - * record of concentrate pump is valid or not. - * @details Inputs: none - * @details Outputs: none - * @param record: DG_CONC_PUMPS_CAL_DATA_T pointer - * @return TRUE if the record is valid otherwise FALSE - *************************************************************************/ -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 ) ); - U16 recordCRC = record->crc; - - if ( calcCRC != recordCRC ) - { - // CRC did not pass so set all values to default - record->stepSpeed2FlowRatio = RECORD_DEFAULT_RATIO; - record->calibrationTime = RECORD_DEFAULT_TIME; - record->crc = crc16 ( (U08*)record, sizeof( DG_CONC_PUMPS_CAL_DATA_T ) - sizeof( U16 ) ); - - // Set the to FALSE since the record is not valid - status = FALSE; - } - - return status; -} - -/*********************************************************************//** - * @brief * The isDGDrainPumpRecordValid function checks whether the calibration * record of drain pump is valid or not. * @details Inputs: none Index: NVDataMgmtDGRecords.h =================================================================== diff -u -r19f9abb8e8c09a0d703eb330aab85bb89a7a9807 -r681347e90f2c9cb327ea40aa31801acaa9c5cff8 --- NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 19f9abb8e8c09a0d703eb330aab85bb89a7a9807) +++ NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 681347e90f2c9cb327ea40aa31801acaa9c5cff8) @@ -297,14 +297,6 @@ U16 crc; ///< CRC for the conductivity sensors temperature compensation cal payload. } DG_COND_SENSOR_TEMP_COMP_CAL_PAYLOAD_T; -/// DG concentrate pumps one-gain payload -typedef struct -{ - F32 stepSpeed2FlowRatio; ///< Step speed to flow ratio. - U32 calibrationTime; ///< Calibration time. - U16 crc; ///< CRC for the DG concentrate pumps calibration data. -} DG_CONC_PUMPS_CAL_DATA_T; // TODO remove - /// DG concentrate pumps calibration record typedef struct {