prev v5.12.1

Reviewed-on: #266
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,6 +10,12 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v5.12.1] 2023-12-13
+
+## Added
+
+- A few new commands to test the TC scheduler.
+
 # [v5.12.0] 2023-12-06
 
 ## Added

eive_tmtc/config/returnvalues.csv

@@ -387,6 +387,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4304;PUS11_InvalidRelativeTime;No description;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4305;PUS11_ContainedTcTooSmall;No description;5;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4306;PUS11_ContainedTcCrcMissmatch;No description;6;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4307;PUS11_MapIsFull;No description;7;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4400;FILS_GenericFileError;No description;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4401;FILS_GenericDirError;No description;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4402;FILS_FilesystemInactive;No description;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -893,6 +893,7 @@ def handle_attitude_estimation_data(pw: PrintWrapper, hk_data: bytes):
         quest_quat = struct.unpack(
             fmt_quat, hk_data[current_idx : current_idx + inc_len_quat]
         )
+        current_idx += inc_len_quat
         pw.dlog(f"{'QUEST Quaternion'.ljust(25)}: {fmt_str_4.format(*quest_quat)}")
         pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=4))
         return

eive_tmtc/tmtc/core.py

@@ -5,22 +5,25 @@ import struct
 from pathlib import Path
 from typing import Tuple
 
-from eive_tmtc.pus_tm.defs import PrintWrapper
-
-from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper
-
-from tmtccmd.tmtc import DefaultPusQueueHelper
-from tmtccmd.pus.s8_fsfw_action import create_action_cmd
-from tmtccmd.pus.tc.s3_fsfw_hk import make_sid, generate_one_hk_command
-from tmtccmd.pus.s20_fsfw_param import (
-    create_scalar_u8_parameter,
-    create_load_param_cmd,
-)
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
-from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.pus.s8_fsfw_action import create_action_cmd
+from tmtccmd.pus.s11_tc_sched import (
+    create_enable_tc_sched_cmd,
+    create_disable_tc_sched_cmd,
+)
+from tmtccmd.pus.s20_fsfw_param import (
+    create_load_param_cmd,
+    create_scalar_u8_parameter,
+)
+from tmtccmd.pus.tc.s3_fsfw_hk import generate_one_hk_command, make_sid
+from tmtccmd.tmtc import DefaultPusQueueHelper
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
+from eive_tmtc.pus_tm.defs import PrintWrapper
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -66,6 +69,7 @@ class ActionId(enum.IntEnum):
     MV_HELPER = 53
     RM_HELPER = 54
     MKDIR_HELPER = 55
+    ENABLE_SCHEDULER = 56
 
 
 class ParamId(enum.IntEnum):
@@ -115,6 +119,8 @@ class OpCode:
     RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt"
     AUTO_SWITCH_ENABLE = "auto_switch_enable"
     AUTO_SWITCH_DISABLE = "auto_switch_disable"
+    ENABLE_SCHEDULER = "enable_scheduler"
+    DISABLE_SCHEDULER = "disable_scheduler"
 
 
 class Info:
@@ -142,6 +148,8 @@ class Info:
     MKDIR_HELPER = "Filesystem Directory Creation Helper"
     AUTO_SWITCH_ENABLE = "Enable Auto-Switch Feature with a specific target image"
     AUTO_SWITCH_DISABLE = "Disable Auto-Switch Feature"
+    ENABLE_SCHEDULER = "Enable scheduler"
+    DISABLE_SCHEDULER = "Disable scheduler"
 
 
 class Chip(enum.IntEnum):
@@ -241,6 +249,8 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
     oce.add(keys=OpCode.CP_HELPER, info=Info.CP_HELPER)
     oce.add(keys=OpCode.RM_HELPER, info=Info.RM_HELPER)
     oce.add(keys=OpCode.MKDIR_HELPER, info=Info.MKDIR_HELPER)
+    oce.add(keys=OpCode.ENABLE_SCHEDULER, info=Info.ENABLE_SCHEDULER)
+    oce.add(keys=OpCode.DISABLE_SCHEDULER, info=Info.DISABLE_SCHEDULER)
     defs.add_service(CustomServiceList.CORE.value, "Core Controller", oce)
 
 
@@ -514,6 +524,12 @@ def pack_core_commands(  # noqa C901
         q.add_pus_tc(
             create_action_cmd(CORE_CONTROLLER_ID, ActionId.MKDIR_HELPER, user_data)
         )
+    elif op_code == OpCode.ENABLE_SCHEDULER:
+        q.add_log_cmd(Info.ENABLE_SCHEDULER)
+        q.add_pus_tc(create_enable_tc_sched_cmd())
+    elif op_code == OpCode.DISABLE_SCHEDULER:
+        q.add_log_cmd(Info.DISABLE_SCHEDULER)
+        q.add_pus_tc(create_disable_tc_sched_cmd())
     else:
         _LOGGER.warning(
             f"Unknown operation code {op_code} for core controller commands"

eive_tmtc/tmtc/test.py

@@ -1,10 +1,15 @@
-from spacepackets.ecss import PusTelecommand, PusService
+import struct
+import datetime
+import math
+
+from spacepackets.ecss import PusService, PusTelecommand
 from tmtccmd.config import CoreServiceList
 from tmtccmd.config.tmtc import (
-    tmtc_definitions_provider,
-    TmtcDefinitionWrapper,
     OpCodeEntry,
+    TmtcDefinitionWrapper,
+    tmtc_definitions_provider,
 )
+from tmtccmd.pus.s11_tc_sched import create_time_tagged_cmd
 from tmtccmd.pus.s17_test import create_service_17_ping_command
 from tmtccmd.tmtc import service_provider
 from tmtccmd.tmtc.decorator import ServiceProviderParams
@@ -14,12 +19,14 @@ class OpCodes:
     PING = "ping"
     TRIGGER_EVENT = "trig_event"
     PING_WITH_DATA = "ping_with_data"
+    SCHEDULE_PING = "sched_ping"
 
 
 class Info:
     PING = "Simple Ping and Connection Test"
     TRIGGER_EVENT = "Trigger an event"
     PING_WITH_DATA = "Ping with data. Size of sent data is sent back"
+    SCHEDULE_PING = "Schedule a ping"
 
 
 @tmtc_definitions_provider
@@ -28,6 +35,7 @@ def add_test_defs(defs: TmtcDefinitionWrapper):
     oce.add(keys=OpCodes.PING, info=Info.PING)
     oce.add(keys=OpCodes.TRIGGER_EVENT, info=Info.TRIGGER_EVENT)
     oce.add(keys=OpCodes.PING_WITH_DATA, info=Info.PING_WITH_DATA)
+    oce.add(keys=OpCodes.SCHEDULE_PING, info=Info.SCHEDULE_PING)
 
     defs.add_service(
         name=CoreServiceList.SERVICE_17_ALT,
@@ -46,6 +54,21 @@ def pack_test_command(p: ServiceProviderParams):
     if info.op_code == OpCodes.TRIGGER_EVENT:
         q.add_log_cmd("Sending PUS TC Event Trigger [17, 128]")
         q.add_pus_tc(PusTelecommand(service=PusService.S17_TEST, subservice=128))
+    if info.op_code == OpCodes.SCHEDULE_PING:
+        q.add_log_cmd("Sending scheduled PUS ping")
+        # Generate a UNIX timestamp 30 seconds in the future using the datetime API with a UTC timezone
+        now = datetime.datetime.now(tz=datetime.timezone.utc)
+        second_offset_to_now = input("Please specify offset to now in seconds: ")
+        now += datetime.timedelta(seconds=int(second_offset_to_now))
+        unix_stamp = struct.pack("!I", math.floor(now.timestamp()))
+        print(f"Sending ping scheuled at {now}")
+        ping = PusTelecommand(service=PusService.S17_TEST, subservice=128)
+        q.add_pus_tc(
+            create_time_tagged_cmd(
+                release_time=unix_stamp,
+                tc_to_insert=ping,
+            )
+        )
     if info.op_code == OpCodes.PING_WITH_DATA:
         q.add_log_cmd("Sending Ping With Data, Size Reported Back [17, 129]")
         while True:

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "eive-tmtc"
 description = "TMTC Commander EIVE"
 readme = "README.md"
-version = "5.12.0"
+version = "5.12.1"
 requires-python = ">=3.10"
 license = {text = "Apache-2.0"}
 authors = [