Index: AlarmDefs.h =================================================================== diff -u -reb656cc8d8c920b5371a616ef0634042fd6481ba -r596a977a071cdb4f1bfd5f311f5017e5d5f128e4 --- AlarmDefs.h (.../AlarmDefs.h) (revision eb656cc8d8c920b5371a616ef0634042fd6481ba) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 596a977a071cdb4f1bfd5f311f5017e5d5f128e4) @@ -122,7 +122,7 @@ ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84, ///< HD venous pressure sensor not being read ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 85, ///< HD venous pressure sensor temperature out of range error ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86, ///< HD BP occlusion sensor not being read - ALARM_ID____AVAILABLE_10 = 87, ///< This alarm ID is available for use + ALARM_ID_DG_HEATING_INVALID_CAL_RECORD = 87, ///< DG heating invalid calibration record ALARM_ID____AVAILABLE_11 = 88, ///< This alarm ID is available for use ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error ALARM_ID____AVAILABLE_12 = 90, ///< This alarm ID is available for use @@ -179,7 +179,7 @@ ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 141, ///< Air trap fill timeout during treatment ALARM_ID_OCCLUSION_BLOOD_PUMP = 142, ///< Blood pump occlusion detected ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT = 143, ///< DG dialysate temperature sensors drift timeout. - ALARM_ID____AVAILABLE_9 = 144, ///< This alarm ID is available for use + ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC = 144, ///< DG software configuration record invalid CRC. ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 145, ///< Concentrate conductivity after adding acid out of range alarm ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 147, ///< DG dialysate generation conductivity fault alarm @@ -190,7 +190,7 @@ ALARM_ID_INLET_WATER_LOW_PRESSURE = 152, ///< Inlet water pressure too low ALARM_ID_PRIME_COMPLETED_HIGH = 153, ///< HD prime completed high priority alarm ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154, ///< EEPROM operations (read, write, erase) failure - ALARM_ID____AVAILABLE_22 = 155, ///< This alarm ID is available for use + ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155, ///< DG software configuration record invalid CRC ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156, ///< HW usage data (treatment time in HD and total consumed water in DG) failure ALARM_ID____AVAILABLE_23 = 157, ///< This alarm ID is available for use ALARM_ID____AVAILABLE_24 = 158, ///< This alarm ID is available for use @@ -532,7 +532,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_11, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, @@ -591,7 +591,7 @@ { ALARM_PRIORITY_HIGH, 20, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_OCCLUSION_BLOOD_PUMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 21, TRUE, TRUE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID____AVAILABLE_9, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 21, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 22, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 23, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -603,7 +603,7 @@ { ALARM_PRIORITY_HIGH, 34, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_INLET_WATER_LOW_PRESSURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_22, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_24, 0, ALARM_ID_NO_ALARM }, @@ -845,7 +845,7 @@ { 3, ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID____AVAILABLE_10 }, + { 3, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD }, { 3, ALARM_ID____AVAILABLE_11 }, { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, { 3, ALARM_ID____AVAILABLE_12 }, @@ -920,7 +920,7 @@ { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, { 21, ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT }, - { 21, ALARM_ID____AVAILABLE_9 }, + { 21, ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC }, { 22, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { 23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE }, { 24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT }, @@ -931,7 +931,7 @@ { 34, ALARM_ID_INLET_WATER_LOW_PRESSURE }, { 36, ALARM_ID_PRIME_COMPLETED_HIGH }, { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE }, - { 799, ALARM_ID____AVAILABLE_22 }, + { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC }, { 799, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR }, { 799, ALARM_ID____AVAILABLE_23 }, { 799, ALARM_ID____AVAILABLE_24 }, Index: MsgDefs.h =================================================================== diff -u -r1d56f5c3cc978106f56a3d8c0c3f4098ca7934ec -r596a977a071cdb4f1bfd5f311f5017e5d5f128e4 --- MsgDefs.h (.../MsgDefs.h) (revision 1d56f5c3cc978106f56a3d8c0c3f4098ca7934ec) +++ MsgDefs.h (.../MsgDefs.h) (revision 596a977a071cdb4f1bfd5f311f5017e5d5f128e4) @@ -260,8 +260,8 @@ MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE = 0x8032, ///< HD air trap data broadcast interval override request MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033, ///< HD air trap level sensor override request MSG_ID_HD_SOFTWARE_RESET_REQUEST = 0x8034, ///< HD reset request - MSG_ID___AVAILABLE_3 = 0x8035, ///< This message ID is available for use - MSG_ID___AVAILABLE_4 = 0x8036, ///< This message ID is available for use + MSG_ID_HD_GET_SW_CONFIG_RECORD = 0x8035, ///< HD get software configuration record. + MSG_ID_HD_SET_SW_CONFIG_RECORD = 0x8036, ///< HD set software configuration record. MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037, ///< Blood pump home command MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038, ///< Dialysate inlet pump home command MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039, ///< Dialysate outlet pump home command @@ -400,6 +400,8 @@ MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047, ///< Clears all DG alarms (even if non-recoverable or fault) MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0xA048, ///< DG alarm information broadcast interval override request MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0xA049, ///< DG fan RPM alarm start time offset override request + MSG_ID_DG_GET_SW_CONFIG_RECORD = 0xA04A, ///< DG get software configuration record request + MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B, ///< DG set software configuration record MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log