fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

ASTP 1.1.0 Merge Development in Master #441

Merged
gaisser merged 265 commits from development into master 2021-06-29 14:11:46 +02:00
Conversation 0 Commits 265 Files Changed 203 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0bc124fd21 - Show all commits

4
unittest/user/testcfg/objects/systemObjectList.h
View File

@ -15,8 +15,8 @@ namespace objects {
PUS_DISTRIBUTOR = 11,
TM_FUNNEL = 12,
UDP_BRIDGE = 15,
UDP_POLLING_TASK = 16,
TCPIP_BRIDGE = 15,
TCPIP_HELPER = 16,
TEST_ECHO_COM_IF = 20,
TEST_DEVICE = 21,