Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r2321d0094015467e41016c88f49f30cce3b25150 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 2321d0094015467e41016c88f49f30cce3b25150) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -178,7 +178,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: dialin/dg/temperatures.py =================================================================== diff -u -r2321d0094015467e41016c88f49f30cce3b25150 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- dialin/dg/temperatures.py (.../temperatures.py) (revision 2321d0094015467e41016c88f49f30cce3b25150) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -56,24 +56,24 @@ self.can_interface = can_interface self.logger = logger # Dictionary of the temperature sensors - self.temperature_sensors = {DGTemperaturesNames.INLET_PRIMARY_HEATER.name: {}, - DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name: {}, - DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name: {}, - DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name: {}, - DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name: {}, - DGTemperaturesNames.INLET_DIALYSATE.name: {}, - DGTemperaturesNames.PRIMARY_HEATER_THERMOCOUPLE.name: {}, - DGTemperaturesNames.TRIMMER_HEATER_THERMOCOUPLE.name: {}, - DGTemperaturesNames.PRIMARY_HEATER_COLD_JUNCTION.name: {}, - DGTemperaturesNames.TRIMMER_HEATER_COLD_JUNCTION.name: {}, - DGTemperaturesNames.PRIMARY_HEATER_INTERNAL.name: {}, - DGTemperaturesNames.TRIMMER_HEATER_INTERNAL.name: {}, - DGTemperaturesNames.FPGA_BOARD_SENSOR.name: {}, - DGTemperaturesNames.LOAD_CELL_A1_B1.name: {}, - DGTemperaturesNames.LOAD_CELL_A2_B2.name: {}, - DGTemperaturesNames.INTERNAL_THDO_RTD.name: {}, - DGTemperaturesNames.INTERNAL_TDI_RTD.name: {}, - DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name: {}} + self.temperatures = {DGTemperaturesNames.INLET_PRIMARY_HEATER.name: {}, + DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name: {}, + DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name: {}, + DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name: {}, + DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name: {}, + DGTemperaturesNames.INLET_DIALYSATE.name: {}, + DGTemperaturesNames.PRIMARY_HEATER_THERMOCOUPLE.name: {}, + DGTemperaturesNames.TRIMMER_HEATER_THERMOCOUPLE.name: {}, + DGTemperaturesNames.PRIMARY_HEATER_COLD_JUNCTION.name: {}, + DGTemperaturesNames.TRIMMER_HEATER_COLD_JUNCTION.name: {}, + DGTemperaturesNames.PRIMARY_HEATER_INTERNAL.name: {}, + DGTemperaturesNames.TRIMMER_HEATER_INTERNAL.name: {}, + DGTemperaturesNames.FPGA_BOARD_SENSOR.name: {}, + DGTemperaturesNames.LOAD_CELL_A1_B1.name: {}, + DGTemperaturesNames.LOAD_CELL_A2_B2.name: {}, + DGTemperaturesNames.INTERNAL_THDO_RTD.name: {}, + DGTemperaturesNames.INTERNAL_TDI_RTD.name: {}, + DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name: {}} self.primary_raw_thermo_couple = 0 self.primary_raw_cold_junc = 0 @@ -88,14 +88,14 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_temperature_sensors_sync) - def get_temperature(self, sensor): + def get_temperatures_values(self, sensor): """ Gets a temperature sensor's value @param sensor: (str) Name of the sensor e.g. TemperatureSensorsNames.INLET_PRIMARY_HEATER.name @return: The temperature of a temperature sensor """ - return self.temperature_sensors[sensor] + return self.temperatures[DGTemperaturesNames(sensor).name] @publish(["temperature_sensors", "primary_raw_thermo_couple", "primary_raw_cold_junc", "trimmer_raw_thermo_couple", "trimmer_raw_cold_junc", "conductivity_1_raw", "conductivity_2_raw"]) @@ -108,75 +108,75 @@ """ sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.temperature_sensors[DGTemperaturesNames.INLET_PRIMARY_HEATER.name] = sensors_data + self.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.temperature_sensors[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name] = sensors_data + self.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name] = sensors_data + self.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name] = sensors_data + self.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.temperature_sensors[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name] = sensors_data + self.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.temperature_sensors[DGTemperaturesNames.INLET_DIALYSATE.name] = sensors_data + self.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.temperature_sensors[DGTemperaturesNames.PRIMARY_HEATER_THERMOCOUPLE.name] = sensors_data + self.temperatures[DGTemperaturesNames.PRIMARY_HEATER_THERMOCOUPLE.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.temperature_sensors[DGTemperaturesNames.TRIMMER_HEATER_THERMOCOUPLE.name] = sensors_data + self.temperatures[DGTemperaturesNames.TRIMMER_HEATER_THERMOCOUPLE.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.temperature_sensors[DGTemperaturesNames.PRIMARY_HEATER_COLD_JUNCTION.name] = sensors_data + self.temperatures[DGTemperaturesNames.PRIMARY_HEATER_COLD_JUNCTION.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.temperature_sensors[DGTemperaturesNames.TRIMMER_HEATER_COLD_JUNCTION.name] = sensors_data + self.temperatures[DGTemperaturesNames.TRIMMER_HEATER_COLD_JUNCTION.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.temperature_sensors[DGTemperaturesNames.PRIMARY_HEATER_INTERNAL.name] = sensors_data + self.temperatures[DGTemperaturesNames.PRIMARY_HEATER_INTERNAL.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.temperature_sensors[DGTemperaturesNames.TRIMMER_HEATER_INTERNAL.name] = sensors_data + self.temperatures[DGTemperaturesNames.TRIMMER_HEATER_INTERNAL.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.temperature_sensors[DGTemperaturesNames.FPGA_BOARD_SENSOR.name] = sensors_data + self.temperatures[DGTemperaturesNames.FPGA_BOARD_SENSOR.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A1_B1.name] = sensors_data + self.temperatures[DGTemperaturesNames.LOAD_CELL_A1_B1.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A2_B2.name] = sensors_data + self.temperatures[DGTemperaturesNames.LOAD_CELL_A2_B2.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - self.temperature_sensors[DGTemperaturesNames.INTERNAL_THDO_RTD.name] = sensors_data + self.temperatures[DGTemperaturesNames.INTERNAL_THDO_RTD.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - self.temperature_sensors[DGTemperaturesNames.INTERNAL_TDI_RTD.name] = sensors_data + self.temperatures[DGTemperaturesNames.INTERNAL_TDI_RTD.name] = sensors_data sensors_data = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.temperature_sensors[DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name] = sensors_data + self.temperatures[DGTemperaturesNames.INTERNAL_COND_TEMP_SENSOR.name] = sensors_data sensors_data = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] @@ -237,8 +237,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_temperatures_value_override(self, sensor_index: int, - sensor_value: float, reset: int = NO_RESET) -> int: + def cmd_temperatures_value_override(self, sensor_index: int, sensor_value: float, reset: int = NO_RESET) -> int: """ Constructs and sends the value override of a temperature sensor. Constraints: Index: dialin/dg/thermistors.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- dialin/dg/thermistors.py (.../thermistors.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ dialin/dg/thermistors.py (.../thermistors.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -65,7 +65,7 @@ @param: thermistor: (int) thermistor index @return: The temperature of a thermistor """ - return self.thermistors[thermistor] + return self.thermistors[ThermistorsNames(thermistor).name] @publish(['thermistors']) def _handler_thermistors_sync(self, message): Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -r2321d0094015467e41016c88f49f30cce3b25150 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 2321d0094015467e41016c88f49f30cce3b25150) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -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() @@ -599,11 +600,12 @@ # cmd_test_heaters() - collect_treatment_data() + # collect_treatment_data() #collect_hd_treatment() + Index: tests/peter/test_gen_requirements.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- tests/peter/test_gen_requirements.py (.../test_gen_requirements.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ tests/peter/test_gen_requirements.py (.../test_gen_requirements.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -128,7 +128,7 @@ dg.service_record, dg.switches, dg.system_record, - dg.temperature_sensors, + dg.temperatures, dg.thermistors, dg.uv_reactors, dg.valves, Index: tests/test_uf.py =================================================================== diff -u -r2321d0094015467e41016c88f49f30cce3b25150 -r1076daa37cc911c27a2a4ff789a8b91cb7de08ce --- tests/test_uf.py (.../test_uf.py) (revision 2321d0094015467e41016c88f49f30cce3b25150) +++ tests/test_uf.py (.../test_uf.py) (revision 1076daa37cc911c27a2a4ff789a8b91cb7de08ce) @@ -88,10 +88,10 @@ hdPress = ", PBA, " + '{:9.2f}'.format(hd.pressure_occlusion.arterial_pressure) + \ ", PBV, " + '{:9.2f}'.format(hd.pressure_occlusion.venous_pressure) + \ ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) - Temps = ", TPi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_PRIMARY_HEATER.name]) + \ - ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name]) + \ - ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_DIALYSATE.name]) + \ - ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," + Temps = ", TPi, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name]) + \ + ", TPo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name]) + \ + ", TRo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name]) + \ + ", TDi, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," alarms = ", AL.s, " + hd.alarms.get_current_alarms_state() + \ ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \