Index: AlarmDefs.h =================================================================== diff -u -rcccd9c9d23a6be09d331ab3aae8b7415757b682d -ree8231a5f396953cee5e8e4bbfd84566ab298993 --- AlarmDefs.h (.../AlarmDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ee8231a5f396953cee5e8e4bbfd84566ab298993) @@ -266,7 +266,7 @@ ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR = 234, ///< DD invalid blood leak sensor calibration record ALARM_ID_TD_RECIRC_TIMEOUT_WARNING = 235, ///< TD recirculate timeout warning ALARM_ID_TD_RECIRC_TIMEOUT = 236, ///< TD recirculate timeout - ALARM_ID_DD_DRY_BICART_FILL_INLET_PRESSURE_LOW = 237, ///< DD drybicart fill inlet pressure(d66) low + ALARM_ID_DD_DRY_BICART_INITIAL_FILL_INLET_PRESSURE_LOW = 237, ///< DD drybicart initial fill inlet pressure(d66) low ALARM_ID_FW_RESERVED_238 = 238, ///< FW reserved for use ALARM_ID_FW_RESERVED_239 = 239, ///< FW reserved for use ALARM_ID_FW_RESERVED_240 = 240, ///< FW reserved for use @@ -302,7 +302,7 @@ ALARM_ID_FW_RESERVED_270 = 270, ///< FW reserved for use ALARM_ID_FW_RESERVED_271 = 271, ///< FW reserved for use ALARM_ID_FW_RESERVED_272 = 272, ///< FW reserved for use - ALARM_ID_FW_RESERVED_273 = 273, ///< FW reserved for use + ALARM_ID_DD_DRY_BICART_SUPPLY_FILL_INLET_PRESSURE_LOW = 273, ///< FW reserved for use ALARM_ID_FW_RESERVED_274 = 274, ///< FW reserved for use ALARM_ID_FW_RESERVED_275 = 275, ///< FW reserved for use ALARM_ID_FW_RESERVED_276 = 276, ///< FW reserved for use @@ -743,7 +743,7 @@ { ALARM_PRIORITY_HIGH, 2, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR }, { ALARM_PRIORITY_LOW, 746, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_RECIRC_TIMEOUT_WARNING }, { ALARM_PRIORITY_HIGH, 13, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_RECIRC_TIMEOUT }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_DRY_BICART_FILL_INLET_PRESSURE_LOW }, + { ALARM_PRIORITY_LOW, 110, ALM_SRC_DD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_DD_DRY_BICART_INITIAL_FILL_INLET_PRESSURE_LOW }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_238 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_239 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_240 }, @@ -780,7 +780,7 @@ { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_270 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_271 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_272 }, - { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_273 }, + { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_DRY_BICART_SUPPLY_FILL_INLET_PRESSURE_LOW }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_274 }, { ALARM_PRIORITY_LOW, 999, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FW_RESERVED_275 }, // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID @@ -974,6 +974,7 @@ { 110, ALARM_ID_TD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC }, { 110, ALARM_ID_TD_BARO_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_TD_AUTO_LOAD_EJECT_HIGH_BP_TORQUE }, + { 110, ALARM_ID_DD_DRY_BICART_INITIAL_FILL_INLET_PRESSURE_LOW }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP }, @@ -1050,7 +1051,6 @@ { 999, ALARM_ID_FW_RESERVED_211 }, { 999, ALARM_ID_FW_RESERVED_212 }, { 999, ALARM_ID_FW_RESERVED_219 }, - { 999, ALARM_ID_DD_DRY_BICART_FILL_INLET_PRESSURE_LOW }, { 999, ALARM_ID_FW_RESERVED_238 }, { 999, ALARM_ID_FW_RESERVED_239 }, { 999, ALARM_ID_FW_RESERVED_240 }, @@ -1086,7 +1086,7 @@ { 999, ALARM_ID_FW_RESERVED_270 }, { 999, ALARM_ID_FW_RESERVED_271 }, { 999, ALARM_ID_FW_RESERVED_272 }, - { 999, ALARM_ID_FW_RESERVED_273 }, + { 999, ALARM_ID_DD_DRY_BICART_SUPPLY_FILL_INLET_PRESSURE_LOW }, { 999, ALARM_ID_FW_RESERVED_274 }, { 999, ALARM_ID_FW_RESERVED_275 }, { 999, ALARM_ID_FW_RESERVED_276 }, @@ -1383,7 +1383,7 @@ { 234 , ALARM_ID_DD_NVM_INVALID_CAL_BLOOD_LEAK_SENSOR , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD POST: Blood Leak sensor CRC | DD invalid blood leak sensor calibration record | If the calculated CRC of the DD blood leak sensor calibration record image does not match the expected CRC. | "}, { 235 , ALARM_ID_TD_RECIRC_TIMEOUT_WARNING , "TD | Temporary Break: Time Limit Approaching | The temporary break time limit is approaching. | Warning: Recirculation Timeout Warning | Time left for Recirculation is 10 minutes. | System has been in Treatment: Recirculate states for 20 minutes. | "}, { 236 , ALARM_ID_TD_RECIRC_TIMEOUT , "TD | Temporary Break: Time Limit Exceeded | The maximum temporary break time has been reached.\n- Blood pump has been stopped.\n- Select End Treatment to end the session. | Process: Recirculation Timeout | Recirculation timeout — system has been in recirculation state for 30 minutes. | System has been in Treatment: Recirculate states for 30 minutes. | "}, - { 237 , ALARM_ID_DD_DRY_BICART_FILL_INLET_PRESSURE_LOW , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Bicart Inlet pressure Low | DD Bicart Inlet pressure is too low | Dry Bicarbonate Fill Cartridge Inlet (D66) pressure < 1.5 PSI | "}, + { 237 , ALARM_ID_DD_DRY_BICART_INITIAL_FILL_INLET_PRESSURE_LOW , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Bicart Inlet pressure Low | DD Bicart Inlet pressure is too low | Dry Bicarbonate Fill Cartridge Inlet (D66) pressure < 1.5 PSI | "}, { 238 , ALARM_ID_FW_RESERVED_238 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 239 , ALARM_ID_FW_RESERVED_239 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 240 , ALARM_ID_FW_RESERVED_240 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, @@ -1420,7 +1420,7 @@ { 270 , ALARM_ID_FW_RESERVED_270 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 271 , ALARM_ID_FW_RESERVED_271 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 272 , ALARM_ID_FW_RESERVED_272 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, - { 273 , ALARM_ID_FW_RESERVED_273 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, + { 273 , ALARM_ID_DD_DRY_BICART_SUPPLY_FILL_INLET_PRESSURE_LOW , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Bicart Inlet pressure Low | DD Bicart Inlet pressure is too low | Dry Bicarbonate Supply Fill Cartridge Inlet (D66) pressure < 4 PSI | "}, { 274 , ALARM_ID_FW_RESERVED_274 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, { 275 , ALARM_ID_FW_RESERVED_275 , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | TD Fault: RESERVED | RESERVED | RESERVED | "}, // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition Index: DDDefs.h =================================================================== diff -u -rcccd9c9d23a6be09d331ab3aae8b7415757b682d -ree8231a5f396953cee5e8e4bbfd84566ab298993 --- DDDefs.h (.../DDDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) +++ DDDefs.h (.../DDDefs.h) (revision ee8231a5f396953cee5e8e4bbfd84566ab298993) @@ -511,56 +511,55 @@ /// Enumeration of DryBicart fill exec states. enum Dry_Bicart_Fill_Exec_States { - DRY_BICART_FILL_IDLE_STATE = 0, ///< Initial state of dry bicart fill - DRY_BICART_FILL_WATER_STATE, ///< Dry bicart fill water start state - DRY_BICART_VENT_STATE, ///< Dry bicart vent end state - DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state - DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state - NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states + DRY_BICARBONATE_FILL_CARTRIDGE_STATE_IDLE = 0, ///< Initial idle state prior to fill operations + DRY_BICARBONATE_FILL_CARTRIDGE_STATE_FILL_WATER, ///< Active water fill state + DRY_BICARBONATE_FILL_CARTRIDGE_STATE_VENT, ///< Venting state after the fill process + DRY_BICARBONATE_FILL_CARTRIDGE_STATE_DURATION_CHECK, ///< Fill duration check state + NUM_OF_DRY_BICARBONATE_FILL_CARTRIDGE_EXEC_STATES ///< Number of dry bicart fill states }; typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration /// Enumeration of Bicarb chamber fill exec states. -enum Bicarb_Chamber_F_Fill_Exec_States +enum Bicarb_Chamber_F_Supply_Exec_States { - BICARB_CHAMBER_SUPPLY_IDLE_STATE = 0, ///< Initial state of Chamber F supply - BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber supply complete state - BICARB_CARTRIDGE_FILL_WATER_STATE, ///< Dry bicart fill water end state while dialysate delivery - BICARB_SUPPLY_VENT_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state - NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state + BICARBONATE_CHAMBER_SUPPLY_STATE_IDLE = 0, ///< Initial state of Chamber F supply + BICARBONATE_CHAMBER_SUPPLY_STATE_ACTIVE, ///< Bicarb active supply/delivery state + BICARBONATE_CHAMBER_SUPPLY_STATE_CARTRIDGE_FILL_WATER, ///< Water fill state for bicart during delivery + BICARBONATE_CHAMBER_SUPPLY_STATE_OCEAN_SPRAY_DECAY, ///< Ocean spray decay settling state prior to venting + BICARBONATE_CHAMBER_SUPPLY_STATE_CARTRIDGE_VENT, ///< Cartridge and chamber F venting completion state + NUM_OF_BICARBONATE_CHAMBER_SUPPLY_EXEC_STATES ///< Number of Bicarb chamber supply state }; -typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration +typedef enum Bicarb_Chamber_F_Supply_Exec_States BICARB_CHAMBER_SUPPLY_EXEC_STATE_T; ///< Type for bicarb chamber supply exec state enumeration /// Enumeration of DryBicart drain exec states enum Dry_Bicart_Drain_Exec_States { - BICART_DRAIN_IDLE_STATE = 0, ///< Initial state of dry bicart drain - BICART_DRAIN_STATE, ///< Dry bicart bicarb drain state - BICART_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart bicarb drain duration check state - NUM_OF_DRY_BICART_DRAIN_EXEC_STATES ///< Number of dry bicart drain states + DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_IDLE = 0, ///< Initial state of dry bicart drain + DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_DRAIN, ///< Dry bicart bicarb drain state + DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_DURATION_CHECK, ///< Dry bicart bicarb drain duration check state + NUM_OF_DRY_BICARBONATE_DRAIN_CARTRIDGE_EXEC_STATES ///< Number of dry bicart drain states }; typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration /// Enumeration of drybicart depressurize exec states enum Dry_Bicart_Depressurize_Exec_States { - DRY_BICART_DEPRESSURIZE_IDLE_STATE = 0, ///< Initial state of dry bicart depressurise - DRY_BICART_DEPRESSURIZE_STATE, ///< Dry bicart depressurize vent start state - NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES ///< Number of dry bicart depressurize states + DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_STATE_IDLE = 0, ///< Initial state of dry bicart depressurise + DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_STATE_VENT, ///< Dry bicart depressurize vent state + NUM_OF_DRY_DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_EXEC_STATES ///< Number of dry bicart depressurize states }; typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize exec state enumeration -/// Enumeration of transient sequence step states -enum SequenceStep_States +enum Dry_Bicart_Drain_Depressurize_Commands { - SEQUENCE_STEP0_STATE = 0, ///< Initial state of transient sequence step state - SEQUENCE_STEP1_STATE, ///< Transient sequence step2 state - SEQUENCE_STEP2_STATE, ///< Transient sequence step3 state - NUM_OF_SEQUENCE_STEP_STATES ///< Number of Sequence step states + DRY_BICARBONATE_CARTRIDGE_CMD_DRAIN = 0, ///< Dry bicart dain command + DRY_BICARBONATE_CARTRIDGE_CMD_DEPRESSURIZE, ///< Dry bicart depressurize command + DRY_BICARBONATE_CARTRIDGE_CMD_CANCEL, ///< Dry bicart canel command + DRY_BICARBONATE_CARTRIDGE_CMD_DONE, ///< Dry bicart done command + NUM_OF_DRY_BICARBONATE_CARTRIDGE_CMDS ///< Number of dry bicart commands }; -typedef enum SequenceStep_States SEQUENCE_STEP_STATE_T; ///< Type for Sequence step state enumeration +typedef enum Dry_Bicart_Drain_Depressurize_Commands DRY_BICART_CMDS_T; ///< Type for dry bicart depressurize/drain command enumeration - /// Enumeration of conductivity sensors. enum Conductivity_Sensors {