diff --git a/CHANGELOG.md b/CHANGELOG.md index a76b643..029b509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ list yields a list of all related PRs for each release. # [unreleased] +## Added + +- Added handling for new clock events. + # [v6.2.0] 2024-04-10 ## Added diff --git a/eive_tmtc/config/definitions.py b/eive_tmtc/config/definitions.py index e5bf6b8..e1ecece 100644 --- a/eive_tmtc/config/definitions.py +++ b/eive_tmtc/config/definitions.py @@ -15,6 +15,10 @@ TM_DB_PATH = "tm.db" # Separate DB or not? Not sure.. # RAW_TM_PATH = "raw_tm.db" +# TODO: The cleanest way would be to load those from the config file.. +PRINT_RAW_HK_B64_STR = False +PRINT_RAW_EVENTS_B64_STR = False + PUS_APID = 0x65 CFDP_APID = 0x66 PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID) diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index e5cfc35..2d5e674 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -1,7 +1,9 @@ import logging import datetime import sys +import base64 +from eive_tmtc.config.definitions import PRINT_RAW_EVENTS_B64_STR from eive_tmtc.config.events import get_event_dict from eive_tmtc.config.object_ids import get_object_ids from eive_tmtc.pus_tm.defs import PrintWrapper @@ -21,6 +23,8 @@ _LOGGER = logging.getLogger(__name__) def handle_event_packet( # noqa C901: Complexity okay here raw_tm: bytes, pw: PrintWrapper ): # noqa C901: Complexity okay here + if PRINT_RAW_EVENTS_B64_STR: + print(f"PUS Event TM Base64: {base64.b64encode(raw_tm)}") tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty()) event_dict = get_event_dict() event_def = tm.event_definition @@ -36,6 +40,7 @@ def handle_event_packet( # noqa C901: Complexity okay here obj_name = event_def.reporter_id.hex(sep=",") else: obj_name = obj_id_obj.name + assert tm.time_provider is not None generic_event_string = ( f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x})" f" at {tm.time_provider.as_date_time()}" @@ -128,12 +133,16 @@ def handle_event_packet( # noqa C901: Complexity okay here time = event_def.param1 + event_def.param2 / 1000.0 time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc) pw.dlog(f"Current time: {time_dt}") - if info.name == "CLOCK_DUMP": + if ( + info.name == "CLOCK_DUMP" + or info.name == "CLOCK_DUMP_BEFORE_SETTING_TIME" + or info.name == "CLOCK_DUMP_AFTER_SETTING_TIME" + ): specific_handler = True # param 1 is timeval seconds, param 2 is timeval subsecond microseconds time = event_def.param1 + event_def.param2 / 1000000.0 time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc) - pw.dlog(f"Current time: {time_dt}") + pw.dlog(f"Clock dump event {info.name}. Current time: {time_dt}") if info.name == "ACTIVE_SD_INFO": sd_0_state = (event_def.param2 >> 16) & 0xFFFF sd_1_state = event_def.param2 & 0xFFFF diff --git a/eive_tmtc/pus_tm/hk_handler.py b/eive_tmtc/pus_tm/hk_handler.py index bee9f23..8274cf0 100644 --- a/eive_tmtc/pus_tm/hk_handler.py +++ b/eive_tmtc/pus_tm/hk_handler.py @@ -6,6 +6,7 @@ import base64 # noqa import sqlite3 from typing import List, cast from uuid import UUID +from eive_tmtc.config.definitions import PRINT_RAW_HK_B64_STR from eive_tmtc.pus_tm.hk import HkTmInfo from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data @@ -74,7 +75,8 @@ def handle_hk_packet( if tm_packet.subservice == 25 or tm_packet.subservice == 26: hk_data = tm_packet.tm_data[8:] if named_obj_id.as_bytes in hk_filter.object_ids: - # print(f"PUS TM Base64: {base64.b64encode(raw_tm)}") + if PRINT_RAW_HK_B64_STR: + print(f"PUS TM Base64: {base64.b64encode(raw_tm)}") handle_regular_hk_print( printer=printer, packet_uuid=packet_uuid,