Merge branch 'mueller/tc-packet-pus-improvement' into mueller/cfdp-state-machine

Merge branch 'mueller/spi-com-if-shadowing' into mueller/cfdp-state-machine
Merge branch 'mueller/pus-11-printout-fixes' into mueller/cfdp-state-machine
2022-06-13 16:23:44 +02:00 · 2022-06-13 11:00:50 +02:00 · 2022-06-13 11:00:41 +02:00 · 2022-06-13 09:41:48 +02:00 · 2022-06-13 09:38:59 +02:00 · 2022-06-13 09:28:39 +02:00
2 changed files with 10 additions and 7 deletions
--- a/src/fsfw/FSFW.h.in
+++ b/src/fsfw/FSFW.h.in
@ -48,7 +48,11 @@

 #ifndef FSFW_USE_PUS_C_TELECOMMANDS
 #define FSFW_USE_PUS_C_TELECOMMANDS         1
-#endif
+#endif /* FSFW_USE_PUS_C_TELECOMMANDS */
+
+#ifndef FSFW_DEBUG_CFDP_DISTRIBUTOR
+#define FSFW_DEBUG_CFDP_DISTRIBUTOR         0
+#endif /* FSFW_DEBUG_CFDP_DISTRIBUTOR */

 #ifndef FSFW_TCP_RECV_WIRETAPPING_ENABLED
 #define FSFW_TCP_RECV_WIRETAPPING_ENABLED   0
--- a/src/fsfw/tcdistribution/CFDPDistributor.cpp
+++ b/src/fsfw/tcdistribution/CFDPDistributor.cpp
@ -1,12 +1,11 @@
+#include "fsfw/FSFW.h"
+#include "fsfw/tcdistribution/CCSDSDistributorIF.h"
 #include "fsfw/tcdistribution/CFDPDistributor.h"

 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/tcdistribution/CCSDSDistributorIF.h"
 #include "fsfw/tmtcpacket/cfdp/CFDPPacketStored.h"
-
-#ifndef FSFW_CFDP_DISTRIBUTOR_DEBUGGING
-#define FSFW_CFDP_DISTRIBUTOR_DEBUGGING 1
-#endif
+#include "fsfw/objectmanager/ObjectManager.h"

 CFDPDistributor::CFDPDistributor(uint16_t setApid, object_id_t setObjectId,
                                 object_id_t setPacketSource)
@ -19,8 +18,8 @@ CFDPDistributor::CFDPDistributor(uint16_t setApid, object_id_t setObjectId,
 CFDPDistributor::~CFDPDistributor() {}

 CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
-#if FSFW_CFDP_DISTRIBUTOR_DEBUGGING == 1
-  store_address_t storeId = this->currentMessage.getStorageId();
+#if FSFW_DEBUG_CFDP_DISTRIBUTOR == 1
+    store_address_t storeId = this->currentMessage.getStorageId();
 #if FSFW_CPP_OSTREAM_ENABLED == 1
  sif::debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", "
             << storeId.packetIndex << std::endl;
Author	SHA1	Message	Date
Robin Müller	1d4fd70101	Merge branch 'mueller/tc-packet-pus-improvement' into mueller/cfdp-state-machine	2022-06-13 16:23:44 +02:00
Robin Müller	f512d98c08	Merge branch 'mueller/spi-com-if-shadowing' into mueller/cfdp-state-machine	2022-06-13 11:00:50 +02:00
Robin Müller	29c4fc33da	Merge branch 'mueller/pus-11-printout-fixes' into mueller/cfdp-state-machine	2022-06-13 11:00:41 +02:00
Robin Müller	e760f5ab75	Merge branch 'mueller/tc-packet-pus-improvement' into mueller/cfdp-state-machine	2022-06-13 09:41:48 +02:00
Robin Müller	b069ed0fec	Merge remote-tracking branch 'upstream/development' into mueller/cfdp-state-machine	2022-06-13 09:38:59 +02:00
Robin Müller	72c7bd5e03	Merge remote-tracking branch 'upstream/development' into mueller/cfdp-state-machine	2022-06-13 09:28:39 +02:00
Robin Müller	aa6ffac182	CFDP state machine	2021-12-12 20:30:00 +01:00
Robin Müller	f7cb0bbf31	Merge branch 'mueller/cfdp-pdus' into source/develop	2021-12-12 20:18:14 +01:00