Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r80e3a4d6a11fc14c975740531b9cf2b825915781 -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 80e3a4d6a11fc14c975740531b9cf2b825915781) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba) @@ -33,11 +33,10 @@ D50_TEMP = 3 # Trimmer heater temperature sensor BARO_TEMP = 4 # Barometric temperature sensor BRD_TEMP = 5 # DD board temperature sensor ( thermistor ) - D16_TEMP = 6 # D16 temperature value - D28_TEMP = 7 # D28 temperature value - D30_TEMP = 8 # D30 temperature value - D44_TEMP = 9 # D44 temperature value - D75_TEMP = 10 # D75 temperature value + D16_TEMP = 6 # Bicarb only conductivity sensor temp + D28_TEMP = 7 # Acid and Bicarb mix conductivity sensor - 1 temp + D30_TEMP = 8 # Acid and Bicarb mix conductivity sensor - 2 temp + D44_TEMP = 9 # Spent dialysate conductivity sensor temp class DDTemperatureSensors(AbstractSubSystem): @@ -59,8 +58,7 @@ DDTemperaturesNames.D16_TEMP.name: 0.0, DDTemperaturesNames.D28_TEMP.name: 0.0, DDTemperaturesNames.D30_TEMP.name: 0.0, - DDTemperaturesNames.D44_TEMP.name: 0.0, - DDTemperaturesNames.D75_TEMP.name: 0.0} + DDTemperaturesNames.D44_TEMP.name: 0.0,} if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -88,10 +86,10 @@ self.dd_temperatures[DDTemperaturesNames.D50_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_temperatures[DDTemperaturesNames.BRD_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.BARO_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_temperatures[DDTemperaturesNames.BARO_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.BRD_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_temperatures[DDTemperaturesNames.D16_TEMP.name] = struct.unpack('f', bytearray( @@ -106,9 +104,6 @@ self.dd_temperatures[DDTemperaturesNames.D44_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_temperatures[DDTemperaturesNames.D75_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: