Index: NVDataMgmtDGRecords.h =================================================================== diff -u -raea81a89de5810907303dad01b2faaa15fe8e295 -r6b11ea4a37a54cd47af543900dfa68dac27c8c7e --- NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision aea81a89de5810907303dad01b2faaa15fe8e295) +++ NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 6b11ea4a37a54cd47af543900dfa68dac27c8c7e) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file NVDataMgmtDGRecords.h * * @author (last) Dara Navaei -* @date (last) 04-Jan-2022 +* @date (last) 01-Jul-2022 * * @author (original) Dara Navaei * @date (original) 12-Feb-2021 @@ -34,6 +34,38 @@ #define MAX_TOP_LEVEL_PN_CHARS 10U ///< Max number of characters for top level part number. #define MAX_TOP_LEVEL_SN_CHARS 15U ///< Max number of characters for top level serial number. +#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, ///< 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_ACID_ALARMS, ///< Software configuration disable acid alarms. + 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, ///< Software configuration disable bicarb conductivity test. + SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST, ///< 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, ///< Software configuration disable mixing in fill. + SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM, ///< Software configuration disable temperature sensors alarm. + SW_CONFIG_ENABLE_V3_SYSTEM, ///< Software configuration enable V3 system. + NUM_OF_SW_CONFIGS ///< Number of software configurations. +} SOFTWARE_CONFIG_T; +#endif + /// DG available NV data to get typedef enum dg_nv_commands { @@ -42,8 +74,19 @@ 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. + GET_CAL_ACCEL_SENSORS, ///< Get accelerometers calibration data. + GET_CAL_CONDUCTIVITY_SENSORS, ///< Get conductivity sensors calibration data. + GET_CAL_TEMP_SENSORS, ///< Get temperature sensors calibration data. + GET_CAL_RSRVRS_VOL_RECORD, ///< Get reservoirs volume record. + GET_CAL_HEATING_RECORD, ///< Get heating calibration record. + GET_CAL_DRAIN_LINE_VOLUME_RECORD, ///< Get drain line volume record. + GET_CAL_RO_PUMP_RECORD, ///< Get RO pump calibration record. + GET_CAL_CONCENTRATE_PUMPS_RECORD, ///< Get concentrate pumps calibration record. + GET_CAL_DRAIN_PUMP_RECORD, ///< Get drain pump calibration record. + GET_CAL_FANS_RECORD, ///< Get fans calibration record. + GET_CAL_PRE_RO_PURGE_VOLUME_RECORD, ///< Get pre RO purge volume record. + GET_CAL_FILTERS_RECORD, ///< Get filters record. GET_INF_HEATERS_RECORD, ///< Get heaters information form the the last run. - GET_MFG_RECORD, ///< Get manufacturing record. GET_SYS_RECORD, ///< Get system record. GET_SRV_RECORD, ///< Get service record. GET_SRR_RECORD, ///< Get scheduled runs record. @@ -147,6 +190,18 @@ NUM_OF_CAL_DATA_BICARB_CONCENTRATES ///< Number of bicarb concentrates. } CAL_DATA_DG_BICARB_CONCENTRATES_T; +/// DG fans enumeration. +typedef enum dg_fans +{ + CAL_DATA_INLET_FAN_1 = 0, ///< Inlet fan 1. + CAL_DATA_INLET_FAN_2, ///< Inlet fan 2. + CAL_DATA_INLET_FAN_3, ///< Inlet fan 3. + CAL_DATA_OUTLET_FAN_1, ///< Outlet fan 1. + CAL_DATA_OUTLET_FAN_2, ///< Outlet fan 2. + CAL_DATA_OUTLET_FAN_3, ///< Outlet fan 3. + NUM_OF_CAL_DATA_FANS ///< Number of fans. +} CAL_DATA_DG_FANS_T; + /// DG scheduled runs enumeration. typedef enum dg_scheduled_runs { @@ -356,8 +411,7 @@ /// DG fans calibration data structure typedef struct { - DG_FAN_CAL_RECORD_T fan1; ///< Fan 1. - DG_FAN_CAL_RECORD_T fan2; ///< Fan 2. + DG_FAN_CAL_RECORD_T fans[ NUM_OF_CAL_DATA_FANS ]; ///< Fans calibration record. } DG_FANS_CAL_RECORD_T; /// HD accelerometer sensor calibration record @@ -415,7 +469,10 @@ /// DG usage info structure. typedef struct { - U32 waterConsumption; ///< Water consumption. + F32 roWaterGenTotalL; ///< Total RO water generated in liters. (Cannot be reset) + F32 roWaterGenSinceLastServiceL; ///< RO water generated since last treatment in liters. + U32 lastDisinfectDate; ///< Last disinfect date in epoch. + U32 isDisinfected; ///< Disinfect status boolean flag. U16 crc; ///< CRC for the DG usage info structure. } DG_USAGE_INFO_RECORD_T; @@ -425,6 +482,14 @@ F32 averageFillFlow; ///< Average fill flow rate. } DG_HEATERS_RECORD_T; +#ifndef _RELEASE_ +/// DG software configurations +typedef struct +{ + U08 swConfigs[ NUM_OF_SW_CONFIGS ]; ///< Software configurations. +} DG_SW_CONFIG_RECORD_T; +#endif + #pragma pack(pop) /**@}*/