Index: tests/dg_tests.py =================================================================== diff -u -rf8e8a2028269c7d914f30d28b6be993e74388534 -r74da0b9125ce91e76ce824e4f8e520eb32ee8d84 --- tests/dg_tests.py (.../dg_tests.py) (revision f8e8a2028269c7d914f30d28b6be993e74388534) +++ tests/dg_tests.py (.../dg_tests.py) (revision 74da0b9125ce91e76ce824e4f8e520eb32ee8d84) @@ -296,8 +296,8 @@ dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp1_measured_speed, - dg.conductivity_sensors.conductivity_sensor_cpo, - dg.conductivity_sensors.conductivity_sensor_cd1, + dg.conductivity_sensors.conductivity_sensor_cpi, + dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, dg.conductivity_sensors.conductivity_sensor_cd2, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name, @@ -349,7 +349,7 @@ def get_dg_idle_bad_fill_info(): info = ('Bad_fill_state, {}, ' - .format(DGGenIdleModeBadFillSubStates(dg.gen_idle.sub_state).name)) + .format(DGGenIdleModeBadFillSubStates(dg.gen_idle.bad_fill_state).name)) return info @@ -430,7 +430,6 @@ dg.dialysate_fill.cmd_used_bicarb_volume_override(3700.0) sleep(1) """ - counter = 1 start = False sleep_time = 1 @@ -733,6 +732,10 @@ #test_conc_pumps() + #while True: + # print(get_concentrate_pumps_info()) + # sleep(1) + #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1)