From c421f3f5d78d77d23e42d1ccae79d7c6fc308431 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Nov 2022 17:26:25 +0100 Subject: [PATCH] some bugfixes --- eive_tmtc/config/object_ids.py | 2 +- eive_tmtc/config/retvals.py | 2 +- eive_tmtc/pus_tc/system/proc.py | 3 ++- eive_tmtc/pus_tm/event_handler.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eive_tmtc/config/object_ids.py b/eive_tmtc/config/object_ids.py index 75a898e..c8e6478 100644 --- a/eive_tmtc/config/object_ids.py +++ b/eive_tmtc/config/object_ids.py @@ -10,7 +10,7 @@ from tmtccmd.logging import get_console_logger LOGGER = get_console_logger() -DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv" +DEFAULT_OBJECTS_CSV_PATH = "eive_tmtc/config/objects.csv" __OBJECT_ID_DICT = None diff --git a/eive_tmtc/config/retvals.py b/eive_tmtc/config/retvals.py index d6f7be9..18e1469 100644 --- a/eive_tmtc/config/retvals.py +++ b/eive_tmtc/config/retvals.py @@ -2,7 +2,7 @@ import os from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT from tmtccmd.logging import get_console_logger -DEFAULT_RETVAL_CSV_NAME = "config/returnvalues.csv" +DEFAULT_RETVAL_CSV_NAME = "eive_tmtc/config/returnvalues.csv" __RETVAL_DICT = None LOGGER = get_console_logger() diff --git a/eive_tmtc/pus_tc/system/proc.py b/eive_tmtc/pus_tc/system/proc.py index 924f47c..fc701a4 100644 --- a/eive_tmtc/pus_tc/system/proc.py +++ b/eive_tmtc/pus_tc/system/proc.py @@ -10,6 +10,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper +from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_11_tc_sched import ( generate_time_tagged_cmd, generate_enable_tc_sched_cmd, @@ -32,7 +33,7 @@ from eive_tmtc.pus_tc.devs.gps import SetIds as GpsSetIds from eive_tmtc.tmtc.acs.imtq import ImtqSetIds from eive_tmtc.pus_tc.devs.sus import SetIds from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds -from eive_tmtc.tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec +from eive_tmtc.tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec, rw_speed_down_cmd_consec from eive_tmtc.pus_tc.system.controllers import ( pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml, diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index cdcd42d..cdd6d40 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -14,7 +14,7 @@ from tmtccmd.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo LOGGER = get_console_logger() -DEFAULT_EVENTS_CSV_PATH = "config/events.csv" +DEFAULT_EVENTS_CSV_PATH = "eive_tmtc/config/events.csv" __EVENT_DICT = None