Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -reca9e15bc984af2b7f59eb38f3836ca354ee1251 -rd10bf8fc145e54979dbeadaedfbaccf0f45d8234 --- leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) +++ leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision d10bf8fc145e54979dbeadaedfbaccf0f45d8234) @@ -59,7 +59,7 @@ # Sensor Attributes DDBalancingChamberStates = dd_defs.DDBalancingChamberStates DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates - DDBicartChFFillExecStates = dd_defs.DDBicarbChFillExecStates + DDBicarbChFillExecStates = dd_defs.DDBicarbChFillExecStates DDBloodLeakStates = dd_defs.DDBloodLeakStates DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes DDConcentratePumpStates = dd_defs.DDConcentratePumpStates Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a -rd10bf8fc145e54979dbeadaedfbaccf0f45d8234 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision d10bf8fc145e54979dbeadaedfbaccf0f45d8234) @@ -1137,24 +1137,24 @@ # Syringe pump operations @unique class TDSyringePumpStates(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 - SYRINGE_PUMP_OP_PRELOAD = 6 # Preload syringe pump - NUM_OF_SYRINGE_PUMP_STATES = 7 # Number of Syringe pump States + STOP = 0 # Stop syringe pump + RETRACT = 1 # Retract syringe pump + SEEK = 2 # Seek plunger + PRIME = 3 # Prime Heparin line + BOLUS = 4 # Deliver Heparin bolus of set volume over 5 minutes + CONTINUOUS = 5 # Continuous dispense of Heparin at set rate + PRELOAD = 6 # Preload syringe pump + NUM_OF_SYRINGE_PUMP_STATES = 7 # Number of Syringe pump States TDSyringePumpStates._str_list = { # Official Name : Accepted strings - 'SYRINGE_PUMP_OP_STOP': ['stop'], - 'SYRINGE_PUMP_OP_RETRACT': ['retract'], - 'SYRINGE_PUMP_OP_SEEK': ['seek'], - 'SYRINGE_PUMP_OP_PRIME': ['prime'], - 'SYRINGE_PUMP_OP_BOLUS': ['bolus'], - 'SYRINGE_PUMP_OP_CONTINUOUS': ['continuous'], - 'SYRINGE_PUMP_OP_PRELOAD': ['preload'], + 'STOP': [], + 'RETRACT': [], + 'SEEK': [], + 'PRIME': [], + 'BOLUS': [], + 'CONTINUOUS': [], + 'PRELOAD': [], 'NUM_OF_SYRINGE_PUMP_STATES': [], } Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/DebugMsgCatcher.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/air_trap_levels.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/dg_hd_switches_test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/dg_heaters_test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/dg_nvm_scripts.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/dg_tests.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/dg_valves_test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_air_bubbles_data.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_blood_leak_data.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_fluid_leak_state.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_nvm_scripts.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_test_pumps_open_loop.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/hd_valves_test.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/set_accels_cal.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/set_flow_sensors_cal.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_alarms.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_buttons.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_can_xmit.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_conductivity.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_deprime.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_dg_records.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_dg_valves.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_dialysate_flow_sensor.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_flush.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_hd.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_hd_dg_fans.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_hd_records.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_hd_valves.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_heparin.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_heprin_bolus_target_rate.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_lc.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_nelson_labs_disinfect.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_saline_bolus.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_syringe.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_tx_config_tests.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_uf.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_uv_reactors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/depreciated_tests/test_voltages.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/set_RTCs.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_POST.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_blood_flow.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_can.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_data_logger.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_debug_text.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_demo.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_dg_records.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_dg_thermistors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_dg_valves.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_dg_valves_observer.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_fw_controller.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_gen_requirements.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_dg_simulators.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_fluid_leak.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_records.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_reset.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_simulator.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_hd_valves.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_listener.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_logging.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_print_version.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_single_alarm.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_temperature_sensors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d10bf8fc145e54979dbeadaedfbaccf0f45d8234 refers to a dead (removed) revision in file `tests/peter/test_ui_proxy.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/test_training.py =================================================================== diff -u -r87891e5102d69f7eb8e771f3bb91a9cf72e3b83f -rd10bf8fc145e54979dbeadaedfbaccf0f45d8234 --- tests/test_training.py (.../test_training.py) (revision 87891e5102d69f7eb8e771f3bb91a9cf72e3b83f) +++ tests/test_training.py (.../test_training.py) (revision d10bf8fc145e54979dbeadaedfbaccf0f45d8234) @@ -18,7 +18,7 @@ sys.path.append("../leahi_dialin") from time import sleep from leahi_dialin.td.treatment_delivery import TD -from leahi_dialin.td.modules.constants import RESET, NO_RESET +from leahi_dialin.common.constants import RESET, NO_RESET if __name__ == "__main__": # create an TD object called td