tcpip components refactoring

bsp_q7s/core/InitMission.cpp

@@ -82,19 +82,21 @@ void initmission::initTasks() {
         initmission::printAddObjectError("TM_FUNNEL", objects::TM_FUNNEL);
     }
 
-    /* UDP bridge */
+#if OBSW_ADD_TCPIP_BRIDGE == 1
+    // TMTC bridge
     PeriodicTaskIF* tmtcBridgeTask = factory->createPeriodicTask(
-            "UDP_UNIX_BRIDGE", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+            "TCPIP_TMTC_BRIDGE", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
     result = tmtcBridgeTask->addComponent(objects::TMTC_BRIDGE);
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("UDP_BRIDGE", objects::TMTC_BRIDGE);
     }
     PeriodicTaskIF* tmtcPollingTask = factory->createPeriodicTask(
-            "UDP_POLLING", 80, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
+            "TMTC_POLLING", 80, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
     result = tmtcPollingTask->addComponent(objects::TMTC_POLLING_TASK);
     if(result != HasReturnvaluesIF::RETURN_OK) {
         initmission::printAddObjectError("UDP_POLLING", objects::TMTC_POLLING_TASK);
     }
+#endif
 
 # if BOARD_TE0720 == 0
     // FS task, task interval does not matter because it runs in permanent loop, priority low
@@ -139,8 +141,12 @@ void initmission::initTasks() {
 
     sif::info << "Starting tasks.." << std::endl;
     tmTcDistributor->startTask();
+
+#if OBSW_ADD_TCPIP_BRIDGE == 1
     tmtcBridgeTask->startTask();
     tmtcPollingTask->startTask();
+#endif
+
 #if BOARD_TE0720 == 0
     coreController->startTask();
 #endif

bsp_q7s/core/ObjectFactory.cpp

@@ -69,16 +69,6 @@
 #include "fsfw/tmtcservices/PusServiceBase.h"
 #include "fsfw/tmtcpacket/pus/tm.h"
 
-#if OBSW_USE_TMTC_TCP_BRIDGE == 0
-// UDP server includes
-#include "fsfw/osal/common/UdpTmTcBridge.h"
-#include "fsfw/osal/common/UdpTcPollingTask.h"
-#else
-// TCP server includes
-#include "fsfw/osal/common/TcpTmTcBridge.h"
-#include "fsfw/osal/common/TcpTmTcServer.h"
-#endif
-
 #include "linux/boardtest/SpiTestClass.h"
 
 #if OBSW_TEST_LIBGPIOD == 1
@@ -114,6 +104,7 @@ void Factory::setStaticFrameworkObjectIds() {
 void ObjectFactory::produce(void* args) {
     ObjectFactory::setStatics();
     ObjectFactory::produceGenericObjects();
+
     LinuxLibgpioIF* gpioComIF = nullptr;
     UartComIF* uartComIF = nullptr;
     SpiComIF* spiComIF = nullptr;
@@ -173,19 +164,6 @@ void ObjectFactory::produce(void* args) {
 
 #endif /* TE7020 != 0 */
 
-#if OBSW_USE_TMTC_TCP_BRIDGE == 0
-    auto udpBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
-    new UdpTcPollingTask(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
-    sif::info << "Created UDP server for TMTC commanding with listener port " <<
-    udpBridge->getUdpPort() << std::endl;
-#else
-    auto tmtcBridge = new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
-    tmtcBridge->setMaxNumberOfPacketsStored(50);
-    auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
-    sif::info << "Created TCP server for TMTC commanding with listener port "
-            << tcpServer->getTcpPort() << std::endl;
-#endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */
-
     /* Test Task */
 #if OBSW_ADD_TEST_CODE == 1
     createTestComponents(gpioComIF);

common/config/CMakeLists.txt

@@ -1,3 +1,7 @@
 target_include_directories(${TARGET_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_sources(${TARGET_NAME} PRIVATE
+    commonConfig.cpp
 )

common/config/commonConfig.cpp

@@ -0,0 +1,5 @@
+#include "commonConfig.h"
+#include "tmtc/apid.h"
+#include "fsfw/tmtcpacket/SpacePacket.h"
+
+const uint16_t common::TC_PACKET_ID = SpacePacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

common/config/commonConfig.h.in

@@ -1,10 +1,18 @@
 #ifndef COMMON_CONFIG_COMMONCONFIG_H_
 #define COMMON_CONFIG_COMMONCONFIG_H_
 
+#include <cstdint>
+
 #define OBSW_ADD_LWGPS_TEST             0
 
+// Disable this for mission code. It allows exchanging TMTC packets via the Ethernet port
+#define OBSW_ADD_TCPIP_BRIDGE           1
 // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
 // because UDP packets are not allowed in the VPN
-#define OBSW_USE_TMTC_TCP_BRIDGE        1
+#define OBSW_USE_TCP_BRIDGE             1
+
+namespace common {
+extern const uint16_t TC_PACKET_ID;
+}
 
 #endif /* COMMON_CONFIG_COMMONCONFIG_H_ */

fsfw

@@ -1 +1 @@
-Subproject commit 5fd7a8c9b76bae2d7d019e0175b481083e7ba460
+Subproject commit c7ce568a302538ef98e308add1bcae632563c48e

mission/core/GenericFactory.cpp

@@ -23,12 +23,24 @@
 #include <fsfw/timemanager/TimeStamper.h>
 #include <mission/utility/TmFunnel.h>
 
+#if OBSW_ADD_TCPIP_BRIDGE == 1
+#if OBSW_USE_TCP_BRIDGE == 0
+// UDP server includes
+#include "fsfw/osal/common/UdpTmTcBridge.h"
+#include "fsfw/osal/common/UdpTcPollingTask.h"
+#else
+// TCP server includes
+#include "fsfw/osal/common/TcpTmTcBridge.h"
+#include "fsfw/osal/common/TcpTmTcServer.h"
+#endif
+#endif
+
 #if OBSW_ADD_TEST_CODE == 1
-	#include <test/testtasks/TestTask.h>
+#include <test/testtasks/TestTask.h>
 #endif
 
 void ObjectFactory::produceGenericObjects() {
-    /* Framework objects */
+    // Framework objects
     new EventManager(objects::EVENT_MANAGER);
     new HealthTable(objects::HEALTH_TABLE);
     new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
@@ -61,10 +73,10 @@ void ObjectFactory::produceGenericObjects() {
             objects::CCSDS_PACKET_DISTRIBUTOR);
 
 
-    /* TMTC Reception via UDP socket */
+    // Every TM packet goes through this funnel
     new TmFunnel(objects::TM_FUNNEL);
 
-    /* PUS stack */
+    // PUS service stack
     new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION,
             apid::EIVE_OBSW, pus::PUS_SERVICE_1, objects::TM_FUNNEL, 20);
     new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS,
@@ -83,4 +95,23 @@ void ObjectFactory::produceGenericObjects() {
             pus::PUS_SERVICE_20);
     new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT,
             apid::EIVE_OBSW, pus::PUS_SERVICE_200);
+
+
+#if OBSW_ADD_TCPIP_BRIDGE == 1
+#if OBSW_USE_TCP_BRIDGE == 0
+    auto tmtcBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
+    tmtcBridge->setMaxNumberOfPacketsStored(50);
+    new UdpTcPollingTask(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
+    sif::info << "Created UDP server for TMTC commanding with listener port " <<
+            udpBridge->getUdpPort() << std::endl;
+#else
+    auto tmtcBridge = new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
+    tmtcBridge->setMaxNumberOfPacketsStored(50);
+    auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
+    // TCP is stream based. Use packet ID as start marker when parsing for space packets
+    tcpServer->setSpacePacketParsingOptions({common::TC_PACKET_ID});
+    sif::info << "Created TCP server for TMTC commanding with listener port "
+            << tcpServer->getTcpPort() << std::endl;
+#endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */
+#endif /* OBSW_ADD_TCPIP_BRIDGE == 1 */
 }