From 4086e7947b4458bcbbd47c78e67c23d3a47885c8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 8 Feb 2023 11:51:55 +0100 Subject: [PATCH] this is more pythonic --- eive_tmtc/pus_tm/event_handler.py | 11 ++++++----- eive_tmtc/tmtc/com/subsystem.py | 9 +++++++-- eive_tmtc/tmtc/core.py | 10 ++++++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index a404028..676344b 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -1,6 +1,7 @@ import logging import datetime import struct +import sys from eive_tmtc.config.events import get_event_dict from eive_tmtc.config.object_ids import get_object_ids @@ -76,13 +77,13 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter): pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}") pw.dlog(f"Submode: {event_def.param2}") elif info.name == "VERSION_INFO": - ver_major = (event_def.param1 >> 24) & 0xff - ver_minor = (event_def.param1 >> 16) & 0xff - ver_rev = (event_def.param1 >> 8) & 0xff - has_git_sha = bool(event_def.param1 & 0xff) + ver_major = (event_def.param1 >> 24) & 0xFF + ver_minor = (event_def.param1 >> 16) & 0xFF + ver_rev = (event_def.param1 >> 8) & 0xFF + has_git_sha = bool(event_def.param1 & 0xFF) git_sha = "" if has_git_sha: - p2_as_bytes = struct.pack("@I", event_def.param2) + p2_as_bytes = event_def.param2.to_bytes(4, sys.byteorder) git_sha = p2_as_bytes.decode("ascii") version_string = f"v{ver_major}.{ver_minor}.{ver_rev}" pw.dlog(f"Version {version_string}") diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index 25fb4d8..0cfaf06 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -10,7 +10,12 @@ from tmtccmd.config.tmtc import ( ) from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, create_read_mode_command, create_announce_mode_command, create_announce_mode_recursive_command +from tmtccmd.tc.pus_200_fsfw_mode import ( + create_mode_command, + create_read_mode_command, + create_announce_mode_command, + create_announce_mode_recursive_command, +) from tmtccmd.tc.pus_20_fsfw_param import ( create_load_param_cmd, pack_scalar_u8_parameter_app_data, @@ -51,7 +56,7 @@ class Info: UPDATE_DEFAULT_DATARATE_LOW = "Configure default low datarate (BPSK modulation)" UPDATE_DEFAULT_DATARATE_HIGH = "Configure default high datarate (0QPSK modulation)" READ_MODE = "Read Mode" - ANNOUNCE_MODE = "Announce Mode" + ANNOUNCE_MODE = "Announce Mode" ANNOUNCE_MODE_RECURSIVE = "Announce mode recursively" diff --git a/eive_tmtc/tmtc/core.py b/eive_tmtc/tmtc/core.py index b1d0167..2f2b08a 100644 --- a/eive_tmtc/tmtc/core.py +++ b/eive_tmtc/tmtc/core.py @@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__) class ActionId(enum.IntEnum): LIST_DIR_INTO_FILE = 0 ANNOUNCE_VERSION = 1 - ANNOUNCE_CURRENT_IMAGE= 2 + ANNOUNCE_CURRENT_IMAGE = 2 SWITCH_REBOOT_FILE_HANDLING = 5 RESET_REBOOT_COUNTER = 6 SWITCH_IMG_LOCK = 7 @@ -41,8 +41,8 @@ class SetId(enum.IntEnum): class OpCode: - ANNOUNCE_VERSION= "announce_version" - ANNOUNCE_CURRENT_IMAGE= "announce_current_image" + ANNOUNCE_VERSION = "announce_version" + ANNOUNCE_CURRENT_IMAGE = "announce_current_image" REBOOT_XSC = ["0", "reboot_xsc"] XSC_REBOOT_SELF = ["1", "reboot_self"] XSC_REBOOT_0_0 = ["2", "reboot_00"] @@ -155,7 +155,9 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str): q.add_pus_tc(create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_VERSION)) if op_code == OpCode.ANNOUNCE_CURRENT_IMAGE: q.add_log_cmd(f"{Info.ANNOUNCE_CURRENT_IMAGE}") - q.add_pus_tc(create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_CURRENT_IMAGE)) + q.add_pus_tc( + create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_CURRENT_IMAGE) + ) if op_code in OpCode.REBOOT_XSC: reboot_self, chip_select, copy_select = determine_reboot_params() add_xsc_reboot_cmd(