diff --git a/satrs-example/pyclient/main.py b/satrs-example/pyclient/main.py index 4f3c6c4..53a15f6 100755 --- a/satrs-example/pyclient/main.py +++ b/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, diff --git a/satrs-example/pyclient/pus_tc.py b/satrs-example/pyclient/pus_tc.py index 4373cb4..9996e5b 100644 --- a/satrs-example/pyclient/pus_tc.py +++ b/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, diff --git a/satrs-example/pyclient/requirements.txt b/satrs-example/pyclient/requirements.txt index 4f61463..485c76a 100644 --- a/satrs-example/pyclient/requirements.txt +++ b/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