From 2ba33309a758390e9bfd449079280d28aa6d284e Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 May 2022 21:43:46 +0200 Subject: [PATCH] hk handling back to using a dict as I learned it is now ordered --- pus_tm/hk_handling.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index 2197f8d..53b7aab 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -305,24 +305,23 @@ def handle_thermal_controller_hk_data(object_id: ObjectId, printer: FsfwTmTcPrin tm_data = struct.unpack("!ffffffffffffffff", hk_data[:16 * 4]) parsed_data = {} - # put them into an list with their names - parsed_data = [] - parsed_data.append({"SENSOR_PLOC_HEATSPREADER": tm_data[0]}) - parsed_data.append({"SENSOR_PLOC_MISSIONBOARD": tm_data[1]}) - parsed_data.append({"SENSOR_4K_CAMERA": tm_data[2]}) - parsed_data.append({"SENSOR_DAC_HEATSPREADER": tm_data[3]}) - parsed_data.append({"SENSOR_STARTRACKER": tm_data[4]}) - parsed_data.append({"SENSOR_RW1": tm_data[5]}) - parsed_data.append({"SENSOR_DRO": tm_data[6]}) - parsed_data.append({"SENSOR_SCEX": tm_data[7]}) - parsed_data.append({"SENSOR_X8": tm_data[8]}) - parsed_data.append({"SENSOR_HPA": tm_data[9]}) - parsed_data.append({"SENSOR_TX_MODUL": tm_data[10]}) - parsed_data.append({"SENSOR_MPA": tm_data[11]}) - parsed_data.append({"SENSOR_ACU": tm_data[12]}) - parsed_data.append({"SENSOR_PLPCDU_HEATSPREADER": tm_data[13]}) - parsed_data.append({"SENSOR_TCS_BOARD": tm_data[14]}) - parsed_data.append({"SENSOR_MAGNETTORQUER": tm_data[15]}) + # put them into an nice dictionary + parsed_data["SENSOR_PLOC_HEATSPREADER"] = tm_data[0] + parsed_data["SENSOR_PLOC_MISSIONBOARD"] = tm_data[1] + parsed_data["SENSOR_4K_CAMERA"] = tm_data[2] + parsed_data["SENSOR_DAC_HEATSPREADER"] = tm_data[3] + parsed_data["SENSOR_STARTRACKER"] = tm_data[4] + parsed_data["SENSOR_RW1"] = tm_data[5] + parsed_data["SENSOR_DRO"] = tm_data[6] + parsed_data["SENSOR_SCEX"] = tm_data[7] + parsed_data["SENSOR_X8"] = tm_data[8] + parsed_data["SENSOR_HPA"] = tm_data[9] + parsed_data["SENSOR_TX_MODUL"] = tm_data[10] + parsed_data["SENSOR_MPA"] = tm_data[11] + parsed_data["SENSOR_ACU"] = tm_data[12] + parsed_data["SENSOR_PLPCDU_HEATSPREADER"] = tm_data[13] + parsed_data["SENSOR_TCS_BOARD"] = tm_data[14] + parsed_data["SENSOR_MAGNETTORQUER"] = tm_data[15] TM_TCP_SERVER.report_parsed_hk_data(object_id, set_id, parsed_data)