Index: tests/dg_heat_disinfect_test.py =================================================================== diff -u -r7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2 -r111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5 --- tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2) +++ tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 111a7cd39ffa7b39669e7f38fbf3ff6fe9eae3e5) @@ -95,15 +95,18 @@ 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}'. + '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}, '. 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], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name], dg.heaters.trimmer_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.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)) return info @@ -138,6 +141,7 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") #dg.hd_proxy.cmd_start_stop_heat_disinfect() + try: while True: @@ -163,6 +167,7 @@ dg.hd_proxy.cmd_start_stop_heat_disinfect(start=False) # Write a few more complete states to make sure the complete state items are recorded elif complete_counter == 3: + #pass f.close() break