Index: tests/dg_heat_disinfect_test.py =================================================================== diff -u -r16c42ec1b3d2ee30b81a3a06a130cc9ab00cbe62 -r2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817 --- tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 16c42ec1b3d2ee30b81a3a06a130cc9ab00cbe62) +++ tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817) @@ -36,7 +36,7 @@ def get_heat_disinfect_mode_info(): - info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time {}, ' + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R1_drift, {:5.3f}, R2_level, {:5.3f}, R2_drift, {:5.3f} ' .format(HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time, @@ -96,7 +96,7 @@ info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, ' 'Prim_TC_temp, {:5.3f}, Trimmer_DC, {:5.3f}, Trim_int_temp, {:5.3f}, Trim_CJ_temp, {:5.3f}, ' 'Trim_TC_temp, {:5.3f}, Prim_TC_raw, {:5.3f}, Prim_CJ_raw, {:5.3f}, Trimmer_TC_raw, {:5.3f}, ' - 'Trimmer_CJ_raw, {:5.3f}, '. + 'Trimmer_CJ_raw, {:5.3f}, Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name], @@ -106,7 +106,8 @@ dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name], dg.temperature_sensors.primary_raw_thermo_couple, dg.temperature_sensors.primary_raw_cold_junc, - dg.temperature_sensors.trimmer_raw_thermo_couple, dg.temperature_sensors.trimmer_raw_cold_junc)) + dg.temperature_sensors.trimmer_raw_thermo_couple, dg.temperature_sensors.trimmer_raw_cold_junc, + dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) return info @@ -140,7 +141,7 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") - #dg.hd_proxy.cmd_start_stop_heat_disinfect() + dg.hd_proxy.cmd_start_stop_heat_disinfect() try: while True: