eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

chonky #670

Merged
muellerr merged 278 commits from v3.0.0-dev into main 2023-06-11 14:25:21 +02:00
Conversation 0 Commits 278 Files Changed 71 +5 -6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e13fee75d0 - Show all commits

11
mission/genericFactory.cpp
View File

@ -39,7 +39,6 @@
#include <mission/tmtc/PusTmFunnel.h> #include <mission/tmtc/PusTmFunnel.h>
#include <mission/tmtc/PusTmRouteByFilterHelper.h> #include <mission/tmtc/PusTmRouteByFilterHelper.h>
#include <mission/tmtc/TmFunnelHandler.h> #include <mission/tmtc/TmFunnelHandler.h>
#include "mission/tmtc/Service15TmStorage.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "devices/gpioIds.h" #include "devices/gpioIds.h"
@ -50,23 +49,23 @@
#include "mission/system/acs/acsModeTree.h" #include "mission/system/acs/acsModeTree.h"
#include "mission/system/tcs/tcsModeTree.h" #include "mission/system/tcs/tcsModeTree.h"
#include "mission/tcs/defs.h" #include "mission/tcs/defs.h"
#include "mission/tmtc/Service15TmStorage.h"
#include "mission/tmtc/tmFilters.h" #include "mission/tmtc/tmFilters.h"
#include "objects/systemObjectList.h" #include "objects/systemObjectList.h"
#include "tmtc/pusIds.h" #include "tmtc/pusIds.h"
#include "devices/gpioIds.h"
using persTmStore::PersistentTmStores; using persTmStore::PersistentTmStores;
#if OBSW_ADD_TCPIP_SERVERS == 1 #if OBSW_ADD_TCPIP_SERVERS == 1
#if OBSW_ADD_TMTC_UDP_SERVER == 1 #if OBSW_ADD_TMTC_UDP_SERVER == 1
// UDP server includes // UDP server includes
#include "fsfw/osal/common/UdpTcPollingTask.h" #include <fsfw/osal/common/UdpTcPollingTask.h>
#include "fsfw/osal/common/UdpTmTcBridge.h" #include <fsfw/osal/common/UdpTmTcBridge.h>
#endif #endif
#if OBSW_ADD_TMTC_TCP_SERVER == 1 #if OBSW_ADD_TMTC_TCP_SERVER == 1
// TCP server includes // TCP server includes
#include "fsfw/osal/common/TcpTmTcBridge.h" #include <fsfw/osal/common/TcpTmTcBridge.h>
#include "fsfw/osal/common/TcpTmTcServer.h" #include <fsfw/osal/common/TcpTmTcServer.h>
#endif #endif
#endif #endif