Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r9466b5c6b5867f392104a42608aa9542a7ff0358 -rb3f1c978d73cfa5badd833ca2c21af0735c1bc7d --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision b3f1c978d73cfa5badd833ca2c21af0735c1bc7d) @@ -31,7 +31,8 @@ D27_COND = 1 D29_COND = 2 D43_COND = 3 - NUM_OF_CONDUCTIVITY_SENSORS = 4 + D74_COND = 4 + NUM_OF_CONDUCTIVITY_SENSORS = 5 class DDConductivitySensors(AbstractSubSystem): """ @@ -84,6 +85,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.d43_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.d74cond = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.dd_conductivity_timestamp = timestamp Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r80e3a4d6a11fc14c975740531b9cf2b825915781 -rb3f1c978d73cfa5badd833ca2c21af0735c1bc7d --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 80e3a4d6a11fc14c975740531b9cf2b825915781) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision b3f1c978d73cfa5badd833ca2c21af0735c1bc7d) @@ -31,13 +31,15 @@ X6_TEMP = 1 # Heat exchanger Outlet temperature sensor D4_TEMP = 2 # Hydraulics primary heater temperature sensor 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 + BRD_TEMP = 4 # Barometric temperature sensor + BARO_TEMP = 5 # DD board temperature sensor ( thermistor ) + D17_TEMP = 6 # D16 temperature value + D27_TEMP = 7 # D28 temperature value + D29_TEMP = 8 # D30 temperature value + D43_TEMP = 9 # D44 temperature value + D74_TEMP = 10 # D75 temperature value + D4_AVG_TEMP = 11 # D4 Filtered value + D50_AVG_TEMP = 12 # D50 Filtered value class DDTemperatureSensors(AbstractSubSystem): @@ -51,16 +53,18 @@ # Dictionary of the temperature sensors self.dd_temperatures_timestamp = 0.0 self.dd_temperatures = {DDTemperaturesNames.D1_TEMP.name: 0.0, - DDTemperaturesNames.X6_TEMP.name: 0.0, - DDTemperaturesNames.D4_TEMP.name: 0.0, - DDTemperaturesNames.D50_TEMP.name: 0.0, - DDTemperaturesNames.BARO_TEMP.name: 0.0, - DDTemperaturesNames.BRD_TEMP.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, - DDTemperaturesNames.D75_TEMP.name: 0.0} + DDTemperaturesNames.X6_TEMP.name: 0.0, + DDTemperaturesNames.D4_TEMP.name: 0.0, + DDTemperaturesNames.D50_TEMP.name: 0.0, + DDTemperaturesNames.BARO_TEMP.name: 0.0, + DDTemperaturesNames.BRD_TEMP.name: 0.0, + DDTemperaturesNames.D17_TEMP.name: 0.0, + DDTemperaturesNames.D27_TEMP.name: 0.0, + DDTemperaturesNames.D29_TEMP.name: 0.0, + DDTemperaturesNames.D43_TEMP.name: 0.0, + DDTemperaturesNames.D74_TEMP.name: 0.0, + DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D50_AVG_TEMP.name: 0.0} if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -94,21 +98,27 @@ self.dd_temperatures[DDTemperaturesNames.BARO_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( + self.dd_temperatures[DDTemperaturesNames.D17_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D27_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D29_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_temperatures[DDTemperaturesNames.D44_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D43_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( + self.dd_temperatures[DDTemperaturesNames.D74_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] + self.dd_temperatures[DDTemperaturesNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] + + self.dd_temperatures[DDTemperaturesNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] + self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: