Index: tests/dg_tests.py =================================================================== diff -u -r053580d8dbe39bf313d61b002d8d41a189d95c39 -rf5ed119ffe4c4cf520b22221073b1ff9a6f5968a --- tests/dg_tests.py (.../dg_tests.py) (revision 053580d8dbe39bf313d61b002d8d41a189d95c39) +++ tests/dg_tests.py (.../dg_tests.py) (revision f5ed119ffe4c4cf520b22221073b1ff9a6f5968a) @@ -39,6 +39,7 @@ from dialin.dg.fans import DGFansNames from dialin.dg.pressures import DGPressures from dialin.dg.conductivity_sensors import ConductivitySensorsEnum +from dialin.dg.voltages import DGMonitoredVoltages from time import sleep from datetime import datetime import sys @@ -78,7 +79,7 @@ .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top, hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume, hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume, - PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, + 0, #PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, PostTreatmentStates(hd.post_treatment.post_treatment_sub_mode).name, HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name)) return info @@ -185,12 +186,14 @@ def get_heaters_info(): info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, ' 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, Dia_flow, {:5.3f}, ' - 'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, '. + 'Interim_int_temp, {:5.3f}, Heater_RO_flow, {:5.3f}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature, dg.heaters.primary_efficiency, dg.heaters.temporary_remove_flow, - dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow)) + dg.heaters.temporary_internal_target, dg.heaters.temporary_target_ro_flow, + dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value], + dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value])) return info @@ -420,7 +423,7 @@ def collect_hd_treatment(): f = open("/home/fw/projects/dialin/tests/treatment_run_hd.log", "w") - hd.cmd_hd_software_reset_request() + #hd.cmd_hd_software_reset_request() try: while True: @@ -619,22 +622,24 @@ hd.cmd_log_in_to_hd() sleep(1) - # run_heat_disinfect() + #run_heat_disinfect() # run_chemical_disinfect() # run_dg() # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() - # collect_hd_treatment() + #collect_hd_treatment() # test_hd_fans_alarms() # test_dg_fans_alarms() - #while True: - # print(get_hd_fans_info(), get_hd_occlusion_pressures_info()) - # sleep(1) + while True: + print(get_hd_fans_info()) + sleep(1) + #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1) +