Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r7546656fb0fdcdbf3db79c69a891ed3b085f95e4 -r5681154cdaaf629c997dc05472657bf40c94d6e1 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 7546656fb0fdcdbf3db79c69a891ed3b085f95e4) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) @@ -42,6 +42,7 @@ DDTemperaturesNames.D78_TEMP.name: 0.0, DDTemperaturesNames.D4_TEMP.name: 0.0, DDTemperaturesNames.D50_TEMP.name: 0.0, + DDTemperaturesNames.D99_TEMP.name: 0.0, DDTemperaturesNames.BRD_TEMP.name: 0.0, DDTemperaturesNames.D16_TEMP.name: 0.0, DDTemperaturesNames.D28_TEMP.name: 0.0, @@ -50,15 +51,15 @@ DDTemperaturesNames.D75_TEMP.name: 0.0, DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, DDTemperaturesNames.D50_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D99_AVG_TEMP.name: 0.0, DDTemperaturesNames.D28_AVG_TEMP.name: 0.0, DDTemperaturesNames.D30_AVG_TEMP.name: 0.0, DDTemperaturesNames.D66_TEMP.name: 0.0, DDTemperaturesNames.D51_TEMP.name: 0.0, DDTemperaturesNames.D18_TEMP.name: 0.0, DDTemperaturesNames.D41_TEMP.name: 0.0, - DDTemperaturesNames.D87_TEMP.name: 0.0, - DDTemperaturesNames.D99_TEMP.name: 0.0, - DDTemperaturesNames.D99_AVG_TEMP.name: 0.0 + DDTemperaturesNames.D87_TEMP.name: 0.0 + } if self.can_interface is not None: @@ -87,25 +88,25 @@ 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.D99_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_temperatures[DDTemperaturesNames.D16_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.D28_TEMP.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.D30_TEMP.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.D44_TEMP.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.D75_TEMP.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[DDTemperaturesNames.D99_TEMP.name] = struct.unpack('f', bytearray( + 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[DDTemperaturesNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( @@ -114,13 +115,13 @@ 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[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D99_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.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.dd_temperatures[DDTemperaturesNames.D99_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_16:MsgFieldPositions.END_POS_FIELD_16]))[0] self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray(