Index: NVDataMgmtHDRecords.h =================================================================== diff -u -r3a57b1955aa7516898e4c2c855978bbf01c8ec62 -r59871c9964559b5137781af9c2eeed6bab18ef73 --- NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 3a57b1955aa7516898e4c2c855978bbf01c8ec62) +++ NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 59871c9964559b5137781af9c2eeed6bab18ef73) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2021-2024 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 NVDataMgmtHDRecords.h * * @author (last) Dara Navaei -* @date (last) 13-Jul-2022 +* @date (last) 26-Jun-2023 * * @author (original) Dara Navaei * @date (original) 13-Feb-2021 @@ -33,7 +33,7 @@ // ********** public definitions ********** #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. +#define MAX_TOP_LEVEL_SN_CHARS 20U ///< Max number of characters for top level serial number. #ifndef _RELEASE_ /// Software configuration enums @@ -42,7 +42,7 @@ SW_CONFIG_DISABLE_ALARM_AUDIO = 0, ///< Software configuration disable alarm audio. SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM, ///< Software configuration disable air trap leveling alarm. SW_CONFIG_DISABLE_ACK_ERRORS, ///< Software configuration disable acknowledge errors. - SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE, ///< Software configuration enable worn out cartridge. + SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE, // TODO remove ///< Software configuration enable worn out cartridge. SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS, ///< Software configuration disable motor current checks. SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS, ///< Software configuration disable pump flow checks. SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS, ///< Software configuration disable pump direction checks. @@ -64,10 +64,10 @@ SW_CONFIG_DISABLE_UI_INTERACTION, ///< Software configuration disable UI interaction. SW_CONFIG_DISABLE_SAMPLE_WATER, ///< Software configuration disable sample water. SW_CONFIG_DISABLE_CONSUMABLES_TESTS, ///< Software configuration disable consumables tests. - SW_CONFIG_DISABLE_DRY_SELF_TESTS, ///< Software configuration disable dry self tests. - SW_CONFIG_DISABLE_PRIMING, ///< Software configuration disable priming. - SW_CONFIG_DISABLE_WET_SELF_TEST, ///< Software configuration disable wet self test. - SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL, ///< Software configuration enable wet self test wider volume tolerance. + SW_CONFIG_DISABLE_DRY_SELF_TESTS, // TODO remove ///< Software configuration disable dry self tests. + SW_CONFIG_DISABLE_PRIMING, // TODO remove ///< Software configuration disable priming. + SW_CONFIG_DISABLE_WET_SELF_TEST, // TODO remove ///< Software configuration disable wet self test. + SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL, // TODO remove ///< Software configuration enable wet self test wider volume tolerance. SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS, ///< Software configuration disable ultrafiltration alarms. SW_CONFIG_DISABLE_BUBBLE_ALARMS, ///< Software configuration disable bubble alarms. SW_CONFIG_DISABLE_ACCELEROMETERS, ///< Software configuration disable accelerometers. @@ -76,12 +76,13 @@ SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS, ///< Software configuration disable pumps flow limits. SW_CONFIG_DISABLE_UI_COMM_ALARMS, ///< Software configuration disable UI communications alarms. SW_CONFIG_DISABLE_VOLTAGES_ALARMS, ///< Software configuration disable voltages alarms. - SW_CONFIG_ENABLE_1_MIN_TREATMENT, ///< Software configuration enable 1-minute treatment. + SW_CONFIG_ENABLE_1_MIN_TREATMENT, // TODO remove ///< Software configuration enable 1-minute treatment. SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP, ///< Software configuration enable blood pump open loop. SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP, ///< Software configuration enable dialysate inlet pump open loop. SW_CONFIG_DISABLE_SWITCHES_MONITOR, ///< Software configuration disable switches monitor. SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C, ///< Software configuration enable VBA special position C. - SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK, ///< Software configuration disable service and disinfect checks. + SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK, // TODO remove ///< Software configuration disable service and disinfect checks. + SW_CONFIG_DISABLE_AIR_PUMP, // TODO remove ///< Software configuration disable air pump. NUM_OF_SW_CONFIGS ///< Number of software configurations. } SOFTWARE_CONFIG_T; #endif @@ -99,6 +100,7 @@ GET_CAL_VALVES, ///< Get valves calibration data. GET_SYS_RECORD, ///< Get system record data. GET_SRV_RECORD, ///< Get service record data. + GET_USAGE_RECORD, ///< Get usage record. NUM_OF_NV_HD_DATA ///< Number of non-volatile data. } NV_DATA_T; @@ -259,7 +261,7 @@ U08 serviceLoc; ///< HD service location. U32 lastServiceEpochDate; ///< HD last service date in epoch. U32 serviceIntervalSeconds; ///< HD service interval in seconds. - //U32 lastResetTimeEpoch; ///< Last time the record was reset in epoch. + U32 lastResetTimeEpoch; ///< Last time the record was reset in epoch. U16 crc; ///< CRC for the HD service record structure. } HD_SERVICE_RECORD_T;