Index: dialin/dg/fans.py =================================================================== diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- dialin/dg/fans.py (.../fans.py) (revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd) +++ dialin/dg/fans.py (.../fans.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -155,7 +155,7 @@ self.outlet_3_rpm = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - def cmd_dg_fan_rpm_override(self, fan: int, rpm: float, reset: int = NO_RESET) -> int: + def cmd_fans_rpm_override(self, fan: int, rpm: float, reset: int = NO_RESET) -> int: """ Constructs and sends the dg fan RPM override command Constraints: Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -26,7 +26,7 @@ @unique -class TemperatureSensorsNames(DialinEnum): +class DGTemperaturesNames(DialinEnum): INLET_PRIMARY_HEATER = 0 OUTLET_PRIMARY_HEATER = 1 CONDUCTIVITY_SENSOR_1 = 2 @@ -56,24 +56,24 @@ self.can_interface = can_interface self.logger = logger # Dictionary of the temperature sensors - self.temperature_sensors = {TemperatureSensorsNames.INLET_PRIMARY_HEATER.name: {}, - TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name: {}, - TemperatureSensorsNames.CONDUCTIVITY_SENSOR_1.name: {}, - TemperatureSensorsNames.CONDUCTIVITY_SENSOR_2.name: {}, - TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name: {}, - TemperatureSensorsNames.INLET_DIALYSATE.name: {}, - TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name: {}, - TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name: {}, - TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name: {}, - TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name: {}, - TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name: {}, - TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name: {}, - TemperatureSensorsNames.FPGA_BOARD_SENSOR.name: {}, - TemperatureSensorsNames.LOAD_CELL_A1_B1.name: {}, - TemperatureSensorsNames.LOAD_CELL_A2_B2.name: {}, - TemperatureSensorsNames.INTERNAL_THDO_RTD.name: {}, - TemperatureSensorsNames.INTERNAL_TDI_RTD.name: {}, - TemperatureSensorsNames.INTERNAL_COND_TEMP_SENSOR.name: {}} + 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.primary_raw_thermo_couple = 0 self.primary_raw_cold_junc = 0 @@ -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[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_1.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_2.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.INLET_DIALYSATE.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.FPGA_BOARD_SENSOR.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.LOAD_CELL_A1_B1.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.LOAD_CELL_A2_B2.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.INTERNAL_THDO_RTD.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.INTERNAL_TDI_RTD.name] = sensors_data + self.temperature_sensors[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[TemperatureSensorsNames.INTERNAL_COND_TEMP_SENSOR.name] = sensors_data + self.temperature_sensors[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] @@ -202,7 +202,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] self.conductivity_2_raw = sensors_data - def cmd_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends broadcast time interval. Constraints: @@ -237,8 +237,8 @@ self.logger.debug("Timeout!!!!") return False - def cmd_temperature_sensors_override_value(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/hd/fans.py =================================================================== diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- dialin/hd/fans.py (.../fans.py) (revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd) +++ dialin/hd/fans.py (.../fans.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -100,7 +100,7 @@ self.target_rpm = tgt_rpm self.inlet_1_rpm = inlet_1_rpm - def cmd_dg_fan_rpm_override(self, fan: int, rpm: float, reset: int = NO_RESET) -> int: + def cmd_fans_rpm_override(self, fan: int, rpm: float, reset: int = NO_RESET) -> int: """ Constructs and sends the HD fan RPM override command Constraints: Index: dialin/hd/temperatures.py =================================================================== diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- dialin/hd/temperatures.py (.../temperatures.py) (revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd) +++ dialin/hd/temperatures.py (.../temperatures.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -97,7 +97,7 @@ self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_VENOUS_PRESS_TEMP.name] = venous_pressure_sensor_temp self.hd_temperatures[HDTemperaturesNames.TEMPSENSOR_PBA_ADC_SENSOR.name] = pba_adc_sensor - def cmd_hd_temperatures_value_override(self, sensor: int, value: float, reset: int = NO_RESET) -> int: + def cmd_temperatures_value_override(self, sensor: int, value: float, reset: int = NO_RESET) -> int: """ Constructs and sends the HD temperatures value override command Constraints: @@ -133,7 +133,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_hd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the HD temperatures data publication override command. Constraints: 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 Index: tests/test_uf.py =================================================================== diff -u -re21625cbe20d1a836cb78dbc1350fcd894bdcb9f -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- tests/test_uf.py (.../test_uf.py) (revision e21625cbe20d1a836cb78dbc1350fcd894bdcb9f) +++ tests/test_uf.py (.../test_uf.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -18,7 +18,7 @@ sys.path.append("..") from dialin.hd.hemodialysis_device import HD from dialin.dg.dialysate_generator import DG -from dialin.dg.temperature_sensors import TemperatureSensorsNames +from dialin.dg.temperature_sensors import DGTemperaturesNames from time import sleep if __name__ == "__main__": @@ -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[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name]) + \ - ", TPo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name]) + \ - ", TRo, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name]) + \ - ", TDi, " + '{:9.2f}'.format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," + 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]) + "," 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) + \ Index: tests/unit_tests/test_dg_temperature_sensors.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r6e974c56c900d789bd690a5f5e8b6698f0aaed2c --- tests/unit_tests/test_dg_temperature_sensors.py (.../test_dg_temperature_sensors.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ tests/unit_tests/test_dg_temperature_sensors.py (.../test_dg_temperature_sensors.py) (revision 6e974c56c900d789bd690a5f5e8b6698f0aaed2c) @@ -21,11 +21,11 @@ class DGTemperatureSensors(unittest.TestCase): def test_temperature_sensors(self): - from dialin.dg.temperature_sensors import TemperatureSensorsNames + from dialin.dg.temperature_sensors import DGTemperaturesNames i = 0 - for e in TemperatureSensorsNames: - self.assertEqual(e.name, getattr(TemperatureSensorsNames, e.name).name) + for e in DGTemperaturesNames: + self.assertEqual(e.name, getattr(DGTemperaturesNames, e.name).name) self.assertEqual(e.value, i) i += 1