taken over datalinklayer form upstream

This commit is contained in:
Robin Müller 2020-08-28 17:40:53 +02:00
parent 5ce954672b
commit d2ef2b2be4
22 changed files with 1629 additions and 1629 deletions

View File

@ -8,7 +8,7 @@
#ifndef BCFRAME_H_ #ifndef BCFRAME_H_
#define BCFRAME_H_ #define BCFRAME_H_
#include "../datalinklayer/CCSDSReturnValuesIF.h" #include "CCSDSReturnValuesIF.h"
/** /**
* Small helper class to identify a BcFrame. * Small helper class to identify a BcFrame.

View File

@ -7,7 +7,7 @@
#include "../datalinklayer/Clcw.h" #include "Clcw.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
Clcw::Clcw() { Clcw::Clcw() {

View File

@ -8,7 +8,7 @@
#ifndef CLCW_H_ #ifndef CLCW_H_
#define CLCW_H_ #define CLCW_H_
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
/** /**
* Small helper method to handle the Clcw values. * Small helper method to handle the Clcw values.
* It has a content struct that manages the register and can be set externally. * It has a content struct that manages the register and can be set externally.

View File

@ -1,4 +1,4 @@
#include "../datalinklayer/DataLinkLayer.h" #include "DataLinkLayer.h"
#include "../globalfunctions/CRC.h" #include "../globalfunctions/CRC.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"

View File

@ -1,10 +1,10 @@
#ifndef DATALINKLAYER_H_ #ifndef DATALINKLAYER_H_
#define DATALINKLAYER_H_ #define DATALINKLAYER_H_
#include "../datalinklayer/CCSDSReturnValuesIF.h" #include "CCSDSReturnValuesIF.h"
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../datalinklayer/VirtualChannelReceptionIF.h" #include "VirtualChannelReceptionIF.h"
#include "../events/Event.h" #include "../events/Event.h"
#include <map> #include <map>

View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEIF_H_ #ifndef FARM1STATEIF_H_
#define FARM1STATEIF_H_ #define FARM1STATEIF_H_
#include "../datalinklayer/CCSDSReturnValuesIF.h" #include "CCSDSReturnValuesIF.h"
class VirtualChannelReception; class VirtualChannelReception;
class TcTransferFrame; class TcTransferFrame;
class ClcwIF; class ClcwIF;

View File

@ -7,10 +7,10 @@
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
#include "../datalinklayer/Farm1StateLockout.h" #include "Farm1StateLockout.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../datalinklayer/VirtualChannelReception.h" #include "VirtualChannelReception.h"
Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

View File

@ -8,7 +8,7 @@
#ifndef FARM1STATELOCKOUT_H_ #ifndef FARM1STATELOCKOUT_H_
#define FARM1STATELOCKOUT_H_ #define FARM1STATELOCKOUT_H_
#include "../datalinklayer/Farm1StateIF.h" #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Lockout" State. * This class represents the FARM-1 "Lockout" State.

View File

@ -8,10 +8,10 @@
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
#include "../datalinklayer/Farm1StateOpen.h" #include "Farm1StateOpen.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../datalinklayer/VirtualChannelReception.h" #include "VirtualChannelReception.h"
Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEOPEN_H_ #ifndef FARM1STATEOPEN_H_
#define FARM1STATEOPEN_H_ #define FARM1STATEOPEN_H_
#include "../datalinklayer/Farm1StateIF.h" #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Open" State. * This class represents the FARM-1 "Open" State.

View File

@ -6,10 +6,10 @@
*/ */
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
#include "../datalinklayer/Farm1StateWait.h" #include "Farm1StateWait.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../datalinklayer/VirtualChannelReception.h" #include "VirtualChannelReception.h"
Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEWAIT_H_ #ifndef FARM1STATEWAIT_H_
#define FARM1STATEWAIT_H_ #define FARM1STATEWAIT_H_
#include "../datalinklayer/Farm1StateIF.h" #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Wait" State. * This class represents the FARM-1 "Wait" State.

View File

@ -5,7 +5,7 @@
* @author baetz * @author baetz
*/ */
#include "../datalinklayer/MapPacketExtraction.h" #include "MapPacketExtraction.h"
#include "../ipc/QueueFactory.h" #include "../ipc/QueueFactory.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../storagemanager/StorageManagerIF.h" #include "../storagemanager/StorageManagerIF.h"
@ -16,9 +16,9 @@
MapPacketExtraction::MapPacketExtraction(uint8_t setMapId, MapPacketExtraction::MapPacketExtraction(uint8_t setMapId,
object_id_t setPacketDestination) : object_id_t setPacketDestination) :
lastSegmentationFlag(NO_SEGMENTATION), mapId(setMapId), packetLength(0), lastSegmentationFlag(NO_SEGMENTATION), mapId(setMapId), packetLength(0), bufferPosition(
bufferPosition(packetBuffer), packetDestination(setPacketDestination), packetBuffer), packetDestination(setPacketDestination), packetStore(
packetStore(nullptr), tcQueueId(MessageQueueMessageIF::NO_QUEUE) { NULL), tcQueueId(MessageQueueSenderIF::NO_QUEUE) {
memset(packetBuffer, 0, sizeof(packetBuffer)); memset(packetBuffer, 0, sizeof(packetBuffer));
} }

View File

@ -8,7 +8,7 @@
#ifndef MAPPACKETEXTRACTION_H_ #ifndef MAPPACKETEXTRACTION_H_
#define MAPPACKETEXTRACTION_H_ #define MAPPACKETEXTRACTION_H_
#include "../datalinklayer/MapPacketExtractionIF.h" #include "MapPacketExtractionIF.h"
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
#include "../ipc/MessageQueueSenderIF.h" #include "../ipc/MessageQueueSenderIF.h"

View File

@ -8,8 +8,8 @@
#ifndef MAPPACKETEXTRACTIONIF_H_ #ifndef MAPPACKETEXTRACTIONIF_H_
#define MAPPACKETEXTRACTIONIF_H_ #define MAPPACKETEXTRACTIONIF_H_
#include "../datalinklayer/CCSDSReturnValuesIF.h" #include "CCSDSReturnValuesIF.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
/** /**
* This is the interface for MAP Packet Extraction classes. * This is the interface for MAP Packet Extraction classes.

View File

@ -7,7 +7,7 @@
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
TcTransferFrame::TcTransferFrame() { TcTransferFrame::TcTransferFrame() {

View File

@ -5,7 +5,7 @@
* @author baetz * @author baetz
*/ */
#include "../datalinklayer/TcTransferFrameLocal.h" #include "TcTransferFrameLocal.h"
#include "../globalfunctions/CRC.h" #include "../globalfunctions/CRC.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include <string.h> #include <string.h>

View File

@ -8,7 +8,7 @@
#ifndef TCTRANSFERFRAMELOCAL_H_ #ifndef TCTRANSFERFRAMELOCAL_H_
#define TCTRANSFERFRAMELOCAL_H_ #define TCTRANSFERFRAMELOCAL_H_
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
/** /**
* This is a helper class to locally create TC Transfer Frames. * This is a helper class to locally create TC Transfer Frames.

View File

@ -5,8 +5,8 @@
* @author baetz * @author baetz
*/ */
#include "../datalinklayer/BCFrame.h" #include "BCFrame.h"
#include "../datalinklayer/VirtualChannelReception.h" #include "VirtualChannelReception.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId, VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,

View File

@ -8,14 +8,14 @@
#ifndef VIRTUALCHANNELRECEPTION_H_ #ifndef VIRTUALCHANNELRECEPTION_H_
#define VIRTUALCHANNELRECEPTION_H_ #define VIRTUALCHANNELRECEPTION_H_
#include "../datalinklayer/CCSDSReturnValuesIF.h" #include "CCSDSReturnValuesIF.h"
#include "../datalinklayer/Clcw.h" #include "Clcw.h"
#include "../datalinklayer/Farm1StateIF.h" #include "Farm1StateIF.h"
#include "../datalinklayer/Farm1StateLockout.h" #include "Farm1StateLockout.h"
#include "../datalinklayer/Farm1StateOpen.h" #include "Farm1StateOpen.h"
#include "../datalinklayer/Farm1StateWait.h" #include "Farm1StateWait.h"
#include "../datalinklayer/MapPacketExtractionIF.h" #include "MapPacketExtractionIF.h"
#include "../datalinklayer/VirtualChannelReceptionIF.h" #include "VirtualChannelReceptionIF.h"
#include <map> #include <map>
/** /**
* Implementation of a TC Virtual Channel. * Implementation of a TC Virtual Channel.

View File

@ -8,8 +8,8 @@
#ifndef VIRTUALCHANNELRECEPTIONIF_H_ #ifndef VIRTUALCHANNELRECEPTIONIF_H_
#define VIRTUALCHANNELRECEPTIONIF_H_ #define VIRTUALCHANNELRECEPTIONIF_H_
#include "../datalinklayer/ClcwIF.h" #include "ClcwIF.h"
#include "../datalinklayer/TcTransferFrame.h" #include "TcTransferFrame.h"
#include "../returnvalues/HasReturnvaluesIF.h" #include "../returnvalues/HasReturnvaluesIF.h"
/** /**