Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -ra6c8026470fbbead9a90b727be257d3076397670 -r6e0b0571d3f4064c8d7bb2b737e326c460780759 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision a6c8026470fbbead9a90b727be257d3076397670) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) @@ -304,22 +304,21 @@ D4_TEMP = 2 # Hydraulics primary heater temperature sensor D50_TEMP = 3 # Trimmer heater temperature sensor BRD_TEMP = 4 # Barometric temperature sensor - BARO_TEMP = 5 # DD board temperature sensor ( thermistor ) - D16_TEMP = 6 # D16 Conductivity sensor temperature value - D28_TEMP = 7 # D28 Conductivity sensor temperature value - D30_TEMP = 8 # D30 Conductivity sensor temperature value - D44_TEMP = 9 # D44 Conductivity sensor temperature value - D75_TEMP = 10 # D75 Conductivity sensor temperature value - D4_AVG_TEMP = 11 # D4 Filtered value - D50_AVG_TEMP = 12 # D50 Filtered value - D28_AVG_TEMP = 13 # D28 Filtered value - D30_AVG_TEMP = 14 # D30 Filtered value - D9_TEMP = 15 # D9 Pressure sensor temperature value - D66_TEMP = 16 # D66 Pressure sensor temperature value - D51_TEMP = 17 # D51 Pressure sensor temperature value - D18_TEMP = 18 # D18 Pressure sensor temperature value - D41_TEMP = 19 # D41 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 20 # Number of Temperature Sensors + D16_TEMP = 5 # D16 Conductivity sensor temperature value + D28_TEMP = 6 # D28 Conductivity sensor temperature value + D30_TEMP = 7 # D30 Conductivity sensor temperature value + D44_TEMP = 8 # D44 Conductivity sensor temperature value + D75_TEMP = 9 # D75 Conductivity sensor temperature value + D4_AVG_TEMP = 10 # D4 Filtered value + D50_AVG_TEMP = 11 # D50 Filtered value + D28_AVG_TEMP = 12 # D28 Filtered value + D30_AVG_TEMP = 13 # D30 Filtered value + D9_TEMP = 14 # D9 Pressure sensor temperature value + D66_TEMP = 15 # D66 Pressure sensor temperature value + D51_TEMP = 16 # D51 Pressure sensor temperature value + D18_TEMP = 17 # D18 Pressure sensor temperature value + D41_TEMP = 18 # D41 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors @unique class DDValveStates(DialinEnum): Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r7c0309a22098e7c4b0ef1599fc737f6f8929b9ac -r6e0b0571d3f4064c8d7bb2b737e326c460780759 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 7c0309a22098e7c4b0ef1599fc737f6f8929b9ac) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) @@ -43,7 +43,6 @@ DDTemperaturesNames.D78_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, @@ -89,51 +88,48 @@ self.dd_temperatures[DDTemperaturesNames.BRD_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.D16_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.D28_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.D30_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.D44_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.D75_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.D4_AVG_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( + self.dd_temperatures[DDTemperaturesNames.D50_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( + self.dd_temperatures[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] - self.dd_temperatures_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -rc8f8cbb3230e40988847f33e9701714939462c93 -r6e0b0571d3f4064c8d7bb2b737e326c460780759 --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision c8f8cbb3230e40988847f33e9701714939462c93) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) @@ -33,7 +33,7 @@ self.td_temperatures_status = {TDTemperatureSensorNames.H23_TEMP.name: 0.0} self.td_temperature_timestamp = 0.0 - @publish([ + @publish(["msg_id_td_temperature_data", "td_temperatures_status", "td_temperature_timestamp" ])