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

Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm
Some checks are pending
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev Build queued...
Details

Browse Source
This commit is contained in:
Robin Müller 2023-06-09 14:44:44 +02:00
commit b2535662e6
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -60,6 +60,8 @@ will consitute of a breaking change warranting a new major release:
- The PUS Service 8 now has larger queue sizes to handle more action replies. The PUS Service 1 - The PUS Service 8 now has larger queue sizes to handle more action replies. The PUS Service 1
also has a larger queue size to handle a lot of step replies now. also has a larger queue size to handle a lot of step replies now.
- Moved PDU `vcc` and `vbat` variable from auxiliary dataset to core dataset. - Moved PDU `vcc` and `vbat` variable from auxiliary dataset to core dataset.
- Tweak TCP/IP configuration: Only the TCP server will be included on the EM. For the FM, no
TCP/IP servers will be included by default.
## Added ## Added

7
CMakeLists.txt
View File

@ -79,6 +79,13 @@ else()
set(INIT_VAL 1) set(INIT_VAL 1)
set(OBSW_STAR_TRACKER_GROUND_CONFIG 0) set(OBSW_STAR_TRACKER_GROUND_CONFIG 0)
endif() endif()
set(OBSW_ADD_TMTC_TCP_SERVER
${OBSW_Q7S_EM}
CACHE STRING "Add TCP TMTC Server")
set(OBSW_ADD_TMTC_UDP_SERVER
0
CACHE STRING "Add UDP TMTC Server")
set(OBSW_ADD_MGT set(OBSW_ADD_MGT
${INIT_VAL} ${INIT_VAL}
CACHE STRING "Add MGT module") CACHE STRING "Add MGT module")

4
bsp_q7s/OBSWConfig.h.in
View File

@ -67,8 +67,8 @@
// because UDP packets are not allowed in the VPN // because UDP packets are not allowed in the VPN
// This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the // This will cause the OBSW to initialize the TMTC bridge responsible for exchanging data with the
// CCSDS IP Cores. // CCSDS IP Cores.
#define OBSW_ADD_TMTC_TCP_SERVER 1 #define OBSW_ADD_TMTC_TCP_SERVER @OBSW_ADD_TMTC_TCP_SERVER@
#define OBSW_ADD_TMTC_UDP_SERVER 1 #define OBSW_ADD_TMTC_UDP_SERVER @OBSW_ADD_TMTC_UDP_SERVER@
// Can be used to switch device to NORMAL mode immediately // Can be used to switch device to NORMAL mode immediately
#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP 0 #define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP 0

11
mission/genericFactory.cpp
View File

@ -49,6 +49,7 @@
#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"
@ -58,15 +59,13 @@ 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 "devices/gpioIds.h" #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>
#include "mission/tmtc/Service15TmStorage.h"
#endif #endif
#endif #endif