Index: AlarmDefs.h =================================================================== diff -u -rb0fd0c547e24177bc326bc8dbd7c3dc94b3a5cf6 -rcccd9c9d23a6be09d331ab3aae8b7415757b682d --- AlarmDefs.h (.../AlarmDefs.h) (revision b0fd0c547e24177bc326bc8dbd7c3dc94b3a5cf6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) @@ -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_FW_RESERVED_237 = 237, ///< FW reserved for use + ALARM_ID_DD_DRY_BICART_FILL_INLET_PRESSURE_LOW = 237, ///< DD drybicart 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 @@ -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_FW_RESERVED_237 }, + { 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, 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 }, @@ -1050,7 +1050,7 @@ { 999, ALARM_ID_FW_RESERVED_211 }, { 999, ALARM_ID_FW_RESERVED_212 }, { 999, ALARM_ID_FW_RESERVED_219 }, - { 999, ALARM_ID_FW_RESERVED_237 }, + { 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 }, @@ -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_FW_RESERVED_237 , "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 | "}, + { 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 | "}, { 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 | "}, Index: DDDefs.h =================================================================== diff -u -r78128d9126978673733e2e1b24e88ac72f6a3571 -rcccd9c9d23a6be09d331ab3aae8b7415757b682d --- DDDefs.h (.../DDDefs.h) (revision 78128d9126978673733e2e1b24e88ac72f6a3571) +++ DDDefs.h (.../DDDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) @@ -490,14 +490,14 @@ /// Enumeration of Spent chamber fill exec states. enum Spent_Chamber_Fill_Exec_States { - SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill - SPENT_CHAMBER_FILL_STATE1_FILL_START, ///< Spent chamber fill state 1 fill start state - SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL, ///< Spent chamber fill state 1 dosing control - SPENT_CHAMBER_FILL_STATE1_FILL_END, ///< Spent chamber fill state 1 fill end state - SPENT_CHAMBER_FILL_STATE2_FILL_START, ///< Spent chamber fill state 2 fill start state - SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL, ///< Spent chamber fill state 2 dosing control - SPENT_CHAMBER_FILL_STATE2_FILL_END, ///< Spent chamber fill state 2 fill end state - NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES ///< Number of spent chamber fill states + SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_STATE1_FILL_START, ///< Spent chamber fill state 1 fill start state + SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL, ///< Spent chamber fill state 1 dosing control + SPENT_CHAMBER_FILL_STATE1_FILL_END, ///< Spent chamber fill state 1 fill end state + SPENT_CHAMBER_FILL_STATE2_FILL_START, ///< Spent chamber fill state 2 fill start state + SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL, ///< Spent chamber fill state 2 dosing control + SPENT_CHAMBER_FILL_STATE2_FILL_END, ///< Spent chamber fill state 2 fill end state + NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES ///< Number of spent chamber fill states }; typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration @@ -511,52 +511,56 @@ /// Enumeration of DryBicart fill exec states. enum Dry_Bicart_Fill_Exec_States { - DRY_BICART_START_STATE = 0, ///< Initial state of dry bicart fill - DRY_BICART_FILL_WATER_START_STATE, ///< Dry bicart fill start state - DRY_BICART_FILL_WATER_END_STATE, ///< Dry bicart fill end state - DRY_BICART_DEGAS_START_STATE, ///< Dry bicart vent start state - DRY_BICART_DEGAS_END_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_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 }; 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 { - BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill - BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber fill start state - BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state - BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery - BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery - BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state - BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state - NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state + 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 }; typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration /// Enumeration of DryBicart drain exec states enum Dry_Bicart_Drain_Exec_States { - DRY_BICART_DRAIN_START_STATE = 0, ///< Initial state of dry bicart drain - DRY_BICART_FLUID_DRAIN_STATE, ///< Dry bicart fluid drain state - DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart drain duration check state - DRY_BICART_FLUID_DRAIN_END_STATE, ///< Dry bicart drain end state - NUM_OF_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 }; 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_START_STATE = 0, ///< Initial state of dry bicart depressurise - DRY_BICART_DEPRESSURIZE_VENT_START_STATE, ///< Dry bicart depressurize vent start state - DRY_BICART_DEPRESSURIZE_VENT_END_STATE, ///< Dry bicart depressurize vent end state - NUM_OF_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 }; 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 +{ + 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 +}; +typedef enum SequenceStep_States SEQUENCE_STEP_STATE_T; ///< Type for Sequence step state enumeration + + /// Enumeration of conductivity sensors. enum Conductivity_Sensors { Index: MsgDefs.h =================================================================== diff -u -r0d4e3836373a771ab8ca90b177b6afcc2e62093f -rcccd9c9d23a6be09d331ab3aae8b7415757b682d --- MsgDefs.h (.../MsgDefs.h) (revision 0d4e3836373a771ab8ca90b177b6afcc2e62093f) +++ MsgDefs.h (.../MsgDefs.h) (revision cccd9c9d23a6be09d331ab3aae8b7415757b682d) @@ -478,6 +478,8 @@ MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074, ///< DD dry bicart depressurise overrride request MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA075, ///< DD Treatment parameters override request MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xA076, ///< DD NVM Record CRC override Request + MSG_ID_DD_MIXING_BICARB_CONTROL_INTERVAL_OVERRIDE_REQUEST = 0xA077, ///< DD Bicarb volume control interval + MSG_ID_DD_MIXING_ACID_CONTROL_INTERVAL_OVERRIDE_REQUEST = 0xA078, ///< DD Acid volume control interval MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in