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
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 3ff5484415 - Show all commits

View File

@ -3,7 +3,7 @@
#include "../serviceinterface/ServiceInterface.h"
#include "../tmtcpacket/SpacePacketBase.h"
#define CCSDS_DISTRIBUTOR_DEBUGGING 1
#define CCSDS_DISTRIBUTOR_DEBUGGING 0
CCSDSDistributor::CCSDSDistributor(uint16_t setDefaultApid,
object_id_t setObjectId):

View File

@ -5,7 +5,7 @@
#include "../tmtcpacket/pus/TcPacketStored.h"
#include "../tmtcservices/PusVerificationReport.h"
#define PUS_DISTRIBUTOR_DEBUGGING 1
#define PUS_DISTRIBUTOR_DEBUGGING 0
PUSDistributor::PUSDistributor(uint16_t setApid, object_id_t setObjectId,
object_id_t setPacketSource) :