Index: dialin/common/dg_defs.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r4a82d8520d1fd51983b45ec460ba13eb3e451b3f --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 4a82d8520d1fd51983b45ec460ba13eb3e451b3f) @@ -249,3 +249,7 @@ NUM_OF_EVENT_DATA_TYPES = 5 +@unique +class DGServiceModesStates(DialinEnum): + DG_SERVICE_STATE_START = 0 # Start service mode state + NUM_OF_DG_SERVICE_STATES = 1 # Number of service mode states \ No newline at end of file Index: dialin/common/hd_defs.py =================================================================== diff -u -r78422482a3cf189f2aa65a3405e0f21833ec6b01 -r4a82d8520d1fd51983b45ec460ba13eb3e451b3f --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 78422482a3cf189f2aa65a3405e0f21833ec6b01) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 4a82d8520d1fd51983b45ec460ba13eb3e451b3f) @@ -125,9 +125,8 @@ NUM_OF_NO_CART_SELF_TESTS_STATES = 9 # Number of no cartridge self-tests states -# This 'PreTreatmentWetSelfTesStates' may need to remove, during merge it was comparing with the folowing 'PreTreatmentDrySelfTestStates' @unique -class PreTreatmentWetSelfTesStates(DialinEnum): +class PreTreatmentWetSelfTestStates(DialinEnum): WET_SELF_TESTS_START_STATE = 0 WET_SELF_TESTS_SETUP_STATE = 1 WET_SELF_TESTS_BUBBLES_STATE = 2 @@ -142,43 +141,7 @@ WET_SELF_TESTS_STOPPED_STATE = 11 WET_SELF_TESTS_COMPLETE_STATE = 12 - @unique -class PreTreatmentDrySelfTestStates(DialinEnum): - 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_OCCLUSION_SENSORS_STATE = 3 # Occlusion sensors dry self-test state - DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE = 4 # Pressure sensors dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_STATE = 5 # Pressure sensors verify pressure readings state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 6 # Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 7 # Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE = 8 # Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE = 9 # Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE = 10 # Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES = 11 # Number of dry self-tests states - - -@unique -class PreTreatmentPrimeStates(DialinEnum): - HD_PRIME_START_STATE = 0 # Prime start state - HD_PRIME_WAIT_FOR_USER_START_STATE = 1 # Wait for user to start prime state - HD_PRIME_SALINE_SETUP_STATE = 2 # Saline setup state - HD_PRIME_SALINE_PURGE_AIR_STATE = 3 # Saline purge air state - HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE = 4 # Circulate blood circuit state - HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE = 5 # Wait for reservoir 1 fill complete - HD_PRIME_DIALYSATE_DIALYZER_STATE = 6 # Dialysate dialyzer fluid path state - HD_PRIME_SALINE_DIALYZER_SETUP_STATE = 7 # Saline dialyzer setup state - HD_PRIME_SALINE_DIALYZER_STATE = 8 # Saline dialyzer fluid path state - HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE = 9 # Wait for reservoir 2 fill complete - HD_PRIME_DIALYSATE_BYPASS_STATE = 10 # Dialysate bypass fluid path state - HD_PRIME_WET_SELF_TESTS_STATE = 11 # Perform wet self-tests after priming complete - HD_PRIME_PAUSE = 12 # Prime pause state, waits to be resumed - HD_PRIME_COMPLETE = 13 # Prime complete state - NUM_OF_HD_PRIME_STATES = 14 # 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 @@ -232,53 +195,6 @@ @unique -class PreTreatmentModeStates(DialinEnum): - HD_PRE_TREATMENT_START_STATE = 0 # Start pre-treatment mode state - HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 1 # Water sample state - HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE = 2 # Consumable self-tests state - HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE = 3 # No cartridge self-tests state - HD_PRE_TREATMENT_CART_INSTALL_STATE = 4 # Consumable and cartridge installation state - HD_PRE_TREATMENT_SELF_TEST_DRY_STATE = 5 # Self-tests when the cartridge is dry state - HD_PRE_TREATMENT_PRIME_STATE = 6 # Prime blood and dialysate circuits and run wet self-tests state - HD_PRE_TREATMENT_RECIRCULATE_STATE = 7 # Re-circulate blood and dialysate circuits state - HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE = 8 # Patient connection state - NUM_OF_HD_PRE_TREATMENT_STATES = 9 # Number of pre-treatment mode states - - -@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_FILL_CMD_STATE = 1 # Send command to DG to fill reservoir state - CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE = 2 # Consumable self-tests water quality check state - CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE = 3 # Consumable self-tests bicarbonate concentrate pump check state - CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE = 4 # Consumable self-tests acid concentrate pump check state - CONSUMABLE_SELF_TESTS_COMPLETE_STATE = 5 # Consumable self-tests complete state - NUM_OF_CONSUMABLE_SELF_TESTS_STATES = 6 # Number of consumable install sub-mode states - - -@unique -class PreTreatmentNoCartSelfTestsStates(DialinEnum): - NO_CART_SELF_TESTS_START_STATE = 0 # No cartridge self-tests starting state - NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 1 # Wait for door to be closed before running self-tests - NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE = 2 # No cartridge pressure sensors self-test state - NO_CART_SELF_TESTS_HOME_VALVES_STATE = 3 # No cartridge home valves state - NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE = 4 # No cartridge home syringe pump state - NO_CART_SELF_TESTS_PUMPS_STATE = 5 # No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state - NO_CART_SELF_TESTS_HOME_IDLE_STATE = 6 # Wait for valves and pumps finish homing state - NO_CART_SELF_TESTS_STOPPED_STATE = 7 # No cart self-test stopped state - NO_CART_SELF_TESTS_COMPLETE_STATE = 8 # No cartridge self-test complete state - NUM_OF_NO_CART_SELF_TESTS_STATES = 9 # Number of no cartridge self-tests 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. @@ -291,13 +207,15 @@ DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE = 2 # Used cartridge check dry self-test state DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE = 3 # Occlusion sensors dry self-test state DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE = 4 # Pressure sensors dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_STATE = 5 # Pressure sensors verify pressure readings state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 6 # Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 7 # Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE = 8 # Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE = 9 # Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE = 10 # Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES = 11 # Number of dry self-tests states + DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE = 5 # Pressure sensors verify pressure readings state + DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE = 6 # Pressure sensors verify pressure loss state + DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE = 7 # Pressure sensors verify pressure stability state + DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 8 # Pressure sensors verify normal pressure readings state + DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 9 # Prime syringe pump state + DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE = 10 # Occlusion detection state + DRY_SELF_TESTS_STOPPED_STATE = 11 # Dry self-test stopped state + DRY_SELF_TESTS_COMPLETE_STATE = 12 # Dry self-test complete state + NUM_OF_DRY_SELF_TESTS_STATES = 13 # Number of dry self-tests states @unique @@ -341,23 +259,6 @@ @unique -class StandbyStates(DialinEnum): - STANDBY_START_STATE = 0 # Start standby. - STANDBY_WAIT_FOR_TREATMENT_STATE = 1 # Wait for treatment. - STANDBY_WAIT_FOR_DISINFECT_STATE = 2 # Wait for UI to send disinfect option. - STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE = 3 # Wait for DG flush command response. - STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE = 4 # Wait for DG flush to start. - STANDBY_DG_FLUSH_IN_PROGRESS_STATE = 5 # DG flush operation is in progress - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE = 6 # Wait for DG heat disinfect command response. - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE = 7 # Wait for DG heat disinfect to start. - STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE = 8 # DG heat disinfect operation is in progress. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE = 9 # Wait for DG chemical disinfect command response. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE = 10 # Wait for DG chemical disinfect to start. - STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE = 11 # DG chemical disinfect operation is in progress - NUM_OF_STANDBY_STATES = 12 # Number of standby states (sub-modes) - - -@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. Index: tests/dg_tests.py =================================================================== diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r4a82d8520d1fd51983b45ec460ba13eb3e451b3f --- tests/dg_tests.py (.../dg_tests.py) (revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec) +++ tests/dg_tests.py (.../dg_tests.py) (revision 4a82d8520d1fd51983b45ec460ba13eb3e451b3f) @@ -29,7 +29,7 @@ from dialin.hd.temperatures import HDTemperaturesNames from dialin.dg.concentrate_pumps import DGConcentratePumpsStates from dialin.dg.uv_reactors import ReactorsNames -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentWetSelfTesStates, PostTreatmentStates +from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentWetSelfTestStates, PostTreatmentStates from dialin.hd.post_treatment import HDPostTreatmentDrainStates from dialin.common.dg_defs import DGEventList from dialin.common.hd_defs import HDEventList @@ -82,7 +82,7 @@ .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top, hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume, hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume, - PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, + PreTreatmentWetSelfTestStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, PostTreatmentStates(hd.post_treatment.post_treatment_sub_mode).name, HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name, hd.pretreatment.pre_treatment_prime_state,