Merge branch 'mueller/master' into eive/develop

Reviewed-on: fsfw/fsfw#440

datalinklayer/DataLinkLayer.h

@@ -21,11 +21,16 @@ public:
 	static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::SYSTEM_1;
 	//! [EXPORT] : [COMMENT] A RF available signal was detected. P1: raw RFA state, P2: 0
 	static const Event RF_AVAILABLE = MAKE_EVENT(0, severity::INFO);
-	static const Event RF_LOST = MAKE_EVENT(1, severity::INFO); //!< A previously found RF available signal was lost. P1: raw RFA state, P2: 0
-	static const Event BIT_LOCK = MAKE_EVENT(2, severity::INFO); //!< A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0
-	static const Event BIT_LOCK_LOST = MAKE_EVENT(3, severity::INFO); //!< A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0
+	//! [EXPORT] : [COMMENT] A previously found RF available signal was lost.
+	//! P1: raw RFA state, P2: 0
+	static const Event RF_LOST = MAKE_EVENT(1, severity::INFO);
+	//! [EXPORT] : [COMMENT] A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0
+	static const Event BIT_LOCK = MAKE_EVENT(2, severity::INFO);
+	//! [EXPORT] : [COMMENT] A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0
+	static const Event BIT_LOCK_LOST = MAKE_EVENT(3, severity::INFO);
 //	static const Event RF_CHAIN_LOST = MAKE_EVENT(4, severity::INFO); //!< The CCSDS Board detected that either bit lock or RF available or both are lost. No parameters.
-	static const Event FRAME_PROCESSING_FAILED = MAKE_EVENT(5, severity::LOW); //!< The CCSDS Board could not interpret a TC
+	//! [EXPORT] : [COMMENT] The CCSDS Board could not interpret a TC
+	static const Event FRAME_PROCESSING_FAILED = MAKE_EVENT(5, severity::LOW);
 	/**
 	 * The Constructor sets the passed parameters and nothing else.
 	 * @param set_frame_buffer The buffer in which incoming frame candidates are stored.

devicehandlers/DeviceHandlerIF.h

@@ -104,7 +104,8 @@ public:
 	static const Event DEVICE_MISSED_REPLY = MAKE_EVENT(5, severity::LOW);
 	static const Event DEVICE_UNKNOWN_REPLY = MAKE_EVENT(6, severity::LOW);
 	static const Event DEVICE_UNREQUESTED_REPLY = MAKE_EVENT(7, severity::LOW);
-	static const Event INVALID_DEVICE_COMMAND = MAKE_EVENT(8, severity::LOW); //!< Indicates a SW bug in child class.
+	//! [EXPORT] : [COMMENT] Indicates a SW bug in child class.
+	static const Event INVALID_DEVICE_COMMAND = MAKE_EVENT(8, severity::LOW);
 	static const Event MONITORING_LIMIT_EXCEEDED = MAKE_EVENT(9, severity::LOW);
 	static const Event MONITORING_AMBIGUOUS = MAKE_EVENT(10, severity::HIGH);
 

osal/linux/PeriodicPosixTask.cpp

@@ -32,7 +32,7 @@ ReturnValue_t PeriodicPosixTask::addComponent(object_id_t object) {
 		sif::error << "PeriodicTask::addComponent: Invalid object. Make sure"
 				<< " it implements ExecutableObjectIF!" << std::endl;
 #else
-		sif::printError("PeriodicTask::addComponent: Invalid object. Make sure it"
+		sif::printError("PeriodicTask::addComponent: Invalid object. Make sure it "
 		        "implements ExecutableObjectIF!\n");
 #endif
 		return HasReturnvaluesIF::RETURN_FAILED;

tmtcpacket/pus/tc/TcPacketPus.cpp

@@ -8,7 +8,7 @@ TcPacketPus::TcPacketPus(const uint8_t *setData): TcPacketBase(setData) {
 }
 
 void TcPacketPus::initializeTcPacket(uint16_t apid, uint16_t sequenceCount,
-        uint8_t ack, uint8_t service, uint8_t subservice) {
+        uint8_t ack, uint8_t service, uint8_t subservice, uint16_t sourceId) {
     initSpacePacketHeader(true, true, apid, sequenceCount);
     std::memset(&tcData->dataField, 0, sizeof(tcData->dataField));
     setPacketDataLength(sizeof(PUSTcDataFieldHeader) + CRC_SIZE - 1);
@@ -18,6 +18,12 @@ void TcPacketPus::initializeTcPacket(uint16_t apid, uint16_t sequenceCount,
     tcData->dataField.versionTypeAck |= (ack & 0x0F);
     tcData->dataField.serviceType = service;
     tcData->dataField.serviceSubtype = subservice;
+#if FSFW_USE_PUS_C_TELECOMMANDS == 1
+    tcData->dataField.sourceIdH = (sourceId >> 8) | 0xff;
+    tcData->dataField.sourceIdL = sourceId & 0xff;
+#else
+    tcData->dataField.sourceId = sourceId;
+#endif
 }
 
 uint8_t TcPacketPus::getService() const {

tmtcpacket/pus/tc/TcPacketPus.h

@@ -75,7 +75,7 @@ protected:
      * @param subservice PUS Subservice
      */
     void initializeTcPacket(uint16_t apid, uint16_t sequenceCount, uint8_t ack,
-            uint8_t service, uint8_t subservice);
+            uint8_t service, uint8_t subservice, uint16_t sourceId = 0);
 
     /**
      * A pointer to a structure which defines the data structure of