eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

added PL PCDU HK parsing #87

Merged
meierj merged 8 commits from mueller/plpcdu-hk-parsing into develop 2022-05-27 16:28:51 +02:00
Conversation 2 Commits 8 Files Changed 4 +89 -9
muellerr commented 2022-05-24 02:17:41 +02:00
Owner
Copy Link
No description provided.
muellerr added this to the 1.12.0 milestone 2022-05-24 02:17:41 +02:00
muellerr added 1 commit 2022-05-24 02:17:44 +02:00
added PL PCDU HK parsing 4d18ececa3
muellerr requested review from meierj 2022-05-24 02:17:56 +02:00
muellerr added 1 commit 2022-05-24 02:18:45 +02:00
update changelog 3d939c42b6
muellerr added 1 commit 2022-05-24 15:08:23 +02:00
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 1c0a8534f9
muellerr added 1 commit 2022-05-24 17:43:46 +02:00
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing f7e7f731d5
muellerr added 1 commit 2022-05-25 10:35:21 +02:00
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 7a92bde177
muellerr added 1 commit 2022-05-25 15:02:31 +02:00
Merge branch 'develop' into mueller/plpcdu-hk-parsing 708edeb458
muellerr added 1 commit 2022-05-25 16:26:13 +02:00
Merge branch 'develop' into mueller/plpcdu-hk-parsing 49bb59df7f
meierj reviewed 2022-05-27 10:13:56 +02:00
pus_tc/devs/plpcdu.py
@@ -122,6 +134,7 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info=Info.SWITCH_OFF
)
add_op_code_entry(
>>>>>>> origin/develop
meierj commented 2022-05-27 10:13:56 +02:00
Owner
Copy Link
  • here is a unfixed merge conflict
* here is a unfixed merge conflict
muellerr added 1 commit 2022-05-27 10:18:40 +02:00
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing da544ccb13
meierj approved these changes 2022-05-27 16:28:47 +02:00
meierj merged commit 5662c78f7a into develop 2022-05-27 16:28:51 +02:00
muellerr deleted branch mueller/plpcdu-hk-parsing 2022-05-27 19:35:02 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
meierj
Labels
Clear labels
api change
API change
 breaking api change
API change which can break existing code
 bug
Something is not working
 documentation
Documentation
 duplicate
This issue or pull request already exists
 feature
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone 1.12.0
Projects
Clear projects
No project
Assignees
Clear assignees
ahinkel dgoerner jenkins_buildfix lkoester meggert meierj mkoller mkranz mohr msenger muellerr rschweigert steinertm zinkj
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: eive/eive-tmtc#87
Delete Branch "mueller/plpcdu-hk-parsing"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?