Index: tests/test_dd.py =================================================================== diff -u -ra455d4bcbfa4063770aaaeb913082c4fde063701 -rd07e48f7590b0413b88bc71f1d4f8835da9d673f --- tests/test_dd.py (.../test_dd.py) (revision a455d4bcbfa4063770aaaeb913082c4fde063701) +++ tests/test_dd.py (.../test_dd.py) (revision d07e48f7590b0413b88bc71f1d4f8835da9d673f) @@ -17,7 +17,7 @@ import sys sys.path.append("..") -from leahi_dialin.td.treatment_delivery import TD +#from leahi_dialin.td.treatment_delivery import TD from leahi_dialin.dd.dialysate_delivery import DD #from leahi_dialin.td.valves import ValvesEnum #from leahi_dialin.dd.temperatures import DGTemperaturesNames @@ -26,7 +26,7 @@ if __name__ == "__main__": # create an TD object called td - td = TD(log_level="DEBUG") + #td = TD(log_level="DEBUG") # create a DD object called dd dd = DD(log_level="DEBUG") sleep(2) @@ -79,82 +79,96 @@ #else: #print (" float level is low") #dd.valves.cmd_valve_override(12,True,0) - sleep(0.50) - 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) + \ - ", DP.ss, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_measured_spd_spent) + \ - ", DP.fc, " + '{:7.1f}'.format(dd.dialysate_pumps.dial_pump_current_spd_fresh) + \ - ", DP.sc, " + '{:6.1f}'.format(dd.dialysate_pumps.dial_pump_current_spd_spent) + \ - ", 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, " + '{:8.1f}'.format(dd.dialysate_pumps.dial_pump_measured_current_fresh) + \ - ", DP.sm, " + '{:8.1f}'.format(dd.dialysate_pumps.dial_pump_measured_current_spent) + \ - ", DP.c1, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_control_fresh) + \ - ", DP.c2, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_control_spent) + \ - ", DP.fd, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_dir_err_cnt_fresh) + \ - ", DP.sd, " + '{:2d}'.format(dd.dialysate_pumps.dial_pump_dir_err_cnt_spent) + \ - ", 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.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) + \ - ", Pho, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_hydraulics_output_pressure) + \ - ", PBi, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_bibag_presssure) + \ - ", Psd, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_spent_dialysate_pressure) + \ - ", Pfd, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_fresh_dialysate_pressure) + \ - ", Ptm, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_transmembrane_pressure) + \ - ", Twi, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_water_inlet_input_temp) + \ - ", Two, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_water_inlet_output_temp) + \ - ", Tho, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_hydraulics_output_temp) + \ - ", Tbi, " + '{:8.1f}'.format(dd.pressure_sensors.filtered_bibag_temp) + \ - ", 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) + sleep(1.000) + dialPump = ", D12.fr, " + '{:7.1f}'.format(dd.dialysate_pumps.d12_pump_target_rpm_fresh) + \ + ", D48.sr, " + '{:7.1f}'.format(dd.dialysate_pumps.d48_pump_target_rpm_spent) + \ + ", D12.fs, " + '{:6.1f}'.format(dd.dialysate_pumps.d12_pump_measured_spd_fresh) + \ + ", D48.ss, " + '{:7.1f}'.format(dd.dialysate_pumps.d48_pump_measured_spd_spent) + \ + ", D12.fc, " + '{:7.1f}'.format(dd.dialysate_pumps.d12_pump_current_spd_fresh) + \ + ", D48.sc, " + '{:6.1f}'.format(dd.dialysate_pumps.d48_pump_current_spd_spent) + \ + ", D12.s1, " + '{:2d}'.format(dd.dialysate_pumps.d12_pump_state_fresh) + \ + ", D48.s2, " + '{:2d}'.format(dd.dialysate_pumps.d48_pump_state_spent) + \ + ", D12.ft, " + '{:6.1f}'.format(dd.dialysate_pumps.d12_pump_tgt_pressure_fresh) + \ + ", D48.st, " + '{:6.1f}'.format(dd.dialysate_pumps.d48_pump_tgt_pressure_spent) + \ + ", D12.fp, " + '{:7.1f}'.format(dd.dialysate_pumps.d12_pump_measured_pressure_fresh) + \ + ", D48.sp, " + '{:7.1f}'.format(dd.dialysate_pumps.d48_pump_measured_pressure_spent) + \ + ", D12.fm, " + '{:8.1f}'.format(dd.dialysate_pumps.d12_pump_measured_current_fresh) + \ + ", D48.sm, " + '{:8.1f}'.format(dd.dialysate_pumps.d48_pump_measured_current_spent) + \ + ", D12.c1, " + '{:2d}'.format(dd.dialysate_pumps.d12_pump_control_fresh) + \ + ", D48.c2, " + '{:2d}'.format(dd.dialysate_pumps.d48_pump_control_spent) + \ + ", D12.fd, " + '{:2d}'.format(dd.dialysate_pumps.d12_pump_dir_err_cnt_fresh) + \ + ", D48.sd, " + '{:2d}'.format(dd.dialysate_pumps.d48_pump_dir_err_cnt_spent) + \ + ", D12.d1, " + '{:2d}'.format(dd.dialysate_pumps.d12_pump_measured_dir_fresh) + \ + ", D48.d2, " + '{:2d}'.format(dd.dialysate_pumps.d48_pump_measured_dir_spent) + Levels = "L.d6, " + '{:2d}'.format(dd.levels.d6_level) + \ + ", L.d63, " + '{:2d}'.format(dd.levels.d63_level) + \ + ", L.d46, " + '{:2d}'.format(dd.levels.d46_level) + pressure = ",P.m1, " + '{:8.1f}'.format(dd.pressure_sensors.m1_pres) + \ + ", P.m3, " + '{:8.1f}'.format(dd.pressure_sensors.m3_pres) + \ + ", P.d9, " + '{:8.1f}'.format(dd.pressure_sensors.d9_pres) + \ + ", P.d66, " + '{:8.1f}'.format(dd.pressure_sensors.d66_pres) + \ + ", P.d51, " + '{:8.1f}'.format(dd.pressure_sensors.d51_pres) + \ + ", P.d18, " + '{:8.1f}'.format(dd.pressure_sensors.d18_pres) + \ + ", P.d41, " + '{:8.1f}'.format(dd.pressure_sensors.d41_pres) + \ + ", Pt.m1, " + '{:8.1f}'.format(dd.pressure_sensors.m1_pres_temp) + \ + ", Pt.m3, " + '{:8.1f}'.format(dd.pressure_sensors.m3_pres_temp) + \ + ", Pt.d9, " + '{:8.1f}'.format(dd.pressure_sensors.d9_pres_temp) + \ + ", Pt.d66, " + '{:8.1f}'.format(dd.pressure_sensors.d66_pres_temp) + \ + ", Pt.d51, " + '{:8.1f}'.format(dd.pressure_sensors.d51_pres_temp) + \ + ", Pt.d18, " + '{:8.1f}'.format(dd.pressure_sensors.d18_pres_temp) + \ + ", Pt.d41, " + '{:8.1f}'.format(dd.pressure_sensors.d41_pres_temp) valves = ", DDVlvs, " + '{:8X}'.format(dd.valves.valve_states_all) - Levels = "L.f1, " + '{:2d}'.format(dd.levels.floater1) + \ - ", L.Bi, " + '{:2d}'.format(dd.levels.bicarb_level) + \ - ", L.s, " + '{:2d}'.format(dd.levels.spent_dialysate_level) Temperature = "Temp " + '{}'.format(dd.temperature_sensors.dd_temperatures) - ConcPumps = ", 1SetS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_current_set_speed) + \ - ", 1MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_measured_speed) + \ - ", 2SetS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_current_set_speed ) + \ - ", 2MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_measured_speed) + \ - ", 1TRev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_target_rev_count) + \ - ", 1Mrev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_measured_rev_count) + \ - ", 2Trev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_target_rev_count) + \ - ", 2Mrev, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_measured_rev_count) + \ - ", 1Ex, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp1_current_state) + \ - ", 2Ex, " + '{:2d}'.format(dd.concentrate_pumps.concentrate_pump_cp2_current_state) + \ - ", 1Pul, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_pulse_us) + \ - ", 2Pul, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_pulse_us) + \ - ", 1TS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp1_target_speed) + \ - ", 2TS, " + '{:8.1f}'.format(dd.concentrate_pumps.concentrate_pump_cp2_target_speed) + \ - ", 1P, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp1_parked) + \ - ", 2P, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp2_parked) + \ - ", 1PF, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp1_park_fault) + \ - ", 2PF, " + '{:b}'.format(dd.concentrate_pumps.concentrate_pump_cp2_park_fault ) - Heaters = ", PCnt, " + '{:8.1f}'.format(dd.heaters.main_primary_heater_duty_cycle) + \ - ", TCnt, " + '{:8.1f}'.format(dd.heaters.trimmer_heater_duty_cycle) + \ - ", PTemp, " + '{:8.1f}'.format(dd.heaters.primary_heaters_target_temperature) + \ - ", TTemp, " + '{:8.1f}'.format(dd.heaters.trimmer_heater_target_temperature) + \ - ", PSt, " + '{:2d}'.format(dd.heaters.primary_heater_state ) + \ - ", Tst, " + '{:2d}'.format(dd.heaters.trimmer_heater_state) + \ - ", PCtr, " + '{:2d}'.format(dd.heaters.primary_control_counter) + \ - ", TCtr, " + '{:2d}'.format(dd.heaters.trimmer_control_counter) + ConcPumps = ", D11.cs, " + '{:8.1f}'.format(dd.concentrate_pumps.d11_cp1_current_set_speed) + \ + ", D11.MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.d11_cp1_measured_speed) + \ + ", D10.cs, " + '{:8.1f}'.format(dd.concentrate_pumps.d10_cp2_current_set_speed ) + \ + ", D10.MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.d10_cp2_measured_speed) + \ + ", D11.Trev, " + '{:2d}'.format(dd.concentrate_pumps.d11_cp1_target_rev_count) + \ + ", D11.Mrev, " + '{:2d}'.format(dd.concentrate_pumps.d11_cp1_measured_rev_count) + \ + ", D10.Trev, " + '{:2d}'.format(dd.concentrate_pumps.d10_cp2_target_rev_count) + \ + ", D10.Mrev, " + '{:2d}'.format(dd.concentrate_pumps.d10_cp2_measured_rev_count) + \ + ", D11.ex, " + '{:2d}'.format(dd.concentrate_pumps.d11_cp1_current_state) + \ + ", D10.ex, " + '{:2d}'.format(dd.concentrate_pumps.d10_cp2_current_state) + \ + ", D11.pul, " + '{:8.1f}'.format(dd.concentrate_pumps.d11_cp1_pulse_us) + \ + ", D10.pul, " + '{:8.1f}'.format(dd.concentrate_pumps.d10_cp2_pulse_us) + \ + ", D11.ts, " + '{:8.1f}'.format(dd.concentrate_pumps.d11_cp1_target_speed) + \ + ", D10.ts, " + '{:8.1f}'.format(dd.concentrate_pumps.d10_cp2_target_speed) + \ + ", D11.p, " + '{:b}'.format(dd.concentrate_pumps.d11_cp1_parked) + \ + ", D10.p, " + '{:b}'.format(dd.concentrate_pumps.d10_cp2_parked) + \ + ", D11.PF, " + '{:b}'.format(dd.concentrate_pumps.d11_cp1_park_fault) + \ + ", D10.PF, " + '{:b}'.format(dd.concentrate_pumps.d10_cp2_park_fault ) + \ + ", D76.ts, " + '{:8.1f}'.format(dd.concentrate_pumps.d76_target_speed) + \ + ", D76.cs, " + '{:8.1f}'.format(dd.concentrate_pumps.d76_current_set_speed) + \ + ", D76.MeS, " + '{:8.1f}'.format(dd.concentrate_pumps.d76_measured_speed) + \ + ", D76.Trev, " + '{:2d}'.format(dd.concentrate_pumps.d76_target_rev_count) + \ + ", D76.Mrev, " + '{:2d}'.format(dd.concentrate_pumps.d76_measured_rev_count) + \ + ", D76.ex, " + '{:2d}'.format(dd.concentrate_pumps.d76_current_state) + \ + ", D76.pul, " + '{:8.1f}'.format(dd.concentrate_pumps.d76_pulse_us) + Heaters = ",D5.DC, " + '{:8.1f}'.format(dd.heaters.d5_heat_duty_cycle) + \ + ", D45.DC, " + '{:8.1f}'.format(dd.heaters.d45_heat_duty_cycle) + \ + ", D5.TT, " + '{:8.1f}'.format(dd.heaters.d5_heat_target_temperature) + \ + ", D45.TT, " + '{:8.1f}'.format(dd.heaters.d45_heat_target_temperature) + \ + ", D5.S, " + '{:2d}'.format(dd.heaters.d5_heat_state ) + \ + ", D45.S, " + '{:2d}'.format(dd.heaters.d45_heat_state) + \ + ", D5.cnt, " + '{:2d}'.format(dd.heaters.d5_heat_control_counter) + \ + ", D45.cnt, " + '{:2d}'.format(dd.heaters.d45_heat_control_counter) + \ + ", dbg1, " + '{:8.3f}'.format(dd.heaters.dbg1) + \ + ", dbg2, " + '{:8.3f}'.format(dd.heaters.dbg2) + \ + ", dbg3, " + '{:8.3f}'.format(dd.heaters.dbg3) + \ + ", dbg4, " + '{:8.3f}'.format(dd.heaters.dbg4) + \ + ", dbg5, " + '{:8.3f}'.format(dd.heaters.dbg5) + \ + ", dbg6, " + '{:8.3f}'.format(dd.heaters.dbg6) + \ + ", dbg7, " + '{:8.3f}'.format(dd.heaters.dbg7) + \ + ", dbg8, " + '{:8.3f}'.format(dd.heaters.dbg8) + \ + ", dbg9, " + '{:8.3f}'.format(dd.heaters.dbg9) 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) + ", PSt, " + '{:2d}'.format(dd.balancing_chamber.is_pressure_stabilized_during_fill) + \ + ", BSo, " + '{:2d}'.format(dd.balancing_chamber.bal_chamber_switch_only_state) PistonPumps = ", AcExSt, " + '{:2d}'.format(dd.piston_pumps.acid_control_state) + \ ", BiExSt, " + '{:2d}'.format(dd.piston_pumps.bicarb_control_state) + \ ", UfExSt, " + '{:2d}'.format(dd.piston_pumps.uf_control_state) + \ @@ -166,12 +180,12 @@ ", UFCy, " + '{:2d}'.format(dd.piston_pumps.uf_cycle_counter) 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) + \ + ", D6.l, " + '{:2d}'.format(dd.gen_dialysate.d6_level) + \ + ", D63.l, " + '{:2d}'.format(dd.gen_dialysate.d63_level) + \ + ", D46.l, " + '{:2d}'.format(dd.gen_dialysate.d46_level) + \ + ", D9.p, " + '{:8.1f}'.format(dd.gen_dialysate.d9_pressure) + \ + ", D18.p, " + '{:8.1f}'.format(dd.gen_dialysate.d18_pressure) + \ + ", D51.p, " + '{:8.1f}'.format(dd.gen_dialysate.d51_pressure) + \ ", Del, " + '{:2d}'.format(dd.gen_dialysate.dialysate_good_to_deliver) # log data @@ -189,8 +203,8 @@ # print to console #print("Dialysate Pumps: "+dialPump) - print(" Levels: "+Levels) - print(" Piston Pumps: " + PistonPumps) + #print(" Levels: "+Levels) + #print(" Piston Pumps: " + PistonPumps) #print(" Heaters: " +Heaters) #print(" Pressure: "+pressure) #print(" Temperature: "+Temperature)