Index: firmware/App/Services/NVRecordsDD.h =================================================================== diff -u -r43e60a63eae841e599ff9106f43177a8f63d22be -r724f9a0cf2b603e988a519420bf95f4aa4da4b93 --- firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision 43e60a63eae841e599ff9106f43177a8f63d22be) +++ firmware/App/Services/NVRecordsDD.h (.../NVRecordsDD.h) (revision 724f9a0cf2b603e988a519420bf95f4aa4da4b93) @@ -18,6 +18,7 @@ #include "Common.h" #include "DDDefs.h" #include "NVDriver.h" +#include "PressureSensor.h" /** * @defgroup NVRecordsDD NVRecordsDD @@ -59,44 +60,10 @@ } PROCESS_RECORD_SPECS_T; -#ifndef _RELEASE_ -/// Software configuration enums -typedef enum software_configurations -{ - SW_CONFIG_DISABLE_TRIMMER_HEATER = 0, ///< Software configuration disable trimmer heater. - SW_CONFIG_DISABLE_ACCELS, ///< Software configuration disable accelerometers. - SW_CONFIG_DISABLE_CAL_CHECK, ///< Software configuration disable calibration check. - SW_CONFIG_DISABLE_HEATERS_MONITOR, ///< Software configuration disable heaters monitor. - SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR, ///< Software configuration disable drain pump monitor. - SW_CONFIG_DISABLE_RO_PUMP_MONITOR, ///< Software configuration disable RO pump monitor. - SW_CONFIG_DISABLE_RO_RATIO_CHECK, // TODO remove ///< Software configuration disable RO ratio check - SW_CONFIG_DISABLE_COND_SENSOR_CHECK, ///< Software configuration disable conductivity sensor check. - SW_CONFIG_DISABLE_WATER_QUALITY_CHECK, ///< Software configuration disable water quality check. - SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL, ///< Software configuration disable flow vs. load cell check in fill. - SW_CONFIG_DISABLE_HEATERS_EFFICIENCY, ///< Software configuration disable heaters efficiency. - SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK, ///< Software configuration disable disinfect conductivity check. - SW_CONFIG_DISABLE_CONC_PUMPS, ///< Software configuration disable concentrate pumps. - SW_CONFIG_DISABLE_CAPS_MONITOR, ///< Software configuration disable cap monitor. - SW_CONFIG_DISABLE_UV_REACTORS, ///< Software configuration disable UV reactors. - SW_CONFIG_DISABLE_VOLTAGES_MONITOR, ///< Software configuration disable voltages monitor. - SW_CONFIG_DISABLE_BICARB_ALARMS, ///< Software configuration disable bicarb alarms. - SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM, ///< Software configuration disable empty bottle alarms. - SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST, // TODO remove ///< Software configuration disable bicarb conductivity test. - SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST, // TODO remove ///< Software configuration disable acid conductivity test. - SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM, ///< Software configuration disable concentrate pumps speed alarm. - SW_CONFIG_DISABLE_MIXING_IN_FILL, // TODO remove ///< Software configuration disable mixing in fill. - SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM, ///< Software configuration disable temperature sensors alarm. - SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK, ///< Software configuration disable concentrate pumps park feature. - SW_CONFIG_ENABLE_USING_TPO_FOR_PRIMARY_HEATER_CONTROL, ///< Software configuration enable TPo for primary heater control. - NUM_OF_SW_CONFIGS ///< Number of software configurations. -} SOFTWARE_CONFIG_T; -#endif - /// DD available NV data to get typedef enum DD_nv_commands { GET_CAL_PRESSURE_SENOSRS = 0, ///< Get pressure sensors calibration data. - GET_CAL_LOAD_CELL_SENSORS, ///< Get load cell sensors calibration data. GET_CAL_FLOW_SENSORS, ///< Get flow sensors calibration data. GET_CAL_ACID_CONCENTREATES, ///< Get acid concentrates calibration data. GET_CAL_BICARB_CONCENTRATES, ///< Get bicarb concentrates calibration data. @@ -111,25 +78,12 @@ GET_CAL_PRE_RO_PURGE_VOLUME_RECORD, ///< Get pre RO purge volume record. GET_CAL_FILTERS_RECORD, ///< Get filters record. GET_CAL_FILL_CONDUCTIVITIES_RECORD, ///< Get fill conductivities record. - GET_INF_HEATERS_RECORD, ///< Get heaters information form the the last run. GET_SYS_RECORD, ///< Get system record. GET_SRV_RECORD, ///< Get service record. - GET_SRR_RECORD, ///< Get scheduled runs record. GET_USAGE_RECORD, ///< Get usage record. NUM_OF_NV_DD_DATA ///< Number of non-volatile data. } NV_DATA_T; -/// DD pressure sensors enumeration. -typedef enum DD_pressure_sensors -{ - CAL_DATA_RO_PUMP_INLET_PRES_SENSOR = 0, ///< DD calibration data RO pump inlet pressure sensor. - CAL_DATA_RO_PUMP_OUTLET_PRES_SENSOR, ///< DD calibration data RO pump outlet pressure sensor. - CAL_DATA_DRAIN_PUMP_INLET_PRES_SENSOR, ///< DD calibration data drain pump inlet pressure sensor. - CAL_DATA_DRAIN_PUMP_OUTLET_PRES_SENSOR, ///< DD calibration data drain pump outlet pressure sensor. - CAL_DATA_BAROMETRIC_PRES_SENSOR, ///< DD calibration data barometric pressure sensor. - NUM_OF_CAL_DATA_PRES_SENSORS, ///< Number of calibration data pressure sensors. -} CAL_DATA_DD_PRES_SENSORS_T; - /// DD flow sensors enumeration. typedef enum DD_flow_sensors { @@ -297,28 +251,19 @@ /// Pressure sensors calibration structure typedef struct { - POLYNOMIAL_CAL_PAYLOAD_T pressureSensors[ NUM_OF_CAL_DATA_PRES_SENSORS ]; ///< Pressure sensors to calibrate. - POLYNOMIAL_CAL_PAYLOAD_T reservedSpace[ PRES_SENSORS_RESERVED_SPACE_COUNT ]; ///< Reserved space for future pressure sensors. + POLYNOMIAL_CAL_PAYLOAD_T pressureSensors[ NUM_OF_PRESSURE_SENSORS ]; ///< Pressure sensors to calibrate. } DD_PRES_SENSORS_CAL_RECORD_T; /// Flow sensors calibration structure typedef struct { POLYNOMIAL_CAL_PAYLOAD_T flowSensors[ NUM_OF_CAL_DATA_FLOW_SENSORS ]; ///< Flow sensors to calibrate. - POLYNOMIAL_CAL_PAYLOAD_T reservedSpace[ FLOW_SENSROS_RESERVED_SPACE_COUNT ]; ///< Reserved space for future flow sensors. } DD_FLOW_SENSORS_CAL_RECORD_T; -/// Load cells calibration structure -typedef struct -{ - POLYNOMIAL_CAL_PAYLOAD_T loadCells[ NUM_OF_CAL_DATA_LOAD_CELLS ]; ///< Load cells to calibrate. -} DD_LOAD_CELLS_CAL_RECORD_T; - /// Temperature sensors calibration structure typedef struct { POLYNOMIAL_CAL_PAYLOAD_T tempSensors[ NUM_OF_CAL_DATA_TEMP_SENSORS ]; ///< Temperature sensors to calibrate. - POLYNOMIAL_CAL_PAYLOAD_T reservedSpace[ TEMP_SENSORS_RESERVED_SPACE_COUNT ]; ///< Reserved space for future temperature sensors. } DD_TEMP_SENSORS_CAL_RECORD_T; /// Drain line volume calibration structure @@ -389,9 +334,6 @@ /// DD filter calibration record typedef struct { - F32 reservedSpace1; ///< DD filter reserved space 1. - F32 reservedSpace2; ///< DD filter reserved space 2. - F32 reservedSpace3; ///< DD filter reserved space 3 U32 calibrationTime; ///< Calibration time. U16 crc; ///< CRC. } DD_FILTER_CAL_RECORD_T; @@ -409,8 +351,6 @@ /// DD fan calibration data structure typedef struct { - F32 reservedSpace1; ///< Reserved space 1. - F32 reservedSpace2; ///< Reserved space 2. U32 calibrationTime; ///< Calibration time. U16 crc; ///< CRC. } DD_FAN_CAL_RECORD_T; @@ -466,35 +406,6 @@ U16 crc; ///< CRC for the DD system record structure. } DD_SYSTEM_RECORD_T; -/// DD scheduled runs record structure -typedef struct -{ - U32 lastRunTime; ///< DD scheduled run last run time. - U16 crc; ///< CRC for the DD scheduled run record structure. -} DD_SCHEDULED_RUN_T; - -/// DD scheduled run record structure -typedef struct -{ - DD_SCHEDULED_RUN_T ddScheduledRun[ NUM_OF_DD_SCHEDULED_RUNS ]; ///< DD scheduled run. -} DD_SCHEDULED_RUN_RECORD_T; - -/// DD heaters information structure -typedef struct -{ - F32 averageFillFlow; ///< Average fill flow rate. -} DD_HEATERS_RECORD_T; - -#ifndef _RELEASE_ -/// DD software configurations -typedef struct -{ - U08 swConfigs[ NUM_OF_SW_CONFIGS ]; ///< Software configurations. -} DD_SW_CONFIG_RECORD_T; -#endif -#pragma pack(pop) - -#pragma pack(push, 1) /// DD usage info structure. typedef struct { @@ -535,11 +446,6 @@ void updateNVSelfTestResult( SELF_TEST_STATUS_T result ); void updateNVSelfTestState( NVDATAMGMT_SELF_TEST_STATE_T state ); void updateSelfTestReadRecordsFlag ( BOOL value ); - -#ifndef _RELEASE_ -U08 getSoftwareConfigStatus( SOFTWARE_CONFIG_T config ); -#endif - /**@}*/ #endif /* _NV_RECORDS_DD_H_ */