Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -rfd723e785f01249340045b3447771854155a1829 -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision fd723e785f01249340045b3447771854155a1829) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -23,7 +23,7 @@ from dialin.dg.chemical_disinfect import ChemCancellationModes from dialin.dg.drain_pump import DrainPumpStates from dialin.dg.thermistors import ThermistorsNames -from dialin.dg.temperature_sensors import TemperatureSensorsNames +from dialin.dg.temperature_sensors import DGTemperaturesNames from dialin.dg.dialysate_generator import DGOperationModes from dialin.hd.temperatures import HDTemperaturesNames from dialin.common.hd_defs import HDOpModes, HDOpSubModes @@ -168,12 +168,12 @@ def get_temperature_sensors_info(): info = ('TPi, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, ' - .format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_1.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_2.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name])) + .format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_PRIMARY_HEATER.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_DIALYSATE.name])) return info @@ -187,9 +187,9 @@ dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_ONBOARD_NTC.name], dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_1.name], dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_2.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.FPGA_BOARD_SENSOR.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A1_B1.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A2_B2.name])) + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.FPGA_BOARD_SENSOR.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A1_B1.name], + dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A2_B2.name])) return info