eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

Merge branch 'mueller/update-dependencies' into mueller/rw-cmds

Browse Source
This commit is contained in:
Robin Müller
2022-05-05 16:18:19 +02:00
parent 418b51b413 985c032ebb
commit bce981e1f3
27 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pus_tm/hk_handling.py
View File

@ -5,7 +5,7 @@ import datetime
from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
from tmtccmd.config.definitions import HkReplyUnpacked
from tmtccmd.tm.service_3_fsfw_housekeeping import (
from tmtccmd.tm.pus_3_fsfw_hk import (
Service3Base,
HkContentType,
Service3FsfwTm,
@ -15,7 +15,7 @@ from pus_tc.devs.bpx_batt import BpxSetIds
from pus_tc.devs.syrlinks_hk_handler import SetIds
from pus_tc.devs.p60dock import SetIds
from pus_tc.devs.imtq import ImtqSetIds
from tmtccmd.pus.obj_id import ObjectId, ObjectIdDictT
from tmtccmd.utility.obj_id import ObjectId, ObjectIdDictT
import config.object_ids as obj_ids
from .devs.reaction_wheel import handle_rw_hk_data