Index: tests/dg_heat_disinfect_test.py =================================================================== diff -u -r01db18a18769df2048346f868412fc8a12631fc0 -r7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2 --- tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 01db18a18769df2048346f868412fc8a12631fc0) +++ tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 7c9dd1487f23d6bf314dcff09b77a25d9a26d1c2) @@ -3,8 +3,6 @@ import sys sys.path.append("..") from dialin.dg.dialysate_generator import DG -from dialin.hd.hemodialysis_device import HD -from dialin.dg.hd_proxy import DGHDProxy from dialin.dg.heat_disinfect import HeatDisinfectStates, CancellationModes from dialin.dg.drain_pump import DrainPumpStates from dialin.dg.thermistors import ThermistorsNames @@ -95,10 +93,17 @@ def get_heaters_info(): - info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_int_temp, {:5.3f}, Trimmer_DC, {:5.3f}, '. + 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}'. 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.heaters.trimmer_heater_duty_cycle)) + 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])) return info @@ -132,7 +137,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: