Index: AlarmDefs.h =================================================================== diff -u -r975299294fb575b035e58a8aafe809f10dbb8134 -re299de0237dea4b3503fa01613a0d1da6b5731d6 --- AlarmDefs.h (.../AlarmDefs.h) (revision 975299294fb575b035e58a8aafe809f10dbb8134) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e299de0237dea4b3503fa01613a0d1da6b5731d6) @@ -103,7 +103,7 @@ ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65, ///< HD requests DG command with invalid parameter fault ALARM_ID____AVAILABLE_21 = 66, ///< This alarm ID is available for use ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67, ///< HD blood pump occlusion self-test failure alarm - ALARM_ID____AVAILABLE_5 = 68, ///< This alarm ID is available for use + ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE = 68, ///< HD active reservoir recirculation out of range ALARM_ID____AVAILABLE_6 = 69, ///< This alarm ID is available for use ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 70, ///< HD arterial pressure self-test failure alarm ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 71, ///< HD venous pressure self-test failure alarm @@ -203,15 +203,15 @@ ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 165, ///< HD in treatment rinseback operation timeout ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 166, ///< HD in treatment re-circ sub-mode for too long ALARM_ID_CARTRIDGE_DOOR_OPENED = 167, ///< HD cartridge door opened alarm - ALARM_ID____AVAILABLE_1 = 168, ///< This alarm ID is available for use + ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT = 168, ///< HD active reservoir depletion timeout. ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE = 169, ///< Dialysate flow rate out of range ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 170, ///< HD syringe empty alarm ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 171, ///< HD syringe pump occlusion alarm ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 172, ///< HD syringe pump not enough Heparin alarm ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED = 173, ///< HD arterial air bubble detected alarm ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK = 174, ///< HD arterial air bubble detected rinseback alarm ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 175, ///< HD pump direction status error - ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH = 176, ///< HD active reservoir is full during treatment and DG not ready to switch reservoirs. + ALARM_ID_HD_RESERVOIR_FULL_AND_DG_NOT_READY_TO_SWITCH = 176, // TODO remove this alarm ///< HD active reservoir is full during treatment and DG not ready to switch reservoirs. ALARM_ID_DG_SOFTWARE_FAULT = 177, ///< DG software fault. Software found itself in an unexpected state ALARM_ID_HD_COMM_TIMEOUT = 178, ///< HD communication timeout ALARM_ID_DG_FPGA_COMM_TIMEOUT = 179, ///< DG FPGA communication down for too long @@ -313,7 +313,7 @@ ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275, ///< HD arterial pressure sensor is reading out of range ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276, ///< HD venous pressure sensor is reading out of range ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range - ALARM_ID____AVAILABLE_3 = 278, ///< This alarm ID is available for use + ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 278, ///< HD active reservoir weight out of range. ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT = 279, ///< DG dialysate drain time out ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR = 280, ///< HD arterial pressure sensor read timeout error ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281, ///< Acid concentration bottle low volume alarm @@ -512,7 +512,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_21, 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_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_5, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_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____AVAILABLE_6, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, 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_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -616,7 +616,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_DOOR_OPENED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID____AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, ALARM_ID_NO_ALARM }, @@ -731,7 +731,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_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____AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, @@ -827,7 +827,7 @@ { 3, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT }, { 3, ALARM_ID____AVAILABLE_21 }, { 3, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, - { 3, ALARM_ID____AVAILABLE_5 }, + { 3, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, { 3, ALARM_ID____AVAILABLE_6 }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, @@ -893,7 +893,7 @@ { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE }, - { 3, ALARM_ID____AVAILABLE_3 }, + { 3, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE }, @@ -945,7 +945,7 @@ { 799, ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM }, { 799, ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM }, { 799, ALARM_ID_CARTRIDGE_DOOR_OPENED }, - { 799, ALARM_ID____AVAILABLE_1 }, + { 799, ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT }, { 799, ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE }, { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY }, { 799, ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION }, Index: MsgDefs.h =================================================================== diff -u -r926c78604466fd653453efe48e86848529477de4 -re299de0237dea4b3503fa01613a0d1da6b5731d6 --- MsgDefs.h (.../MsgDefs.h) (revision 926c78604466fd653453efe48e86848529477de4) +++ MsgDefs.h (.../MsgDefs.h) (revision e299de0237dea4b3503fa01613a0d1da6b5731d6) @@ -197,6 +197,7 @@ MSG_ID_DG_EVENT = 0xA5, ///< DG general event MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, ///< DG dialysate flow meter data (liter/minute) MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish + MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing