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

resolve other merge conflict

Browse Source
This commit is contained in:
Robin Müller 2022-05-28 12:51:07 +02:00
parent 5df26aac0b
commit acd53c1337
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pus_tc/tc_packer_hook.py
View File

@ -242,13 +242,8 @@ def pack_service_queue_user(
tc_queue=service_queue, object_id=RW_ASSEMBLY, op_code=op_code tc_queue=service_queue, object_id=RW_ASSEMBLY, op_code=op_code
) )
if service == CustomServiceList.CONTROLLERS.value: if service == CustomServiceList.CONTROLLERS.value:
<<<<<<< HEAD
return pack_controller_commands(tc_queue=service_queue, op_code=op_code) return pack_controller_commands(tc_queue=service_queue, op_code=op_code)
LOGGER.warning(f"Invalid Service {service}") LOGGER.warning(f"Invalid Service {service}")
=======
return pack_cmd_ctrl_to_prompted_mode(tc_queue=service_queue, op_code=op_code)
LOGGER.warning("Invalid Service !")
>>>>>>> origin/develop
def create_total_tc_queue_user() -> TcQueueT: def create_total_tc_queue_user() -> TcQueueT: