Merge pull request 'bump_tmtccmd' (#88) from bump_tmtccmd into main

Reviewed-on: #88

satrs-example/pyclient/main.py

@@ -14,7 +14,7 @@ from spacepackets.ccsds.time import CdsShortTimestamp
 from tmtccmd import CcsdsTmtcBackend, TcHandlerBase, ProcedureParamsWrapper
 from tmtccmd.core.base import BackendRequest
 from tmtccmd.pus import VerificationWrapper
-from tmtccmd.tm import CcsdsTmHandler, SpecificApidHandlerBase
+from tmtccmd.tmtc import CcsdsTmHandler, SpecificApidHandlerBase
 from tmtccmd.com import ComInterface
 from tmtccmd.config import (
     default_json_path,
@@ -30,7 +30,7 @@ from tmtccmd.logging.pus import (
     RawTmtcTimedLogWrapper,
     TimedLogWhen,
 )
-from tmtccmd.tc import (
+from tmtccmd.tmtc import (
     TcQueueEntryType,
     ProcedureWrapper,
     TcProcedureType,
@@ -128,6 +128,7 @@ class PusHandler(SpecificApidHandlerBase):
                 if len(pus_tm.source_data) < 8:
                     raise ValueError("No addressable ID in HK packet")
                 json_str = pus_tm.source_data[8:]
+                _LOGGER.info(json_str)
             dedicated_handler = True
         if service == 5:
             tm_packet = PusTelemetry.unpack(

satrs-example/pyclient/pus_tc.py

@@ -3,9 +3,9 @@ import datetime
 from spacepackets.ccsds import CdsShortTimestamp
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import CoreServiceList
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_11_tc_sched import create_time_tagged_cmd
-from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command
+from tmtccmd.tmtc import DefaultPusQueueHelper
+from tmtccmd.pus.s11_tc_sched import create_time_tagged_cmd
+from tmtccmd.pus.tc.s3_fsfw_hk import create_request_one_hk_command
 
 from common import (
     EXAMPLE_PUS_APID,

satrs-example/pyclient/requirements.txt

@@ -1,2 +1,2 @@
-tmtccmd == 6.0.0
+tmtccmd == 7.0.0
 # -e git+https://github.com/robamu-org/tmtccmd@97e5e51101a08b21472b3ddecc2063359f7e307a#egg=tmtccmd