Index: NVDataMgmtDGRecords.h =================================================================== diff -u -r5f45d973e05e0f6d1b4482950552f7678320812e -r422418f4e178fb05df16d7701f2808feee274a3c --- NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 5f45d973e05e0f6d1b4482950552f7678320812e) +++ NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 422418f4e178fb05df16d7701f2808feee274a3c) @@ -179,8 +179,8 @@ /// DG pumps enumeration. typedef enum dg_pumps { - CAL_DATA_CONC_PUMP_CP1 = 0, ///< Concentrate pump 1. - CAL_DATA_CONC_PUMP_CP2, ///< Concentrate pump 2. + CAL_DATA_CONC_PUMP_CP1_ACID = 0, ///< Concentrate pump 1. + CAL_DATA_CONC_PUMP_CP2_BICARB, ///< Concentrate pump 2. NUM_OF_CAL_DATA_DG_CONC_PUMPS ///< Number of DG concentrate pumps. } CAL_DATA_DG_PUMPS_T; @@ -297,18 +297,10 @@ 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; - /// DG concentrate pumps calibration record typedef struct { - DG_CONC_PUMPS_CAL_DATA_T concentratePumps[ NUM_OF_CAL_DATA_DG_CONC_PUMPS ]; ///< DG concentrate pumps calibration data. + POLYNOMIAL_CAL_PAYLOAD_T concentratePumps[ NUM_OF_CAL_DATA_DG_CONC_PUMPS ]; ///< DG concentrate pumps calibration data. } DG_CONC_PUMPS_CAL_RECORD_T; /// DG drain pump two-gain payload