Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -ra0e7107b30e4d6fc631784e249f59038aefeb04f --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) @@ -42,20 +42,17 @@ self._handler_temperature_sensors_sync) self.fp_temperature_sensors_timestamp = 0 - self.fp_temperatures = {FPTemperaturesNames.P10_TEMP.name: 0.0, - FPTemperaturesNames.P19_TEMP.name: 0.0, - FPTemperaturesNames.M1_TEMP.name: 0.0, - FPTemperaturesNames.M3_TEMP.name: 0.0, - FPTemperaturesNames.P8_TEMP.name: 0.0, - FPTemperaturesNames.P13_TEMP.name: 0.0, - FPTemperaturesNames.P17_TEMP.name: 0.0, - FPTemperaturesNames.X1_TEMP.name: 0.0, - FPTemperaturesNames.X2_TEMP.name: 0.0, - FPTemperaturesNames.X3_TEMP.name: 0.0, - FPTemperaturesNames.X4_TEMP.name: 0.0, - FPTemperaturesNames.P7_TEMP.name: 0.0, - FPTemperaturesNames.P16_TEMP.name: 0.0, - } + self.fp_temperatures = { + FPTemperaturesNames.M1_TEMP.name: 0.0, + FPTemperaturesNames.M3_TEMP.name: 0.0, + FPTemperaturesNames.P10_TEMP.name: 0.0, + FPTemperaturesNames.P19_TEMP.name: 0.0, + FPTemperaturesNames.P8_TEMP.name: 0.0, + FPTemperaturesNames.P13_TEMP.name: 0.0, + FPTemperaturesNames.P17_TEMP.name: 0.0, + FPTemperaturesNames.P7_TEMP.name: 0.0, + FPTemperaturesNames.P16_TEMP.name: 0.0 + } @publish(["msg_id_fp_temperature_data", "fp_temperatures_timestamp", "fp_temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): @@ -65,16 +62,16 @@ @param message: published FP temperature sensors data message @returns none """ - self.fp_temperatures[FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_temperatures[FPTemperaturesNames.M1_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P10_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.fp_temperatures[FPTemperaturesNames.M3_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.fp_temperatures[FPTemperaturesNames.P8_TEMP.name] = struct.unpack('f', bytearray( @@ -86,24 +83,12 @@ self.fp_temperatures[FPTemperaturesNames.P17_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.fp_temperatures[FPTemperaturesNames.X1_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.fp_temperatures[FPTemperaturesNames.X2_TEMP.name] = struct.unpack('f', bytearray( + self.fp_temperatures[FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.fp_temperatures[FPTemperaturesNames.X3_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - - self.fp_temperatures[FPTemperaturesNames.X4_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.fp_temperature_sensors_timestamp = timestamp def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: