move power module

pus_tc/devs/__init__.py

@@ -1 +1 @@
-from . import power
+

pus_tc/procedure_packer.py

@@ -2,7 +2,7 @@
 """
 from typing import cast
 
-from pus_tc.devs.power import pack_power_commands
+from tmtc.power.power import pack_power_commands
 from pus_tc.devs.rtd import pack_rtd_commands
 from pus_tc.devs.scex import pack_scex_cmds
 from pus_tc.system.controllers import (
@@ -23,14 +23,13 @@ from tmtccmd.tc.pus_5_event import (
 from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
 
 from pus_tc.service_200_mode import pack_service_200_test_into
-from pus_tc.devs.p60dock import pack_p60dock_cmds
+from tmtc.power.p60dock import pack_p60dock_cmds
-from pus_tc.devs.pdu2 import pack_pdu2_commands
+from tmtc.power.pdu2 import pack_pdu2_commands
-from pus_tc.devs.pdu1 import pack_pdu1_commands
+from tmtc.power.pdu1 import pack_pdu1_commands
-from pus_tc.devs.acu import pack_acu_commands
+from tmtc.power.acu import pack_acu_commands
 from pus_tc.devs.solar_array_deployment import pack_solar_array_deployment_test_into
 from pus_tc.devs.imtq import pack_imtq_test_into
 from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from tmtc.ploc_mpsoc import pack_ploc_mpsoc_commands
 from pus_tc.devs.heater import pack_heater_cmds
 from pus_tc.devs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds
 from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
@@ -55,7 +54,6 @@ from config.object_ids import (
     TMP_1075_2_HANDLER_ID,
     HEATER_ID,
     IMTQ_HANDLER_ID,
-    PLOC_MPSOC_ID,
     RW1_ID,
     RW2_ID,
     RW3_ID,

pus_tc/system/core.py

@@ -250,6 +250,6 @@ def perform_reboot_cmd(
         make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.XSC_REBOOT,
-            user_data=tc_data
+            user_data=tc_data,
         )
     )

pus_tm/action_reply_handler.py

@@ -1,6 +1,6 @@
 import struct
 from config.object_ids import *
-from pus_tc.devs.common_power import handle_get_param_data_reply
+from tmtc.power.common_power import handle_get_param_data_reply
 from pus_tc.devs.imtq import ImtqActionIds
 from pus_tm.defs import PrintWrapper
 from tmtc.ploc_mpsoc import PlocReplyIds

pus_tm/hk_handling.py

@@ -23,7 +23,7 @@ from pus_tm.devs.imtq_mgt import (
     handle_calibrated_mtm_measurement,
     handle_raw_mtm_measurement,
 )
-from pus_tm.system.power import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
+from tmtc.power.tm import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
 from pus_tm.devs.syrlinks import handle_syrlinks_hk_data
 from pus_tc.devs.imtq import ImtqSetIds
 from pus_tm.devs.reaction_wheels import handle_rw_hk_data

tmtc/power/acu.py

@@ -3,7 +3,6 @@
 @author J. Meier, R. Mueller
 @date   21.12.2020
 """
-import struct
 
 from config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
@@ -19,7 +18,7 @@ import gomspace.gomspace_common as gs
 from gomspace.gomspace_common import GomspaceOpCodes
 from gomspace.gomspace_common import GsInfo as GsInfo
 from config.object_ids import ACU_HANDLER_ID
-from pus_tc.devs.p60dock import P60DockConfigTable
+from tmtc.power.p60dock import P60DockConfigTable
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 

tmtc/power/pdu1.py

@@ -4,17 +4,10 @@
 @date   17.12.2020
 """
 import gomspace.gomspace_common as gs
-from pus_tc.devs.common_power import pdu1_cmds, pdu1_req_hk_cmds
+from tmtc.power.common_power import pdu1_cmds, pdu1_req_hk_cmds
 
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    generate_one_hk_command,
-    make_sid,
-    generate_one_diag_command,
-)
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
-from config.object_ids import PDU_1_HANDLER_ID
 
 
 class PDU1TestProcedure:

tmtc/power/pdu2.py

@@ -6,7 +6,7 @@
 @author J. Meier
 @date   17.12.2020
 """
-from pus_tc.devs.common_power import pdu2_cmds, pdu2_req_hk_cmds
+from tmtc.power.common_power import pdu2_cmds, pdu2_req_hk_cmds
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 

tmtc/power/power.py

@@ -1,5 +1,5 @@
 from gomspace.gomspace_common import GsInfo
-from pus_tc.devs.common_power import (
+from tmtc.power.common_power import (
     PowerOpCodes,
     add_pdu1_common_defs,
     add_pdu2_common_defs,
@@ -13,8 +13,8 @@ from config.definitions import CustomServiceList
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
-from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes, P60Info
+from tmtc.power.p60dock import P60OpCodes, GomspaceOpCodes, P60Info
-from pus_tc.devs.acu import add_acu_cmds
+from tmtc.power.acu import add_acu_cmds
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper