Merge remote-tracking branch 'origin/main' into mueller/power-cmds-update

gomspace/gomspace_common.py

@@ -138,6 +138,7 @@ def pack_set_param_command(
         app_data.append(byte_three)
         app_data.append(byte_four)
     return make_fsfw_action_cmd(
+<<<<<<< HEAD
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -162,6 +163,9 @@ def prompt_and_pack_set_param_command(q: DefaultPusQueueHelper, object_id: Objec
         pack_set_param_command(
             object_id.as_bytes, memory_address, parameter_size, parameter
         )
+=======
+        object_id=object_id, action_id=action_id, user_data=app_data, ssc=ssc
+>>>>>>> origin/main
     )