eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Robin Müller 2022-08-25 08:59:02 +02:00
parent f22aba3e65
commit 3321123581
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gomspace/gomspace_common.py
View File

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