Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 -rd1377c677d8a9fc576f941f413ae3b6af6f50776 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d1377c677d8a9fc576f941f413ae3b6af6f50776) @@ -56,15 +56,9 @@ DD_FAULT_STATE_COMPLETE = 2 # DD fault complete NUM_OF_DD_FAULT_STATES = 3 # Number of fault mode states -@unique -class DGSoloStates(DialinEnum): - DG_SOLO_STANDBY_STATE_START = 0 - DG_SOLO_IDLE_STATE = 1 - NUM_OF_DG_SOLO_STANDBY_STATES = 2 - @unique -class DGStandByModeStates(DialinEnum): +class DDStandByModeStates(DialinEnum): DD_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state DD_STANDBY_MODE_STATE_PAUSE = 1 # Pause state NUM_OF_DD_STANDBY_MODE_STATES = 2 # Number of standby mode states @@ -82,193 +76,8 @@ DD_GEND_DIALYSATE_DELIVERY_PAUSE = 7 # Gen dialysate - dialysate delivery pause state NUM_OF_DD_GEND_MODE_STATES = 8 # Number of gen dialysate states -@unique -class DGFillModeStates(DialinEnum): - DG_FILL_MODE_STATE_TEST_INLET_WATER = 0 # Test inlet water quality state - DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES = 1 # Prime the acid and bicarb concentrate lines - DG_FILL_MODE_STATE_FLUSH_BUBBLES = 2 # Flush the bubbles in the lines state - DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY = 3 # Test the conductivity range of the bicarb concentrate state - DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY = 4 # Test the conductivity range of the acid concentrate state - DG_FILL_MODE_STATE_PRODUCE_DIALYSATE = 5 # Dialysate production state - DG_FILL_MODE_STATE_DELIVER_DIALYSATE = 6 # Dialysate deliver state - DG_FILL_MODE_STATE_PAUSED = 7 # Dialysate generation pause state - NUM_OF_DG_FILL_MODE_STATES = 8 # Number of fill mode states - @unique -class DGDrainModeStates(DialinEnum): - DG_DRAIN_STATE_START = 0 # Start drain mode state - DG_DRAIN_STATE_DRAIN = 1 # Drain drain mode state - DG_DRAIN_STATE_TARE = 2 # Tare drain mode state - DG_DRAIN_STATE_RINSE = 3 - NUM_OF_DG_DRAIN_STATES = 4 # Number of drain mode states - - -@unique -class DGFlushStates(DialinEnum): - DG_FLUSH_STATE_START = 0 - DG_FLUSH_STATE_DRAIN_R1 = 1 - DG_FLUSH_STATE_DRAIN_R2 = 2 - DG_FLUSH_STATE_FLUSH_DRAIN = 3 - DG_FLUSH_STATE_FLUSH_DIALYSATE = 4 - DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS = 5 - DG_FLUSH_STATE_FLUSH_R1_TO_R2 = 6 - DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1 = 7 - DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE = 8 - DG_FLUSH_STATE_FLUSH_CIRCULATION = 9 - DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER = 10 - DG_FLUSH_STATE_CANCEL_BASIC_PATH = 11 - DG_FLUSH_STATE_CANCEL_WATER_PATH = 12 - DG_FLUSH_STATE_COMPLETE = 13 - NUM_OF_DG_FLUSH_STATES = 14 - - -@unique -class DGFlushUIStates(DialinEnum): - FLUSH_UI_STATE_NOT_RUNNING = 0 - FLUSH_UI_STATE_NOT_DRAIN_DEVICE = 1 - FLUSH_UI_STATE_NOT_FLUSH_RESERVOIRS = 2 - FLUSH_UI_STATE_NOT_DRAIN_RESERVOIRS = 3 - FLUSH_UI_STATE_NOT_FLUSH_RECIRCULATION_PATH = 4 - FLUSH_UI_STATE_NOT_CANCEL_FLUSH = 5 - FLUSH_UI_STATE_NOT_COMPLETE = 6 - NUM_OF_FLUSH_UI_STATES = 7 - - -@unique -class DGHeatDisinfectStates(DialinEnum): - DG_HEAT_DISINFECT_STATE_START = 0 # Heat disinfect, start mode state - DG_HEAT_DISINFECT_STATE_DRAIN_R1 = 1 # Heat disinfect, drain R1 state - DG_HEAT_DISINFECT_STATE_DRAIN_R2 = 2 # Heat disinfect, drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN = 3 # Heat disinfect, flush drain state - DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION = 4 # Heat disinfect, flush circulation state - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2 = 5 # Heat disinfect, flush R1 and R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 = 6 # Heat disinfect, flush R2 and drain R1 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2 = 7 # Heat disinfect, flush drain R2 state - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1 = 8 # Heat disinfect, flush drain R1 state - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER = 9 # Heat disinfect, fill with water state - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 10 # Heat disinfect, disinfect R1 to R2 state - DG_HEAT_DISINFECT_STATE_PREPARE_FOR_HOT_WATER_TRANSITION = 11 # Heat disinfect, prepare for hot water transition - DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER = 12 # Heat disinfect, fill R2 with hot water state - DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 13 # Heat disinfect, disinfect R2 to R1 state - DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS = 14 # Heat disinfect, cool down heaters state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1 = 15 # Heat disinfect, mix drain R1 state - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 = 16 # Heat disinfect, mix drain R2 state - DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 17 # Heat disinfect, cancel mode basic path state - DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 18 # Heat disinfect, cancel mode water path state - DG_HEAT_DISINFECT_STATE_COMPLETE = 19 # Heat disinfect, complete state - DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER = 20 # Heat disinfect, Nelson support state - NUM_OF_DG_HEAT_DISINFECT_STATES = 21 # Number of heat disinfect mode states - - -@unique -class DGHeatDisinfectUIStates(DialinEnum): - HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0 - HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 - HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER = 2 - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1 = 3 - HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER = 4 - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2 = 5 - HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE = 6 - HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 7 - HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT = 8 - HEAT_DISINFECT_UI_STATE_COMPLETE = 9 - NUM_OF_HEAT_DISINFECT_UI_STATES = 10 - - -@unique -class DGHeatDisinfectActiveCoolStates(DialinEnum): - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0 - DG_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R1_STATE = 1 - DG_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R2_STATE = 2 - DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R1_STATE = 3 - DG_HEAT_DISINFECT_ACTIVE_COOL_FILL_R2_STATE = 4 - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_FILL_R1_TO_R2_STATE = 5 - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_FILL_R2_TO_R1_STATE = 6 - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE = 7 - DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE = 8 - DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE = 9 - DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE = 10 - DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE = 11 - - -@unique -class DGChemicalDisinfectStates(DialinEnum): - DG_CHEM_DISINFECT_STATE_START = 0 - DG_CHEM_DISINFECT_STATE_DRAIN_R1 = 1 - DG_CHEM_DISINFECT_STATE_DRAIN_R2 = 2 - DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN = 3 - DG_CHEM_DISINFECT_STATE_DEPRIME_ACID_LINE = 4 - DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION = 5 - DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT = 6 - DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH = 7 - DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT = 8 - DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 = 9 - DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1 = 10 - DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 = 11 - DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2 = 12 - DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH = 13 - DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH = 14 - DG_CHEM_DISINFECT_STATE_COMPLETE = 15 - NUM_OF_DG_CHEM_DISINFECT_STATES = 16 - - -@unique -class DGChemDisinfectFlushStates(DialinEnum): - DG_CHEM_DISINFECT_FLUSH_STATE_START = 0 - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1 = 1 - DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2 = 2 - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN = 3 - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE = 4 - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF = 5 - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1 = 6 - DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2 = 7 - DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2 = 8 - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH = 9 - DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH = 10 - DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE = 11 - NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES = 12 - - -@unique -class DGChemDisinfectFlushUIStates(DialinEnum): - CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING = 0 - CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT = 1 - CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH = 2 - CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE = 3 - NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES = 4 - - -@unique -class DGChemDisinfectUIStates(DialinEnum): - CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0 - CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 1 - CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID = 2 - CHEM_DISINFECT_UI_STATE_REMOVE_ACID = 3 - CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE = 4 - CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT = 5 - CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT = 6 - CHEM_DISINFECT_UI_STATE_COMPLETE = 7 - NUM_OF_CHEM_DISINFECT_UI_STATES = 8 - - -@unique -class DGROPermeateSampleStates(DialinEnum): - DG_RO_PERM_SAMPLE_STATE_START = 0 - DG_RO_PERM_SAMPLE_STATE_DRAIN_R1 = 1 - DG_RO_PERM_SAMPLE_STATE_DRAIN_R2 = 2 - DG_RO_PERM_SAMPLE_STATE_FLUSH_DRAIN = 3 - DG_RO_PERM_SAMPLE_STATE_FLUSH_DIALYSATE = 4 - DG_RO_PERM_SAMPLE_STATE_FLUSH_CONCENTRATE_STRAWS = 5 - DG_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1 = 6 - DG_RO_PERM_SAMPLE_STATE_COLLECT_SAMPLE = 7 - DG_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH = 8 - DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH = 9 - DG_RO_PERM_SAMPLE_STATE_COMPLETE = 10 - NUM_OF_DG_RO_PERM_STATES = 11 - - -@unique class DDEventList(DialinEnum): DD_EVENT_STARTUP = 0 # DD startup event DD_EVENT_OP_MODE_CHANGE = 1 # DD Op mode change event Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rd1377c677d8a9fc576f941f413ae3b6af6f50776 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision d1377c677d8a9fc576f941f413ae3b6af6f50776) @@ -83,145 +83,14 @@ @unique -class PreTreatmentSampleWaterStates(DialinEnum): - SAMPLE_WATER_SETUP_STATE = 0 # Sample water setup (flush filter) state - SAMPLE_WATER_STATE = 1 # Sample water state, receiving sample water commands from the user - SAMPLE_WATER_COMPLETE_STATE = 2 # Sample water complete state - NUM_OF_SAMPLE_WATER_STATES = 3 # Number of sample water sub-mode states - - -@unique -class PreTreatmentConsumableSelfTestStates(DialinEnum): - CONSUMABLE_SELF_TESTS_INSTALL_STATE = 0 # Consumable self-tests install state - CONSUMABLE_SELF_TESTS_PRIME_STATE = 1 # Consumable self-tests prime concentrate lines state - CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE = 2 # Consumable self-tests bicarbonate concentrate pump check state - CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE = 3 # Consumable self-tests acid concentrate pump check state - CONSUMABLE_SELF_TESTS_COMPLETE_STATE = 4 # Consumable self-tests complete state - NUM_OF_CONSUMABLE_SELF_TESTS_STATES = 5 # Number of consumable install sub-mode states - - -@unique -class PreTreatmentNoCartSelfTestStates(DialinEnum): - NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0 # Wait for door to be closed before running self-tests - NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE = 1 # No cartridge pressure sensors self-test state - NO_CART_SELF_TESTS_HOME_VALVES_STATE = 2 # No cartridge home valves state - NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE = 3 # No cartridge home syringe pump state - NO_CART_SELF_TESTS_PUMPS_STATE = 4 # No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state - NO_CART_SELF_TESTS_HOME_IDLE_STATE = 5 # Wait for valves and pumps finish homing state - NO_CART_SELF_TESTS_STOPPED_STATE = 6 # No cart self-test stopped state - NO_CART_SELF_TESTS_COMPLETE_STATE = 7 # No cartridge self-test complete state - NUM_OF_NO_CART_SELF_TESTS_STATES = 8 # Number of no cartridge self-tests states - - -@unique -class PreTreatmentWetSelfTestStates(DialinEnum): - WET_SELF_TESTS_START_STATE = 0 - WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE = 1 - WET_SELF_TESTS_BUBBLE_CHECK_STATE = 2 - WET_SELF_TESTS_PRIME_CHECK_STATE = 3 - WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_DEBUBBLE_STATE = 4 - WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE = 5 - WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE = 6 - WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE = 7 - WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE = 8 - WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE = 9 - WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE = 10 - WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE = 11 - WET_SELF_TESTS_STOPPED_STATE = 12 - WET_SELF_TESTS_COMPLETE_STATE = 13 - -@unique -class TDPreTreatmentReservoirMgmtStates(DialinEnum): - PRE_TREATMENT_RESERVOIR_MGMT_START_STATE = 0 # Wait for signal to start drain and fill reservoirs - PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE = 1 # Command DG to start draining reservoir - PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_RESP_STATE = 2 # After sending drain command, process DG drain command response - PRE_TREATMENT_RESERVOIR_MGMT_START_FILL_STATE = 3 # Command DG to start filling reservoir - PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE = 4 # After sending fill command, process DG fill command response - PRE_TREATMENT_RESERVOIR_MGMT_FILL_COMPLETE_STATE = 5 # Reservoir fill has completed - PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE = 6 # Command DG to switch (toggle) reservoirs - PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE = 7 # After sending switch command, process DG fill command response - PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE = 8 # Pre-treatment reservoir management complete state - NUM_OF_PRE_TREATMENT_RESERVOIR_MGMT_STATES = 9 # Number of pre-treatments reservoir mgmt. states - -# Heparin states -@unique -class HeparinStates(DialinEnum): - HEPARIN_STATE_OFF = 0 # No heparin delivery is in progress - HEPARIN_STATE_STOPPED = 1 # Heparin delivery stopped by alarm or not yet started - HEPARIN_STATE_PAUSED = 2 # Heparin delivery paused - HEPARIN_STATE_INITIAL_BOLUS = 3 # Initial heparin bolus delivery in progress - HEPARIN_STATE_DISPENSING = 4 # Gradual heparin dispensing in progress - HEPARIN_STATE_COMPLETED = 5 # Heparin delivery stopped due to the set stop time before treatment end - HEPARIN_STATE_EMPTY = 6 # Heparin Syringe empty - NUM_OF_HEPARIN_STATES = 7 # Number of saline bolus states - - -# Syringe pump states -@unique -class SyringePumpStates(DialinEnum): - SYRINGE_PUMP_INIT_STATE = 0 # Syringe pump initialize state - SYRINGE_PUMP_OFF_STATE = 1 # Syringe pump off state - SYRINGE_PUMP_RETRACT_STATE = 2 # Syringe pump retract state - SYRINGE_PUMP_PRELOAD_STATE = 3 # Syringe pump preload state - SYRINGE_PUMP_SEEK_STATE = 4 # Syringe pump seek state - SYRINGE_PUMP_PRIME_STATE = 5 # Syringe pump prime state - SYRINGE_PUMP_HEP_BOLUS_STATE = 6 # Syringe pump bolus state - SYRINGE_PUMP_HEP_CONTINUOUS_STATE = 7 # Syringe pump continuous state - SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE = 8 # Syringe pump configure force sensor state - - -# Syringe pump operations -@unique -class SyringePumpOperations(DialinEnum): - SYRINGE_PUMP_OP_STOP = 0 # Stop syringe pump - SYRINGE_PUMP_OP_RETRACT = 1 # Retract syringe pump - SYRINGE_PUMP_OP_SEEK = 2 # Seek plunger - SYRINGE_PUMP_OP_PRIME = 3 # Prime Heparin line - SYRINGE_PUMP_OP_BOLUS = 4 # Deliver Heparin bolus of set volume over 5 minutes - SYRINGE_PUMP_OP_CONTINUOUS = 5 # Continuous dispense of Heparin at set rate - - -@unique class PostTreatmentStates(DialinEnum): TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0 # Drain reservoirs state TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 1 # Patient disconnection state TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE = 2 # Disposable removal state TD_POST_TREATMENT_VERIFY_STATE = 3 # Verify cartridge removed, syringe removed, and reservoirs drained state NUM_OF_TD_POST_TREATMENT_STATES = 4 # Number of post-treatment mode states - @unique -class PreTreatmentCartridgeInstallStates(DialinEnum): - CARTRIDGE_INSTALL_STATE = 0 # Pre-treatment Cartridge Install state. - NUM_OF_CARTRIDGE_INSTALL_STATES = 1 # Number of pre-treatment Cartridge Install states. - - -@unique -class PreTreatmentDrySelfTestsStates(DialinEnum): - """ - The HD Pre-Treatment dry self test states - """ - DRY_SELF_TESTS_START_STATE = 0 # Dry self-tests starting state - DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 1 # Wait for door to close before executing self-tests - DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE = 2 # Used cartridge check dry self-test state - DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE = 3 # Cartridge loaded check dry self-test state - DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE = 4 # Seek syringe pumps state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE = 5 # Pressure sensor setup state. - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE = 6 # Venous pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS = 7 # Venous pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE = 8 # Arterial pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL = 9 # Arterial pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE = 10 # Pressure sensors verify pressure loss state - DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE = 11 # Pressure sensors verify pressure stability state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 12 # Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 13 # Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE = 14 # Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE = 15 # Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE = 16 # Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES = 17 # Number of dry self-tests states - - -@unique class PreTreatmentPrimeStates(DialinEnum): TD_PRIME_WAIT_FOR_USER_START_STATE = 0 # Wait for user to start prime state TD_PRIME_SALINE_SETUP_STATE = 1 # Saline setup state @@ -238,95 +107,7 @@ TD_PRIME_COMPLETE = 12 # Prime complete state NUM_OF_TD_PRIME_STATES = 13 # Number of prime sub-mode states - @unique -class PreTreatmentRecircStates(DialinEnum): - PRE_TREATMENT_RECIRC_STATE = 0 # Pre-treatment recirculate state - PRE_TREATMENT_RECIRC_STOPPED_STATE = 1 # Pre-treatment recirculate stopped state - NUM_OF_PRE_TREATMENT_RECIRC_STATES = 2 # Number of pre-treatment recirculate states - - -@unique -class TreatmentRecircStates(DialinEnum): - TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_RECIRC_STATE = 1 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_STOPPED_STATE = 2 # Stopped state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_RECONNECT_PATIENT_STATE = 3 # Reconnect patient state of the treatment re-circulate sub-mode state machine - NUM_OF_TREATMENT_RECIRC_STATES = 4 # Number of treatment re-circulate sub-mode states - - -@unique -class PreTreatmentPatientConnectionStates(DialinEnum): - PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE = 0 # Pre-treatment patient connect wait for UF volume setting state - PRE_TREATMENT_PAT_CONN_WAIT_FOR_DLZR_INVERT_STATE = 1 # Pre-treatment patient connect wait for dialyzer inverted state - PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE = 2 # Pre-treatment patient connect wait for user confirm state - PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE = 3 # Pre-treatment patient connect wait for treatment start state - NUM_OF_PRE_TREATMENT_PAT_CONN_STATES = 4 # Number of pre-treatment patient connect states - - -@unique -class TreatmentParametersStates(DialinEnum): - TD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND = 0 # Wait for UI to send treatment params mode state - TD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM = 1 # Wait for UI to confirm treatment params mode state - NUM_OF_TD_TREATMENT_PARAMS_MODE_STATES = 2 # Number of treatment params mode states - - -@unique -class TreatmentStates(DialinEnum): - TREATMENT_START_STATE = 0 # Start treatment - initialize treatment and go to blood prime state - TREATMENT_BLOOD_PRIME_STATE = 1 # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed. No dialysis or UF taking place. No treatment time. - TREATMENT_DIALYSIS_STATE = 2 # Perform dialysis. Deliver Heparin as prescribed. Deliver UF as prescribed. Handle saline boluses as requested - TREATMENT_STOP_STATE = 3 # Treatment stopped. All pumps off. Dializer bypassed - TREATMENT_RINSEBACK_STATE = 4 # Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating - TREATMENT_RECIRC_STATE = 5 # Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed - TREATMENT_END_STATE = 6 # Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback - NUM_OF_TREATMENT_STATES = 7 # Number of treatment states (sub-modes) - -@unique -class TreatmentBloodPrimeStates(DialinEnum): - BLOOD_PRIME_RAMP_STATE = 0 # Ramp state of the blood prime sub-mode state machine - NUM_OF_BLOOD_PRIME_STATES = 1 # Number of blood prime sub-mode states - -@unique -class TreatmentDialysisStates(DialinEnum): - DIALYSIS_START_STATE = 0 # Start state of dialysis sub-mode state machine - DIALYSIS_UF_STATE = 1 # Ultrafiltration state of the dialysis sub-mode state machine - DIALYSIS_SALINE_BOLUS_STATE = 2 # Saline bolus state of the dialysis sub-mode state machine - NUM_OF_DIALYSIS_STATES = 3 # Number of dialysis sub-mode states - -@unique -class TreatmentStopStates(DialinEnum): - TREATMENT_STOP_RECIRC_STATE = 0 # Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine - TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE = 1 # Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine - TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE = 2 # Re-circulate Blood only state of the treatment re-circulate sub-mode state machine - TREATMENT_STOP_NO_RECIRC_STATE = 3 # No re-circulation state of the treatment stop sub-mode state machine - NUM_OF_TREATMENT_STOP_STATES = 4 # Number of treatment stop sub-mode states - -@unique -class TreatmentRinsebackStates(DialinEnum): - RINSEBACK_STOP_INIT_STATE = 0 # Start state (stopped) of the rinseback sub-mode state machine - RINSEBACK_RUN_STATE = 1 # Rinseback running state of the rinseback sub-mode state machine - RINSEBACK_PAUSED_STATE = 2 # Rinseback paused state of the rinseback sub-mode state machine - RINSEBACK_STOP_STATE = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine - RINSEBACK_RUN_ADDITIONAL_STATE = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine - RINSEBACK_RECONNECT_PATIENT_STATE = 5 # Rinseback reconnect patient state of the rinseback sub-mode state machine - NUM_OF_RINSEBACK_STATES = 6 # Number of rinseback sub-mode states - -@unique -class TreatmentRecircStates(DialinEnum): - TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_RECIRC_STATE = 1 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_STOPPED_STATE = 2 # Stopped state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_RECONNECT_PATIENT_STATE = 3 # Reconnect patient state of the treatment re-circulate sub-mode state machine - NUM_OF_TREATMENT_RECIRC_STATES = 4 # Number of treatment re-circulate sub-mode states - -@unique -class TreatmentEndStates(DialinEnum): - TREATMENT_END_WAIT_FOR_RINSEBACK_STATE = 0 # Wait for rinseback state of the treatment end sub-mode state machine - TREATMENT_END_PAUSED_STATE = 1 # Paused state of the treatment end sub-mode state machine - NUM_OF_TREATMENT_END_STATES = 2 # Number of treatment end sub-mode states - -@unique class TDFaultStates(DialinEnum): TD_FAULT_STATE_START = 0 # Start fault state TD_FAULT_STATE_RUN_NV_POSTS = 1 # TD fault run NV posts state @@ -375,59 +156,4 @@ EVENT_DATA_TYPE_S32 = 2 EVENT_DATA_TYPE_F32 = 3 EVENT_DATA_TYPE_BOOL = 4 - NUM_OF_EVENT_DATA_TYPES = 5 - -@unique -class UFStates(DialinEnum): - UF_PAUSED_STATE = 0 # Paused state of the ultrafiltration state machine - UF_RUNNING_STATE = 1 # Running state of the ultrafiltration state machine - NUM_OF_UF_STATES = 2 # Number of ultrafiltration states - -@unique -class SalineBolusStates(DialinEnum): - SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress - SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus - SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress - SALINE_BOLUS_STATE_MAX_DELIVERED = 3 # Maximum saline bolus volume reached - no more saline bolus deliveries allowed - NUM_OF_SALINE_BOLUS_STATES = 4 # Number of saline bolus states - -@unique -class TreatmentParameters(DialinEnum): - TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN = 0 - TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN = 1 - TREATMENT_PARAM_TREATMENT_DURATION_MIN = 2 - TREATMENT_PARAM_HEPARIN_PRESTOP_MIN = 3 - TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML = 4 - TREATMENT_PARAM_ACID_CONCENTRATE = 5 - TREATMENT_PARAM_BICARB_CONCENTRATE = 6 - TREATMENT_PARAM_DIALYZER_TYPE = 7 - TREATMENT_PARAM_HEPARIN_TYPE = 8 - TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN = 9 - TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN = 10 - TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW = 11 - TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW = 12 - TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC = 13 - TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR = 14 - TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML = 15 - TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C = 16 - TREATMENT_PARAM_UF_VOLUME_L = 17 - NUM_OF_TREATMENT_PARAMS = 18 - -class Acid_Concentrates(DialinEnum): - ACID_CONC_TYPE_FRESENIUS_08_1251_1 = 0 - ACID_CONC_TYPE_FRESENIUS_08_2251_0 = 1 - ACID_CONC_TYPE_FRESENIUS_08_3251_9 = 2 - NUM_OF_ACID_CONC_TYPES = 3 - -class Bicarb_Concentrates(DialinEnum): - BICARB_CONC_TYPE_FRESENIUS_CENTRISOL = 0 - NUM_OF_BICARB_CONC_TYPES = 1 - -@unique -class PowerOffCommands(DialinEnum): - """ - power off commands enum - """ - PW_COMMAND_OPEN = 0 - PW_TIMEOUT_CLOSE = 1 - PW_REJECT_SHOW = 2 + NUM_OF_EVENT_DATA_TYPES = 5 \ No newline at end of file Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 -rd1377c677d8a9fc576f941f413ae3b6af6f50776 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision d1377c677d8a9fc576f941f413ae3b6af6f50776) @@ -76,7 +76,6 @@ AIR_PUMP_STATE_ON, ///< Air Pump On state NUM_OF_AIR_PUMP_STATES, ///< Number of air pump states - Constraints: Must be logged into TD. @param state: integer - state value to set the air pump Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -rd28c8c54ba1f74adf348d1db6f5bfe034628c812 -rd1377c677d8a9fc576f941f413ae3b6af6f50776 --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision d28c8c54ba1f74adf348d1db6f5bfe034628c812) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision d1377c677d8a9fc576f941f413ae3b6af6f50776) @@ -25,7 +25,7 @@ class TDBubbleDectector(AbstractSubSystem): """ - TDAirBubbles + TDBubbleDectector Treatment Delivery (TD) Dialin API sub-class for air bubbles related commands. ADA: Air bubble Detector Arterial