Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master

2022-04-05 00:55:17 +02:00
parent c94e3bd085 2b7a75e32b
commit e67eb6633e
7 changed files with 22 additions and 35 deletions
--- a/config/object_ids.py
+++ b/config/object_ids.py
@ -5,9 +5,10 @@
 """
 import os.path
 from tmtccmd.pus.obj_id import ObjectIdDictT
-from tmtccmd.utility.fsfw import parse_fsfw_objects_csv
+from tmtccmd.fsfw import parse_fsfw_objects_csv
 from tmtccmd.logging import get_console_logger

+
 LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv"
 __OBJECT_ID_DICT = None