Merge branch 'main' into mode-handling-fix
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good

This commit is contained in:
Marius Eggert 2024-05-28 09:40:46 +02:00
commit 55a357b52c
2 changed files with 5 additions and 0 deletions

View File

@ -17,6 +17,7 @@ TM_DB_PATH = "tm.db"
# TODO: The cleanest way would be to load those from the config file..
PRINT_RAW_HK_B64_STR = False
PRINT_RAW_ACTION_DATA_REPLY_B64_STR = True
PRINT_RAW_EVENTS_B64_STR = False
PUS_APID = 0x65

View File

@ -1,8 +1,10 @@
import base64
import logging
import struct
from spacepackets.ecss import PusTm
from tmtccmd.pus.s8_fsfw_action_defs import CustomSubservice
from eive_tmtc.config.definitions import PRINT_RAW_ACTION_DATA_REPLY_B64_STR
from eive_tmtc.config.object_ids import (
ACU_HANDLER_ID,
PDU_1_HANDLER_ID,
@ -51,6 +53,8 @@ def handle_action_service_tm(
if object_id is None:
object_id = ObjectIdU32(object_id_raw, "Unknown ID")
if tm_packet.subservice == CustomSubservice.TM_DATA_REPLY:
if PRINT_RAW_ACTION_DATA_REPLY_B64_STR:
print(f"PUS TM Base64: {base64.b64encode(raw_tm)}")
if object_id.as_bytes == IMTQ_HANDLER_ID:
return handle_imtq_replies(action_id, pw, custom_data)
elif object_id.as_bytes == PLOC_MPSOC_ID: