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

eive_tmtc/tmtc/solar_array_deployment.py

@@ -7,22 +7,22 @@
 """
 import struct
 
-from config.definitions import CustomServiceList
-from config.object_ids import SOLAR_ARRAY_DEPLOYMENT_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import SOLAR_ARRAY_DEPLOYMENT_ID
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
     TmtcDefinitionWrapper,
     OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
-from tmtccmd.tc.pus_8_fsfw_funccmd import create_fsfw_action_cmd
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd import get_console_logger
 
 LOGGER = get_console_logger()
 
 
-class OpCodes:
+class OpCode:
     MANUAL_DEPLOYMENT = "man_depl"
 
 
@@ -30,14 +30,14 @@ class Info:
     MANUAL_DEPLOYMENT = "Manual Solar Array Deployment"
 
 
-class ActionIds:
+class ActionId:
     MANUAL_DEPLOYMENT = 5
 
 
 @tmtc_definitions_provider
 def pack_sa_depl_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(keys=OpCodes.MANUAL_DEPLOYMENT, info=Info.MANUAL_DEPLOYMENT)
+    oce.add(keys=OpCode.MANUAL_DEPLOYMENT, info=Info.MANUAL_DEPLOYMENT)
     defs.add_service(
         name=CustomServiceList.SA_DEPLYOMENT,
         info="Solar Array Deployment",
@@ -72,7 +72,7 @@ def pack_solar_array_deployment_test_into(p: ServiceProviderParams):
     else:
         dry_run_str = ""
     q.add_log_cmd(f"Testing S/A Deployment with burn time {burn_time}{dry_run_str}")
-    command = create_fsfw_action_cmd(
-        SOLAR_ARRAY_DEPLOYMENT_ID, ActionIds.MANUAL_DEPLOYMENT, user_data
+    command = create_action_cmd(
+        SOLAR_ARRAY_DEPLOYMENT_ID, ActionId.MANUAL_DEPLOYMENT, user_data
     )
     q.add_pus_tc(command)