Index: Accel.c =================================================================== diff -u -r707cf591bec11cd3e8b2474811661011a2873b40 -r3ef35af7d1ce059845d1dc682638dec735eea831 --- Accel.c (.../Accel.c) (revision 707cf591bec11cd3e8b2474811661011a2873b40) +++ Accel.c (.../Accel.c) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -1,6 +1,6 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-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. Index: NVDataMgmt.c =================================================================== diff -u -rdaa771cd56143d94152b4a72821901d54d0f5902 -r3ef35af7d1ce059845d1dc682638dec735eea831 --- NVDataMgmt.c (.../NVDataMgmt.c) (revision daa771cd56143d94152b4a72821901d54d0f5902) +++ NVDataMgmt.c (.../NVDataMgmt.c) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -1,6 +1,6 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-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. Index: NVDataMgmt.h =================================================================== diff -u -r09b8648f878639c4a8de458c7b9aa8b697c538ec -r3ef35af7d1ce059845d1dc682638dec735eea831 --- NVDataMgmt.h (.../NVDataMgmt.h) (revision 09b8648f878639c4a8de458c7b9aa8b697c538ec) +++ NVDataMgmt.h (.../NVDataMgmt.h) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -1,6 +1,6 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-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. Index: NVDataMgmtDGRecords.h =================================================================== diff -u -rf6a6fc7f2738435a34bf01ffd166cbc5d53b895c -r3ef35af7d1ce059845d1dc682638dec735eea831 --- NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision f6a6fc7f2738435a34bf01ffd166cbc5d53b895c) +++ NVDataMgmtDGRecords.h (.../NVDataMgmtDGRecords.h) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -1,6 +1,6 @@ /************************************************************************** * -* 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. Index: NVDataMgmtHDRecords.h =================================================================== diff -u -r54a9bd09d6714d7faaa186959988a75ef3b83557 -r3ef35af7d1ce059845d1dc682638dec735eea831 --- NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 54a9bd09d6714d7faaa186959988a75ef3b83557) +++ NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -35,11 +35,65 @@ #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. +/// 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, + NUM_OF_SW_CONFIGS ///< Number of software configurations. +} SOFTWARE_CONFIG_T; + /// HD available NV data to get typedef enum hd_nv_commands { GET_CAL_BLOOD_LEAK_SENSOR = 0, ///< Get blood leak sensor calibration data. GET_CAL_TEMPERATURE_SESNORS, ///< Get temperature sensors calibration data. + GET_CAL_ACCEL_SENSORS, ///< Get accelerometers calibration data. + GET_CAL_HEPARIN_FORCE_SENSOR, ///< Get heparin force sensor calibration data. + GET_CAL_PUMPS, ///< Get pumps calibration data. + GET_CAL_PRESSURE_SENSORS, ///< Get pressure sensors calibration data. + GET_CAL_OCCLUSION_SESNSORS, ///< Get occlusion sensors calibration data. + GET_CAL_VALVES, ///< Get valves calibration data. + GET_SYS_RECORD, ///< Get system record data. + GET_SRV_RECORD, ///< Get service record data. NUM_OF_NV_HD_DATA ///< Number of non-volatile data. } NV_DATA_T; @@ -66,19 +120,9 @@ typedef enum hd_occlusion_sensors { CAL_DATA_BLOOD_PUMP_OCCLUSION_SENSOR = 0, ///< Blood pump occlusion sensor. - CAL_DATA_DIALYSATE_INLET_PUMP_OCCLUSION_SENSOR, ///< Dialysate inlet occlusion sensor. - CAL_DATA_DIALYSATE_OUTLET_PUMP_OCCLUSION_SENSOR, ///< Dialysate outlet occlusion sensor. NUM_OF_CAL_DATA_OCCLUSION_SENSORS, ///< Number of occlusion sensors. } CAL_DATA_HD_OCCLUSION_SENSORS_T; -/// HD flow sensors enumeration. -typedef enum hd_flow_sensors -{ - CAL_DATA_HD_BLOOD_FLOW_SENSOR = 0, ///< Blood flow sensor. - CAL_DATA_HD_DIALYSATE_FLOW_SENSOR, ///< Dialyzer flow sensor. - NUM_OF_CAL_DATA_HD_FLOW_SENSORS, ///< Number of HD flow sensors. -} CAL_DATA_HD_FLOW_SENSORS_T; - /// HD pressure sensors enumeration. typedef enum hd_pressure_sensors { @@ -90,10 +134,11 @@ /// HD temperature sensors enumeration. typedef enum hd_temperature_sensors { - CAL_DATA_HD_BOARD_TEMP_SENSOR_1 = 0, ///< Board temperature sensor 1. - CAL_DATA_HD_BOARD_TEMP_SENSOR_2, ///< Board temperature sensor 2. - CAL_DATA_HD_BOARD_TEMP_SENSOR_3, ///< Board temperature sensor 3. - CAL_DATA_HD_POWER_SUPPLY_TEMP_SENSOR, ///< Power supply temperature sensor. + CAL_DATA_HD_THERMISTOR_ONBOARD_NTC = 0, ///< Onboard NTC thermistor. + CAL_DATA_HD_THERMISTOR_POWER_SUPPLY_1, ///< Power supply 1 therimstor. + CAL_DATA_HD_TEMPSENSOR_FPGA_BOARD, ///< FPGA board temperature sensor. + CAL_DATA_HD_TEMPSENSOR_VENOUS_PRESSURE, ///< Venous pressure sensor temperature sensor. + CAL_DATA_HD_TEMPSENSOR_PBA_ADC, ///< PBA ADC Temperature sensor. NUM_OF_CAL_DATA_HD_TEMP_SENSORS, ///< Number of HD temperature sensors. } CAL_DATA_HD_TEMEPERATURE_SENSORS_T; @@ -147,12 +192,6 @@ POLYNOMIAL_CAL_PAYLOAD_T hdOcclusionSensors[ NUM_OF_CAL_DATA_OCCLUSION_SENSORS ]; ///< HD occlusion sensors calibration data. } HD_OCCLUSION_SENSORS_CAL_RECORD_T; -/// HD flow sensors calibration record -typedef struct -{ - POLYNOMIAL_CAL_PAYLOAD_T hdFlowSensors[ NUM_OF_CAL_DATA_HD_FLOW_SENSORS ]; ///< HD flow sensors calibration data. -} HD_FLOW_SENSORS_CAL_RECORD_T; - /// HD pressure sensors calibration record typedef struct { @@ -214,6 +253,13 @@ U32 treatmentTime; ///< Treatment time. U16 crc; ///< CRC for the HD usage info structure. } HD_USAGE_INFO_RECORD_T; + +/// HD software configurations +typedef struct +{ + U08 swConfigs[ NUM_OF_SW_CONFIGS ]; ///< Software configurations. +} HD_SW_CONFIG_RECORD_T; + #pragma pack(pop) /**@}*/ Index: RTC.c =================================================================== diff -u -re053a222c52e84f31503ed106cf64c2ca920029e -r3ef35af7d1ce059845d1dc682638dec735eea831 --- RTC.c (.../RTC.c) (revision e053a222c52e84f31503ed106cf64c2ca920029e) +++ RTC.c (.../RTC.c) (revision 3ef35af7d1ce059845d1dc682638dec735eea831) @@ -1,6 +1,6 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-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.