Index: tests/test_dd.py =================================================================== diff -u -r7bc77fbed67b88c023d9b659dc7b7b27ec9b8741 -r10d688e57d9594c505de2d9de21aa7cbbe70136a --- tests/test_dd.py (.../test_dd.py) (revision 7bc77fbed67b88c023d9b659dc7b7b27ec9b8741) +++ tests/test_dd.py (.../test_dd.py) (revision 10d688e57d9594c505de2d9de21aa7cbbe70136a) @@ -43,6 +43,9 @@ exit(1) sleep(2) + #dd.dialysate_pumps.cmd_dialysate_set_start_stop(0,1,500) + #sleep(20) + # valves = '{:4X}'.format(dd.valves.valve_states_all) # print("DD Valves: " + valves) # dd.valves.cmd_valve_override(1, True, NO_RESET) @@ -53,10 +56,14 @@ # dd.valves.cmd_valve_override(1, False, NO_RESET) # exit(1) - # dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 100.0, NO_RESET) - # sleep(5) - # dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 0.0, NO_RESET) - # exit(1) + #dd.dialysate_pumps.cmd_dialysate_set_start_stop(0,1,300) + #sleep(30) + #dd.dialysate_pumps.cmd_dialysate_set_start_stop(0, 0, 300) + #sleep(5) + #dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 500.0, NO_RESET) + #sleep(5) + #dd.dialysate_pumps.cmd_dialysate_pump_target_speed_override(0, 0.0, NO_RESET) + #exit(1) # dd.pressure_sensors.cmd_pressure_readings_override(1,10.0, RESET) @@ -65,7 +72,13 @@ # collect sensors log from DD while True: - sleep(1) + if dd.levels.floater1 == 1: + #print (" float level is high") + dd.valves.cmd_valve_override(12,False,0) + else: + #print (" float level is low") + dd.valves.cmd_valve_override(12,True,0) + sleep(0.2) dialPump = ", DP.fr, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_target_rpm_fresh) + \ ", DP.sr, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_target_rpm_spent) + \ ", DP.fs, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_measured_spd_fresh) + \ @@ -75,6 +88,7 @@ ", DP.s1, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_state_fresh) + \ ", DP.s2, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_state_spent) + \ ", DP.ft, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_tgt_pressure_fresh) + \ + ", DP.st, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_tgt_pressure_spent) + \ ", DP.fp, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_measured_pressure_fresh) + \ ", DP.sp, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_measured_pressure_spent) + \ ", DP.fm, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_measured_current_fresh) + \ @@ -86,8 +100,7 @@ ", DP.d1, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_measured_dir_fresh) + \ ", DP.d2, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_measured_dir_spent) Levels = "L.f1, " + '{:2d}'.format(dd.levels.floater1) + \ - ", L.f2, " + '{:2d}'.format(dd.levels.floater1) + \ - ", L.b, " + '{:2d}'.format(dd.levels.bicarb_level) + \ + ", L.f2, " + '{:2d}'.format(dd.levels.bicarb_level) + \ ", L.s, " + '{:2d}'.format(dd.levels.spent_dialysate_level) pressure = ", Pwi, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_water_inlet_input_pressure) + \ ", Pwo, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_water_inlet_output_pressure) + \ @@ -103,17 +116,37 @@ ", Tsd, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_spent_dialysate_temp) + \ ", Tfd, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_fresh_dialysate_temp) + \ ", Ttm, " + '{:8.1f}'.format(dd.pressure_sensors.transmembrane_temp) - valves = ", DDVlvs, " + '{:4X}'.format(dd.valves.valve_states_all) + valves = ", DDVlvs, " + '{:8X}'.format(dd.valves.valve_states_all) + BalChamber = ", ExSt, " + '{:2d}'.format(dd.balancing_chamber.execution_state) + \ + ", SwSt, " + '{:2d}'.format(dd.balancing_chamber.switching_state) + \ + ", SwFr, " + '{:8.1f}'.format(dd.balancing_chamber.switching_frequency) + \ + ", SwPd, " + '{:2d}'.format(dd.balancing_chamber.switching_period) + \ + ", Fill, " + '{:2d}'.format(dd.balancing_chamber.bal_chamber_fill_in_progress) + \ + ", Cnt, " + '{:2d}'.format(dd.balancing_chamber.current_bal_chamber_switching_counter) + \ + ", PSt, " + '{:2d}'.format(dd.balancing_chamber.is_pressure_stabilized_during_fill) + GenDialysate = ", ExSt, " + '{:2d}'.format(dd.gen_dialysate.execution_state) + \ + ", InPro, " + '{:2d}'.format(dd.gen_dialysate.dialysate_delivery_in_progress) + \ + ", Float, " + '{:2d}'.format(dd.gen_dialysate.floater_level) + \ + ", Blvl, " + '{:2d}'.format(dd.gen_dialysate.bicarb_level) + \ + ", Slvl, " + '{:2d}'.format(dd.gen_dialysate.spent_chamber_level) + \ + ", Np, " + '{:8.1f}'.format(dd.gen_dialysate.hydraulics_negative_pressure) + \ + ", Pp, " + '{:8.1f}'.format(dd.gen_dialysate.hydraulics_positive_pressure) + \ + ", Sp, " + '{:8.1f}'.format(dd.gen_dialysate.spent_dialysate_pressure) + \ + ", Del, " + '{:2d}'.format(dd.gen_dialysate.dialysate_good_to_deliver) - # log data + # log data f.write(dialPump) f.write(Levels) f.write(pressure) f.write(valves) + f.write(BalChamber) + f.write(GenDialysate) f.write("\n") # print to console - print("Dialysate Pumps: "+dialPump) - print(" Levels: "+Levels) + #print("Dialysate Pumps: "+dialPump) + #print(" Levels: "+Levels) print(" Pressure: "+pressure) - print(" DD Valves: "+valves) + #print(" DD Valves: "+valves) + #print("Balancing Chamb: "+BalChamber) + #print(" Gen Dialysate: "+GenDialysate)