Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -r71216b08590dd4b556c10b3384dddc26c8d29a99 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 71216b08590dd4b556c10b3384dddc26c8d29a99) @@ -5,7 +5,7 @@ # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file temperatures.py +# @file temperature_sensors.py # # @author (last) Micahel Garthwaite # @date (last) 28-Jul-2023 @@ -33,10 +33,10 @@ D50_TEMP = 3 # Trimmer heater temperature sensor BARO_TEMP = 4 # Barometric temperature sensor BRD_TEMP = 5 # DD board temperature sensor ( thermistor ) - D17_COND = 6 # Bicarb only conductivity sensor temp - D27_COND = 7 # Acid and Bicarb mix conductivity sensor - 1 temp - D29_COND = 8 # Acid and Bicarb mix conductivity sensor - 2 temp - D43_COND = 9 # Spent dialysate conductivity sensor temp + 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): @@ -55,10 +55,10 @@ DDTemperaturesNames.D50_TEMP.name: 0.0, DDTemperaturesNames.BARO_TEMP.name: 0.0, DDTemperaturesNames.BRD_TEMP.name: 0.0, - DDTemperaturesNames.D17_COND.name: 0.0, - DDTemperaturesNames.D27_COND.name: 0.0, - DDTemperaturesNames.D29_COND.name: 0.0, - DDTemperaturesNames.D43_COND.name: 0.0,} + DDTemperaturesNames.D16_TEMP.name: 0.0, + DDTemperaturesNames.D28_TEMP.name: 0.0, + DDTemperaturesNames.D30_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 @@ -92,16 +92,16 @@ 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.D17_COND.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_temperatures[DDTemperaturesNames.D27_COND.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D28_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_temperatures[DDTemperaturesNames.D29_COND.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D30_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_temperatures[DDTemperaturesNames.D43_COND.name] = struct.unpack('f', bytearray( + 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_timestamp = timestamp