Index: tests/dg_tests.py =================================================================== diff -u -r0c84db7884e7943ab5a57044a4670f1595ee60df -r6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc --- tests/dg_tests.py (.../dg_tests.py) (revision 0c84db7884e7943ab5a57044a4670f1595ee60df) +++ tests/dg_tests.py (.../dg_tests.py) (revision 6b1fd68e4a48f7ee6520da5cd319d40fce1ac5fc) @@ -190,13 +190,13 @@ 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}, Primary_volt, {:5.3f}, Trimmer_volt, {:5.3f}, '. + 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, ' + 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {: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.primary_efficiency, dg.heaters.primary_heaters_target_temperature, + dg.heaters.trimmer_calc_target_temperature, 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 @@ -635,7 +635,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() @@ -647,7 +647,7 @@ #print(hd.hd_debug_events) # sleep(1) - ui = HDSimulator() - ui.cmd_send_hd_operation_mode(3, 1) + #ui = HDSimulator() + #ui.cmd_send_hd_operation_mode(3, 1)