Index: AlarmDefs.h =================================================================== diff -u -rd1f00c0d4796ab9660986399705aea06907aa710 -r216279e6c972c98e198c0c3a0069fac0114ee89f --- AlarmDefs.h (.../AlarmDefs.h) (revision d1f00c0d4796ab9660986399705aea06907aa710) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 216279e6c972c98e198c0c3a0069fac0114ee89f) @@ -237,8 +237,8 @@ ALARM_ID_FW_RESERVED_205 = 205, ///< FW reserved for use ALARM_ID_FW_RESERVED_206 = 206, ///< FW reserved for use ALARM_ID_FW_RESERVED_207 = 207, ///< FW reserved for use - ALARM_ID_FW_RESERVED_208 = 208, ///< FW reserved for use - ALARM_ID_FW_RESERVED_209 = 209, ///< FW reserved for use + ALARM_ID_TD_INITIAL_BC_REV_PRIME_LIMIT_REACHED = 208, ///< TD initial rev blood circuit prime limit reached + ALARM_ID_TD_INITIAL_BC_REV_PRIME_TIMEOUT = 209, ///< TD initial blood circuit prime timeout ALARM_ID_FW_RESERVED_210 = 210, ///< FW reserved for use ALARM_ID_FW_RESERVED_211 = 211, ///< FW reserved for use ALARM_ID_FW_RESERVED_212 = 212, ///< FW reserved for use @@ -713,8 +713,8 @@ { 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_205 }, { 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_206 }, { 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_207 }, - { 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_208 }, - { 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_209 }, + { ALARM_PRIORITY_HIGH, 293, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INITIAL_BC_REV_PRIME_LIMIT_REACHED }, + { ALARM_PRIORITY_HIGH, 294, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_INITIAL_BC_REV_PRIME_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_210 }, { 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_211 }, { 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_212 }, @@ -990,6 +990,8 @@ { 290, ALARM_ID_TD_BLOOD_SITTING_WARNING }, { 291, ALARM_ID_TD_BLOOD_PRIME_PAUSE_TIMEOUT }, { 292, ALARM_ID_TD_BLOOD_PRIME_PAUSE_WARNING }, + { 293, ALARM_ID_TD_INITIAL_BC_REV_PRIME_LIMIT_REACHED }, + { 294, ALARM_ID_TD_INITIAL_BC_REV_PRIME_TIMEOUT }, { 300, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER }, { 300, ALARM_ID_TD_TUBE_SET_MISMATCH }, { 401, ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP }, @@ -1038,8 +1040,6 @@ { 999, ALARM_ID_FW_RESERVED_205 }, { 999, ALARM_ID_FW_RESERVED_206 }, { 999, ALARM_ID_FW_RESERVED_207 }, - { 999, ALARM_ID_FW_RESERVED_208 }, - { 999, ALARM_ID_FW_RESERVED_209 }, { 999, ALARM_ID_FW_RESERVED_210 }, { 999, ALARM_ID_FW_RESERVED_211 }, { 999, ALARM_ID_FW_RESERVED_212 }, @@ -1308,7 +1308,7 @@ { 162 , ALARM_ID_FP_PERMEATE_FLOW_OUT_HIGH_RANGE , "FP | High Permeate flow | Permeate flow is too high. \n- Treatment must be terminated.\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. | FP Fault: Permeate flow High | Permeate flow is too high from set target flow rate | If the permeate flow is above 25% of set target flow rate for a certain period of time. | "}, { 163 , ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE , "FP | low Permeate flow | Permeate flow is too low. \n- Treatment must be terminated.\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. | FP Fault: Permeate flow Low | Permeate flow is too low from set target flow rate | If the permeate flow is above 25% of set target flow rate for a certain period of time. | "}, { 164 , ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE , "FP | low inlet pressure | Inlet pressure is too low. \n- Treatment must be terminated.\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. | FP Fault: Inlet pressure Low | Inlet pressure is too low | If P8 is < 1 PSI | "}, - { 165 , ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT , "TD | Blood Pump Stopped: Venous Air Detector | A problem was detected with the venous air detector.\n- Confirm arterial access placement and ensure\nconnections are secure.\n- Treatment must be terminated without rinseback. | Blood Stop: Air Trap Lowering | Air trap lowering timeout during treatment | If the air trap lowering timeout during treatment. | "}, + { 165 , ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT , "TD | Blood Pump Stopped: Venous Air Detector | A problem was detected with the venous air detector.\n- Confirm arterial access placement and ensure\nconnections are secure.\n- Treatment must be terminated without rinseback. | Blood Stop: Air Trap Lowering | Air trap lowering timeout during treatment | If the air trap lowering timeout during treatment. | "}, { 166 , ALARM_ID_TD_SYRINGE_PUMP_SELF_TEST_FAILURE , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\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: Syringe DAC | TD syringe pump self-test failure alarm | If the calibration data that was received from NVDataMgmt and the DAC voltage with syringe retracted are not within tol. | "}, { 167 , ALARM_ID_TD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\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: Syringe Pump On Err | TD syringe pump is running while the BP is off | If the syringe pump is on while the blood pump is off | "}, { 168 , ALARM_ID_TD_SYRINGE_PUMP_FPGA_ADC_FAULT , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\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: Syringe Pump ADC Com | TD syringe pump ADC error | If the ADC read is not fresh after POST init and the ADC read counter has not changed. | "}, @@ -1353,8 +1353,8 @@ { 205 , ALARM_ID_FW_RESERVED_205 , "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 | "}, { 206 , ALARM_ID_FW_RESERVED_206 , "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 | "}, { 207 , ALARM_ID_FW_RESERVED_207 , "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 | "}, - { 208 , ALARM_ID_FW_RESERVED_208 , "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 | "}, - { 209 , ALARM_ID_FW_RESERVED_209 , "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 | "}, + { 208 , ALARM_ID_TD_INITIAL_BC_REV_PRIME_LIMIT_REACHED , "TD | Prime Paused: Check Saline Line | The system has repeatedly paused priming to relieve negative pressure in the venous line.\n- Check that the saline line is not clamped or kinked.\n- Check that the saline bag is not empty.\n- Resume priming once checked, or end treatment. | Prime: BC: Venous Line, Retry Limit | Venous pressure (H14) reached the neg pressure pause limit, possibly indicating a clamped or occluded saline/H14 line. | During Blood Circuit: Venous Line prime state, when the negative pressure pause/equalize cycle has occurred 3 times. | "}, + { 209 , ALARM_ID_TD_INITIAL_BC_REV_PRIME_TIMEOUT , "TD | Prime Timeout: Venous Line | Priming the venous line and air trap did not complete within the expected time.\n- Check the saline line and connections.\n- Resume priming, or end treatment. | Prime: BC: Venous Line, Timeout | Blood Circuit: Venous Line state failed to complete within 40 seconds, excluding time spent paused for pressure equalization. | During Blood Circuit: Venous Line prime state, when the state has been active for more than 40 seconds, excluding paused time. | "}, { 210 , ALARM_ID_FW_RESERVED_210 , "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 | "}, { 211 , ALARM_ID_FW_RESERVED_211 , "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 | "}, { 212 , ALARM_ID_FW_RESERVED_212 , "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 -r216279e6c972c98e198c0c3a0069fac0114ee89f --- DDDefs.h (.../DDDefs.h) (revision 78128d9126978673733e2e1b24e88ac72f6a3571) +++ DDDefs.h (.../DDDefs.h) (revision 216279e6c972c98e198c0c3a0069fac0114ee89f) @@ -150,9 +150,12 @@ /// Enumeration of Pre-Gen Dialysate mode states. enum DD_Pre_Gen_Dialysate_States { - DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0, ///< DD Pre-Gen Dialysate hyrochamber fill check - DD_PRE_GEN_WET_SELF_TEST, ///< DD Pre-Gen WetSelf Test + DD_PRE_GEN_WAIT_FOR_FP_GEN = 0, ///< DD Pre-Gen wait for FP state. + DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK, ///< DD Pre-Gen Dialysate hyrochamber fill check DD_PRE_GEN_DRY_BICART_INITIAL_FILL, ///< DD Pre-Gen DryBicart Initial Fill + DD_PRE_GEN_FILL_CHAMBER_F, ///< DD Pre-Gen Prime Chamber F + DD_PRE_GEN_PRIME_BICARB_LINE, ///< DD Pre-Gen Prime Bicarb line + DD_PRE_GEN_PRIME_ACID_LINE, ///< DD Pre-Gen Prime acid line DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND, ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition NUM_OF_DD_PRE_GEN_DIALYSATE_STATES ///< Number of Pre-Gen Dialysate mode states }; @@ -193,6 +196,8 @@ DD_GEND_SPENT_CHAMBER_FILL_STATE, ///< Gen dialysate - spent chamber fill state DD_GEND_BICARB_CHAMBER_FILL_STATE, ///< Gen dialysate - bicarb chamber fill state DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + DD_GEND_SPENT_CHAMBER_VALV_OPEN_STATE, ///< Gen dialysate - spent chamber vent open state + DD_GEND_PRIME_FLUID_DISCARD_STATE, ///< Gen dialysate - prime fluid discard state NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states }; typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration @@ -344,7 +349,8 @@ DD_EVENT_SERVICE_RECORD_UPDATE, ///< DD NVM Service Record Change Event DD_EVENT_INSTITUTIONAL_RECORD_UPDATE, ///< DD NVM Institutional Record Change Event DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD NVM Usage Info Record Change Event - DD_EVENT_LAST = DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD last event in list + DD_EVENT_PRE_GEN_CHANGE, ///< DD Pre Gen state change + DD_EVENT_LAST = DD_EVENT_PRE_GEN_CHANGE, ///< DD last event in list FP_EVENT_STARTUP, ///< FP startup event FP_EVENT_FIRST = FP_EVENT_STARTUP, ///< FP first event in list FP_EVENT_OP_MODE_CHANGE, ///< FP Op mode change event @@ -491,6 +497,7 @@ enum Spent_Chamber_Fill_Exec_States { SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_WAIT_PRESSURE_STABILIZE_STATE, ///< Pressure Stabilization Wait state 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 @@ -557,6 +564,20 @@ }; typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize exec state enumeration +/// Enumeration of Bicarb chamber pre gen fill exec states. +enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States +{ + PRE_GEN_BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery + PRE_GEN_BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber fill start state + PRE_GEN_BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + PRE_GEN_BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state + PRE_GEN_BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_PRE_GEN_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States BICARB_CHAMBER_PRE_GEN_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + /// Enumeration of conductivity sensors. enum Conductivity_Sensors { Index: MsgDefs.h =================================================================== diff -u -rd1f00c0d4796ab9660986399705aea06907aa710 -r216279e6c972c98e198c0c3a0069fac0114ee89f --- MsgDefs.h (.../MsgDefs.h) (revision d1f00c0d4796ab9660986399705aea06907aa710) +++ MsgDefs.h (.../MsgDefs.h) (revision 216279e6c972c98e198c0c3a0069fac0114ee89f) @@ -190,8 +190,8 @@ MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE = 0x9E, ///< TD isolated UF volume goal change response MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST = 0x9F, ///< UI isolated UF confirm request MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE = 0xA0, ///< TD isolated UF confirm response - MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST = 0xA1, ///< UI adjust start treatment request - MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE = 0xA2, ///< TD adjust start treatment response + MSG_ID_UI_START_TREATMENT_REQUEST = 0xA1, ///< UI start treatment request + MSG_ID_TD_START_TREATMENT_RESPONSE = 0xA2, ///< TD start treatment response MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST = 0xA3, ///< UI water sample result request MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST = 0xA4, ///< UI pressure limit widen request. MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE = 0xA5, ///< TD pressure limit widen response. @@ -212,9 +212,11 @@ MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4, ///< FFU signal DD update is available. MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5, ///< TD request for generic UI confirmation. MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI generic confirmation result to TD. - MSG_ID_AVAILABLE_B7 = 0xB7, ///< Msg ID not used - available for use. + MSG_ID_TD_PRE_TREATMENT_STATES_DATA = 0xB7, ///< TD Pre-Treatment states broadcast data.. MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response + MSG_ID_DD_TD_PRIME_REQUEST_DATA = 0xC3, ///< DD to TD prime data request + MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7, ///< TD broadcast of prime data MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB, ///< DD substitution pump broadcast data. @@ -354,6 +356,7 @@ MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062, ///< TD send alarm table properties response to Dialin MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE = 0x8065, ///< TD rinseback volume override MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8066, ///< TD rinseback publish interval broadcast override. + MSG_ID_TD_AIR_PUMP_RPM_OVERRIDE_REQUEST = 0x8067, ///< TD Override request for Air Pump RPM MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in @@ -549,15 +552,14 @@ MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045, ///< FP response for defatured status to Dialin MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046, ///< FP set operation sub mode request MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047, ///< FP conductivity sensor resistance override request - MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting. MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049, ///< FP request for boost pump installation status from Dialin MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A, ///< FP response for boost pump installation status to Dialin MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B, ///< FP conductivity sensor version request MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C, ///< FP conductivity sensor version response MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D, ///< FP conductivity sensor cal request MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E, ///< FP conductivity sensor cal response - MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log MSG_ID_FP_DEBUG_EVENT = 0xFFF3, ///< FP debug event text to be logged in event log Index: TDDefs.h =================================================================== diff -u -rd1f00c0d4796ab9660986399705aea06907aa710 -r216279e6c972c98e198c0c3a0069fac0114ee89f --- TDDefs.h (.../TDDefs.h) (revision d1f00c0d4796ab9660986399705aea06907aa710) +++ TDDefs.h (.../TDDefs.h) (revision 216279e6c972c98e198c0c3a0069fac0114ee89f) @@ -275,25 +275,30 @@ * @{ */ -/// Enumeration of prime sub-mode states. -enum TD_Pre_Treatment_Prime_States +/// Enumeration of prime service states. +enum TD_Prime_States { - TD_PRIME_WAIT_FOR_USER_START_STATE = 0, ///< Wait for user to start prime state - TD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state - TD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state - TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state - TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE, ///< Wait for reservoir 1 fill complete - TD_PRIME_DIALYSATE_DIALYZER_STATE, ///< Dialysate dialyzer fluid path state - TD_PRIME_SALINE_DIALYZER_SETUP_STATE, ///< Saline dialyzer setup state - TD_PRIME_SALINE_DIALYZER_STATE, ///< Saline dialyzer fluid path state - TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete - TD_PRIME_DIALYSATE_BYPASS_STATE, ///< Dialysate bypass fluid path state - TD_PRIME_WET_SELF_TESTS_STATE, ///< Perform wet self-tests after priming complete - TD_PRIME_PAUSE, ///< Prime pause state, waits to be resumed - TD_PRIME_COMPLETE, ///< Prime complete state - NUM_OF_TD_PRIME_STATES ///< Number of prime sub-mode states + PRIME_START_STATE = 0, ///< Init (start) state. + PRIME_BC_INITIAL_REVERSE_STATE, ///< Blood circuit initial reverse prime state. + PRIME_BC_AIR_TRAP_LOWER_STATE, ///< Air Trap lower state + PRIME_BC_INITIAL_DIALYZER_STATE, ///< Blood circuit initial dialyzer prime state + PRIME_BC_FILL_STATE, ///< Blood circuit fill state + PRIME_BC_CLEAR_STATE1, ///< Blood circuit air clear stage 1 prime state + PRIME_BC_CLEAR_STATE2, ///< Blood circuit air clear stage 2 prime state + PRIME_BC_CLEAR_STATE3, ///< Blood circuit air clear stage 3 prime state + PRIME_WAIT_FOR_DIALYSATE_READY_STATE, ///< Wait for dialysate ready state + PRIME_DC_INITIAL_DIALYSATE_STATE, ///< Dialysate circuit Initial dialysate prime state + PRIME_DC_DEPRESSURIZE_STATE, ///< De-pressurize state + PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE, ///< Wait for air trap fill state + PRIME_BC2_FORWARD_RECIRC_STATE, ///< Blood circuit 2 forward recirc state + PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE, ///< Pause to rotate opp dir state + PRIME_BC2_REVERSE_RECIRC_STATE, ///< Blood circuit 2 reverse recirc state + PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE, ///< Priming Fluid Discard and Reverse Prime state + PRIME_PAUSE_STATE, ///< Prime pause state + PRIME_COMPLETE_STATE, ///< Prime complete state. + NUM_OF_PRIME_STATES ///< Number of Prime states. }; -typedef enum TD_Pre_Treatment_Prime_States TD_PRE_TREATMENT_PRIME_STATE_T; ///< Type for TD pre-treatment prime sub-mode states enumeration +typedef enum TD_Prime_States TD_PRIME_STATE_T; ///< Type for TD prime service states enumeration /**@}*/