Index: NVDataMgmtHDRecords.h =================================================================== diff -u -r7d3731085a0c0a51daf7733236461f4f56a1126a -r5219e494ba9ca763d3897acb4f74cb146ed623ce --- NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 7d3731085a0c0a51daf7733236461f4f56a1126a) +++ NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 5219e494ba9ca763d3897acb4f74cb146ed623ce) @@ -8,7 +8,7 @@ * @file NVDataMgmtHDRecords.h * * @author (last) Dara Navaei -* @date (last) 04-Jan-2022 +* @date (last) 13-Jul-2022 * * @author (original) Dara Navaei * @date (original) 13-Feb-2021 @@ -39,46 +39,49 @@ /// Software configuration enums typedef enum software_configurations { - SW_CONFIG_DISABLE_ALARM_AUDIO = 0, - SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM, - SW_CONFIG_DISABLE_ACK_ERRORS, - SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE, - SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS, - SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS, - SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS, - SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS, - SW_CONFIG_DISABLE_SYRINGE_PUMP, - SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS, - SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS, - SW_CONFIG_DISABLE_PRESSURE_CHECKS, - SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK, - SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK, - SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK, - SW_CONFIG_DISABLE_CALIBRATION_CHECK, - SW_CONFIG_ENABLE_ALARM_VOLUME_DEFAULT_LOW, - SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM, - SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK, - SW_CONFIG_DISABLE_OCCLUSION_SELF_TEST, - SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST, - SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM, - SW_CONFIG_DISABLE_UI_INTERACTION, - SW_CONFIG_DISABLE_SAMPLE_WATER, - SW_CONFIG_DISABLE_CONSUMABLES_TESTS, - SW_CONFIG_DISABLE_DRY_SELF_TESTS, - SW_CONFIG_DISABLE_PRIMING, - SW_CONFIG_DISABLE_WET_SELF_TEST, - SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR, - SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS, - SW_CONFIG_DISABLE_BUBBLE_ALARMS, - SW_CONFIG_DISABLE_ACCELEROMETERS, - SW_CONFIG_DISABLE_RESERVOIRS_ALARMS, - SW_CONFIG_DISABLE_CARTRIDGE_REMOVAL_STEP, - SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS, - SW_CONFIG_DISABLE_UI_COMM_ALARMS, - SW_CONFIG_DISABLE_VOLTAGES_ALARMS, - SW_CONFIG_ENABLE_1_MIN_TREATMENT, - SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP, - SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP, + 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_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. + SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS, ///< Software configuration disable pump speed checks. + SW_CONFIG_DISABLE_SYRINGE_PUMP, ///< Software configuration disable syringe pump. + SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS, ///< Software configuration enable syringe pump commands. + SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS, ///< Software configuration disable syringe pump alarms. + SW_CONFIG_DISABLE_PRESSURE_CHECKS, ///< Software configuration disable pressure checks. + SW_CONFIG_DISABLE_ARTERIAL_PRESSURE_CHECK, ///< Software configuration disable arterial pressure check. + SW_CONFIG_DISABLE_VENOUS_PRESSURE_CHECK, ///< Software configuration disable venous pressure check. + SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK, ///< Software configuration disable dialysate temperature check. + SW_CONFIG_DISABLE_CAL_CHECK, ///< Software configuration disable calibration check. + SW_CONFIG_ENABLE_ALARM_VOLUME_DEFAULT_LOW, ///< Software configuration enable alarm default low volume. + SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM, ///< Software configuration disable illegal air trap alarm. + SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK, ///< Software configuration disable air bubble check self tests. + SW_CONFIG_DISABLE_OCCLUSION_SELF_TEST, ///< Software configuration disable occlusion self test. + SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST, ///< Software configuration disable blood leak self test. + SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM, ///< Software configuration disable blood leak alarm. + 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_DVT_ARTERIAL_PRESSURE_SENSOR, ///< Software configuration enable DVT arterial pressure sensor. + 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. + SW_CONFIG_DISABLE_RESERVOIRS_ALARMS, ///< Software configuration disable reservoirs alarms. + SW_CONFIG_DISABLE_CARTRIDGE_REMOVAL_STEP, ///< Software configuration disable cartridge removal step. + 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_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_ENABLE_V3_SYSTEM, ///< Software configuration enable V3 system. NUM_OF_SW_CONFIGS ///< Number of software configurations. } SOFTWARE_CONFIG_T; #endif @@ -209,7 +212,9 @@ /// HD heparin force sensor calibration record typedef struct { - POLYNOMIAL_CAL_PAYLOAD_T hdHeparinForceSensor; ///< HD heparin force sensor calibration data. + F32 hdHeparinForceSensorDACVoltage; ///< HD heparin force sensor calibration data. + U32 calibrationTime; ///< Calibration time. + U16 crc; ///< CRC for the HD heparin pump calibration payload. } HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T; /// HD accelerometer sensor calibration record @@ -252,7 +257,9 @@ /// HD usage info structure. typedef struct { - U32 treatmentTime; ///< Treatment time. + F32 txTimeTotalHrs; ///< Treatment time total in hours (never reset). + F32 txTimeSinceLastSrvcHrs; ///< Treatment time since last service in hours. + U32 txLastStartTimeEpoch; ///< Last treatment time in epoch. U16 crc; ///< CRC for the HD usage info structure. } HD_USAGE_INFO_RECORD_T;