eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

bump tmtccmd

Browse Source
This commit is contained in:
Robin Müller 2023-01-17 18:37:16 +01:00
parent ff72c02508
commit 44f15eced7
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eive_tmtc/pus_tc/devs/bpx_batt.py
View File

@ -12,7 +12,7 @@ from tmtccmd.tc.decorator import ServiceProviderParams
from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
class BpxSetId: class BpxSetId:

4
eive_tmtc/pus_tc/devs/heater.py
View File

@ -14,7 +14,7 @@ from tmtccmd.util.obj_id import ObjectIdU32
from tmtccmd.tc.pus_201_fsfw_health import ( from tmtccmd.tc.pus_201_fsfw_health import (
pack_set_health_cmd_data, pack_set_health_cmd_data,
FsfwHealth, FsfwHealth,
Subservices, Subservice,
) )
from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
from spacepackets.ecss.tc import PusTelecommand from spacepackets.ecss.tc import PusTelecommand
@ -183,7 +183,7 @@ def health_cmd(
app_data = pack_set_health_cmd_data(object_id=object_id.as_bytes, health=health) app_data = pack_set_health_cmd_data(object_id=object_id.as_bytes, health=health)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=201, subservice=Subservices.TC_SET_HEALTH, app_data=app_data service=201, subservice=Subservice.TC_SET_HEALTH, app_data=app_data
) )
) )

18
eive_tmtc/pus_tc/devs/plpcdu.py
View File

@ -18,7 +18,7 @@ from tmtccmd.tc.pus_11_tc_sched import (
generate_enable_tc_sched_cmd, generate_enable_tc_sched_cmd,
generate_time_tagged_cmd, generate_time_tagged_cmd,
) )
from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservices from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
from tmtccmd.tc.pus_20_params import ( from tmtccmd.tc.pus_20_params import (
pack_scalar_double_param_app_data, pack_scalar_double_param_app_data,
pack_fsfw_load_param_cmd, pack_fsfw_load_param_cmd,
@ -251,12 +251,12 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
pl_pcdu_on = PusTelecommand( pl_pcdu_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Mode.ON, submode=0), app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Mode.ON, submode=0),
) )
ssr_on = PusTelecommand( ssr_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -267,7 +267,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
dro_on = PusTelecommand( dro_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -276,7 +276,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
x8_on = PusTelecommand( x8_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -285,7 +285,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
tx_on = PusTelecommand( tx_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -294,7 +294,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
mpa_on = PusTelecommand( mpa_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -303,7 +303,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
) )
hpa_on = PusTelecommand( hpa_on = PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data( app_data=pack_mode_data(
object_id=PL_PCDU_ID, object_id=PL_PCDU_ID,
mode=Mode.NORMAL, mode=Mode.NORMAL,
@ -445,6 +445,6 @@ def pack_pl_pcdu_mode_cmd(
mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode) mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=mode_data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=mode_data
) )
) )

8
eive_tmtc/pus_tc/devs/rtd.py
View File

@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.tc import DefaultPusQueueHelper
from tmtccmd.util import ObjectIdU32 from tmtccmd.util import ObjectIdU32
from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservices from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
import eive_tmtc.config.object_ids as oids import eive_tmtc.config.object_ids as oids
from eive_tmtc.config.object_ids import get_object_ids from eive_tmtc.config.object_ids import get_object_ids
@ -71,7 +71,7 @@ def pack_rtd_commands(
app_data = pack_mode_data(object_id=object_id.as_bytes, mode=Mode.ON, submode=0) app_data = pack_mode_data(object_id=object_id.as_bytes, mode=Mode.ON, submode=0)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
) )
) )
if op_code in OpCode.NORMAL: if op_code in OpCode.NORMAL:
@ -80,7 +80,7 @@ def pack_rtd_commands(
) )
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
) )
) )
if op_code in OpCode.OFF: if op_code in OpCode.OFF:
@ -89,7 +89,7 @@ def pack_rtd_commands(
) )
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
) )
) )
if op_code in OpCode.CONFIG_CMD: if op_code in OpCode.CONFIG_CMD:

6
eive_tmtc/pus_tc/devs/scex.py
View File

@ -5,7 +5,7 @@ from spacepackets.ecss import PusTelecommand
from eive_tmtc.config.definitions import CustomServiceList from eive_tmtc.config.definitions import CustomServiceList
from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.config.tmtc import tmtc_definitions_provider
from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservices from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
from tmtccmd.tc import service_provider from tmtccmd.tc import service_provider
from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.decorator import ServiceProviderParams
from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
@ -83,7 +83,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0), app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
) )
) )
@ -92,7 +92,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, service=200,
subservice=Subservices.TC_MODE_COMMAND, subservice=Subservice.TC_MODE_COMMAND,
app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0), app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0),
) )
) )

2
eive_tmtc/tmtc/acs/acs_subsystem.py
View File

@ -10,7 +10,7 @@ from tmtccmd.config.tmtc import (
TmtcDefinitionWrapper, TmtcDefinitionWrapper,
OpCodeEntry, OpCodeEntry,
) )
from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
from tmtccmd.tc import service_provider from tmtccmd.tc import service_provider
from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.decorator import ServiceProviderParams

8
eive_tmtc/tmtc/acs/reaction_wheels.py
View File

@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
disable_periodic_hk_command, disable_periodic_hk_command,
) )
from spacepackets.ecss.tc import PusTelecommand from spacepackets.ecss.tc import PusTelecommand
from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservices from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
from eive_tmtc.config.definitions import CustomServiceList from eive_tmtc.config.definitions import CustomServiceList
from tmtccmd.util import ObjectIdU32 from tmtccmd.util import ObjectIdU32
from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
@ -197,21 +197,21 @@ def pack_rw_ass_cmds(q: DefaultPusQueueHelper, object_id: bytes, op_code: str):
data = pack_mode_data(object_id=object_id, mode=Mode.OFF, submode=0) data = pack_mode_data(object_id=object_id, mode=Mode.OFF, submode=0)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
) )
) )
if op_code in OpCodesAss.ON: if op_code in OpCodesAss.ON:
data = pack_mode_data(object_id=object_id, mode=Mode.ON, submode=0) data = pack_mode_data(object_id=object_id, mode=Mode.ON, submode=0)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
) )
) )
if op_code in OpCodesAss.NML: if op_code in OpCodesAss.NML:
data = pack_mode_data(object_id=object_id, mode=Mode.NORMAL, submode=0) data = pack_mode_data(object_id=object_id, mode=Mode.NORMAL, submode=0)
q.add_pus_tc( q.add_pus_tc(
PusTelecommand( PusTelecommand(
service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
) )
) )
if op_code in OpCodesAss.ALL_SPEED_UP: if op_code in OpCodesAss.ALL_SPEED_UP:

2
setup.cfg
View File

@ -28,7 +28,7 @@ classifiers =
[options] [options]
install_requires = install_requires =
# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a1 # tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a1
tmtccmd @ git+https://github.com/robamu-org/tmtccmd@85074210c083a8#egg=tmtccmd tmtccmd @ git+https://github.com/robamu-org/tmtccmd@d776b1cf603#egg=tmtccmd
packages = find: packages = find:
python_requires = >=3.10 python_requires = >=3.10
include_package_data = True include_package_data = True