Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r2938c0d78722ffb173e99bfa6d8ca297cae70f7e -rbb75cd55d09040554897e0d480aff45781fe14bd --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 2938c0d78722ffb173e99bfa6d8ca297cae70f7e) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision bb75cd55d09040554897e0d480aff45781fe14bd) @@ -177,7 +177,7 @@ self.service_record = DGServiceNVRecord(self.can_interface, self.logger) self.switches = DGSwitches(self.can_interface, self.logger) self.system_record = DGSystemNVRecord(self.can_interface, self.logger) - self.temperature_sensors = TemperatureSensors(self.can_interface, self.logger) + self.temperatures = TemperatureSensors(self.can_interface, self.logger) self.thermistors = Thermistors(self.can_interface, self.logger) self.uv_reactors = UVReactors(self.can_interface, self.logger) self.valves = DGValves(self.can_interface, self.logger) Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -r2938c0d78722ffb173e99bfa6d8ca297cae70f7e -rbb75cd55d09040554897e0d480aff45781fe14bd --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 2938c0d78722ffb173e99bfa6d8ca297cae70f7e) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision bb75cd55d09040554897e0d480aff45781fe14bd) @@ -26,6 +26,7 @@ from dialin.dg.temperatures import DGTemperaturesNames from dialin.dg.dialysate_generator import DGOperationModes from dialin.hd.temperatures import HDTemperaturesNames +from dialin.dg.uv_reactors import ReactorsNames from dialin.common.hd_defs import HDOpModes, HDOpSubModes from dialin.common.dg_defs import DGEventList from dialin.common.hd_defs import HDEventList @@ -168,12 +169,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[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])) + .format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name], + dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name], + dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name], + dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name], + dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name], + dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name])) return info @@ -187,9 +188,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[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])) + dg.temperatures.temperatures[DGTemperaturesNames.FPGA_BOARD_SENSOR.name], + dg.temperatures.temperatures[DGTemperaturesNames.LOAD_CELL_A1_B1.name], + dg.temperatures.temperatures[DGTemperaturesNames.LOAD_CELL_A2_B2.name])) return info @@ -587,7 +588,7 @@ hd.cmd_log_in_to_hd() sleep(1) - # run_heat_disinfect() + run_heat_disinfect() # run_chemical_disinfect() @@ -601,11 +602,12 @@ # cmd_test_heaters() - collect_treatment_data() + # collect_treatment_data() #collect_hd_treatment() +