Merge branch 'mueller/master' into develop

2021-04-10 23:00:46 +02:00
parent 754edffeae 8703aeea55
commit e993d2d2ea
24 changed files with 38 additions and 39 deletions
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@ -4,7 +4,7 @@
            it to your needs.
 """
 from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
-from tmtccmd.pus_tm.base import PusTelemetry
+from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.utility.tmtcc_logger import get_logger

 from tmtccmd.pus_tm.service_1_verification import Service1TM