update to new fsfw

This commit is contained in:
Robin Müller 2021-06-17 12:04:08 +02:00
parent 64935286e1
commit 39e0a0ca0f
No known key found for this signature in database
GPG Key ID: 9C287E88FED11DF3
4 changed files with 5 additions and 15 deletions

View File

@ -31,7 +31,7 @@
#include "fsfw/tcdistribution/CCSDSDistributor.h" #include "fsfw/tcdistribution/CCSDSDistributor.h"
#include "fsfw/tcdistribution/PUSDistributor.h" #include "fsfw/tcdistribution/PUSDistributor.h"
#include "fsfw/timemanager/TimeStamper.h" #include "fsfw/timemanager/TimeStamper.h"
#include "fsfw/tmtcpacket/pus/TmPacketStored.h" #include "fsfw/tmtcpacket/pus/tm.h"

View File

@ -4,7 +4,7 @@
#include <fsfw/serialize/SerializeAdapter.h> #include <fsfw/serialize/SerializeAdapter.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h> #include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h> #include <fsfw/tmtcpacket/pus/tm.h>
TestEchoComIF::TestEchoComIF(object_id_t objectId): TestEchoComIF::TestEchoComIF(object_id_t objectId):

View File

@ -1,5 +1,5 @@
#include <fsfw/tmtcpacket/pus/TcPacketBase.h> #include <fsfw/tmtcpacket/pus/tc.h>
#include <fsfw/tmtcpacket/pus/TmPacketBase.h> #include <fsfw/tmtcpacket/pus/tm.h>
#include <fsfw/globalfunctions/arrayprinter.h> #include <fsfw/globalfunctions/arrayprinter.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
#include <mission/utility/PusPacketCreator.h> #include <mission/utility/PusPacketCreator.h>
@ -7,13 +7,4 @@
void PusPacketCreator::createPusPacketAndPrint() { void PusPacketCreator::createPusPacketAndPrint() {
// TODO: use TC packet stored here instead.. // TODO: use TC packet stored here instead..
// uint8_t packetStore[TcPacketBase::TC_PACKET_MIN_SIZE];
// TcPacketBase packet(packetStore);
// packet.initSpacePacketHeader(true, true, 0x73, 25);
// packet.initializeTcPacket(0x73, 25, 0, 17, 1);
// packet.setPacketDataLength(sizeof(PUSTcDataFieldHeader)
// + TcPacketBase::CRC_SIZE-1);
// packet.setErrorControl();
// sif::info << "PUS packet created: " << std::endl;
// arrayprinter::print(packet.getWholeData(), packet.getFullSize());
} }

View File

@ -1,8 +1,7 @@
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h> #include <fsfw/tmtcpacket/pus/tm.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/tmtcpacket/pus/TmPacketPusC.h>
#include <mission/utility/TmFunnel.h> #include <mission/utility/TmFunnel.h>
object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT; object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT;