Index: tests/SeansUFTest.py =================================================================== diff -u -r441eda312faf87b49f0967d8413690c7f63f9b58 -r3a50e76b97f7f4e0ce2495ec132433f8de5cdf24 --- tests/SeansUFTest.py (.../SeansUFTest.py) (revision 441eda312faf87b49f0967d8413690c7f63f9b58) +++ tests/SeansUFTest.py (.../SeansUFTest.py) (revision 3a50e76b97f7f4e0ce2495ec132433f8de5cdf24) @@ -34,37 +34,49 @@ exit(1) sleep(1) - # collect UF related data from HD and DG - while True: - sleep(1) - pumpSetPts = "B," + str(hd.bloodflow.target_blood_flow_rate) + \ - ",DI," + str(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \ - ",DO,N/A,RO," + str(dg.ro_pump.target_pressure_psi) + \ - ",DR," + str(dg.drain_pump.target_drain_pump_speed_RPM) - pumpMeasSpds = "B.m," + str(hd.bloodflow.measured_blood_pump_speed) + \ - ",B.r," + str(hd.bloodflow.measured_blood_pump_rotor_speed) + \ - ",DI.m," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \ - ",DI.r," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \ - ",DO.m," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \ - ",DO.r," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) - pumpPWMs = "B,"+str(hd.bloodflow.pwm_duty_cycle_pct) + \ - ",DI," + str(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) + \ - ",DO," + str(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \ - ",RO," + str(dg.ro_pump.pwm_duty_cycle_pct) + \ - ",DR," + str(dg.drain_pump.dacValue) - loadCells = "A1," + str(dg.load_cells.load_cell_A1) + \ - ",B1," + str(dg.load_cells.load_cell_B1) + \ - ",A2," + str(dg.load_cells.load_cell_A2) + \ - ",B2," + str(dg.load_cells.load_cell_B2) - ultraFilt = "RfUF," + str(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \ - ",MsUF," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume) + # create log file + with open("SeansUFLog1.txt", "w") as f: - print("Pump Set Points: "+pumpSetPts) - print(" Pump Speeds: "+pumpMeasSpds) - print(" Pump PWMs/DACs: "+pumpPWMs) - print(" Load Cells: "+loadCells) - print("Ultrafiltration: "+ultraFilt) + # collect UF related data from HD and DG + while True: + sleep(1) + pumpSetPts = "B," + str(hd.bloodflow.target_blood_flow_rate) + \ + ",DI," + str(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \ + ",DO,N/A,RO," + str(dg.ro_pump.target_pressure_psi) + \ + ",DR," + str(dg.drain_pump.target_drain_pump_speed_RPM) + pumpMeasSpds = "B.m," + str(hd.bloodflow.measured_blood_pump_speed) + \ + ",B.r," + str(hd.bloodflow.measured_blood_pump_rotor_speed) + \ + ",DI.m," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \ + ",DI.r," + str(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \ + ",DO.m," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \ + ",DO.r," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + pumpPWMs = "B,"+str(hd.bloodflow.pwm_duty_cycle_pct) + \ + ",DI," + str(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) + \ + ",DO," + str(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \ + ",RO," + str(dg.ro_pump.pwm_duty_cycle_pct) + \ + ",DR," + str(dg.drain_pump.dacValue) + loadCells = "A1," + str(dg.load_cells.load_cell_A1) + \ + ",B1," + str(dg.load_cells.load_cell_B1) + \ + ",A2," + str(dg.load_cells.load_cell_A2) + \ + ",B2," + str(dg.load_cells.load_cell_B2) + ultraFilt = "RfUF," + str(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \ + ",MsUF," + str(hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume) + # log data + f.write(pumpSetPts) + f.write(pumpMeasSpds) + f.write(pumpPWMs) + f.write(loadCells) + f.write(ultraFilt) + f.write("\n") + + # print to console + print("Pump Set Points: "+pumpSetPts) + print(" Pump Speeds: "+pumpMeasSpds) + print(" Pump PWMs/DACs: "+pumpPWMs) + print(" Load Cells: "+loadCells) + print("Ultrafiltration: "+ultraFilt) + # exit(1)