some updates
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

This commit is contained in:
Robin Müller 2022-10-24 10:57:30 +02:00
parent ed76062904
commit 46a756b1ee
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
7 changed files with 79 additions and 23 deletions

View File

@ -210,6 +210,7 @@ set(LIB_JSON_PATH ${THIRD_PARTY_FOLDER}/json)
set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF) set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
set(EIVE_ADD_LINUX_FILES False) set(EIVE_ADD_LINUX_FILES False)
set(FSFW_ADD_TMSTORAGE ON)
# Analyse different OS and architecture/target options, determine BSP_PATH, # Analyse different OS and architecture/target options, determine BSP_PATH,
# display information about compiler etc. # display information about compiler etc.

2
fsfw

@ -1 +1 @@
Subproject commit 56e8e5a8b34dee6fcf240111618109e53b77841f Subproject commit 096af44e39c4a94b17ee051fbdf907ddb3026a00

View File

@ -6,4 +6,4 @@ target_sources(
CfdpTmFunnel.cpp CfdpTmFunnel.cpp
PusTmFunnel.cpp PusTmFunnel.cpp
Service15TmStorage.cpp Service15TmStorage.cpp
TmStoreBackend.cpp) TmStore.cpp)

32
mission/tmtc/TmStore.cpp Normal file
View File

@ -0,0 +1,32 @@
#include "TmStore.h"
using namespace returnvalue;
const char* TmStore::getName() const { return "TM Store Backend"; }
MessageQueueId_t TmStore::getReportReceptionQueue(uint8_t virtualChannel) const {
return MessageQueueIF::NO_QUEUE;
}
MessageQueueId_t TmStore::getCommandQueue() const { return MessageQueueIF::NO_QUEUE; }
TmStoreBackendIF* TmStore::getBackend() const { return nullptr; }
ReturnValue_t TmStore::packetRetrieved(PusTmReader* packet, uint32_t address) { return OK; }
void TmStore::noMorePacketsInStore() {}
void TmStore::handleRetrievalFailed(ReturnValue_t errorCode, uint32_t parameter1,
uint32_t parameter2) {}
ReturnValue_t TmStore::fetchPackets(ApidSsc start, ApidSsc end) { return OK; }
ReturnValue_t TmStore::deletePackets(ApidSsc upTo) { return OK; }
ReturnValue_t TmStore::checkPacket(SpacePacketReader* tmPacket) { return OK; }
void TmStore::setEnabled(bool enabled) {}
void TmStore::resetDownlinkedPacketCount() {}
ReturnValue_t TmStore::setDumpTarget(object_id_t dumpTarget) { return OK; }

44
mission/tmtc/TmStore.h Normal file
View File

@ -0,0 +1,44 @@
#ifndef MISSION_TMTC_TMSTOREBACKEND_H_
#define MISSION_TMTC_TMSTOREBACKEND_H_
#include <fsfw/tmstorage/TmStoreFrontendIF.h>
#include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
class TmStore : public TmStoreFrontendIF, public AcceptsTelemetryIF {
public:
[[nodiscard]] const char* getName() const override;
[[nodiscard]] MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel) const override;
private:
/**
* To get the queue where commands shall be sent.
* @return Id of command queue.
*/
MessageQueueId_t getCommandQueue() const override;
TmStoreBackendIF* getBackend() const override;
/**
* Callback from the back-end to indicate a certain packet was received.
* front-end takes care of discarding/downloading the packet.
* @param packet Pointer to the newly received Space Packet.
* @param address Start address of the packet found
* @param isLastPacket Indicates if no more packets can be fetched.
* @return If more packets shall be fetched, returnvalue::OK must be returned.
* Any other code stops fetching packets.
*/
ReturnValue_t packetRetrieved(PusTmReader* packet, uint32_t address) override;
void noMorePacketsInStore() override;
void handleRetrievalFailed(ReturnValue_t errorCode, uint32_t parameter1 = 0,
uint32_t parameter2 = 0) override;
ReturnValue_t fetchPackets(ApidSsc start, ApidSsc end) override;
ReturnValue_t deletePackets(ApidSsc upTo) override;
ReturnValue_t checkPacket(SpacePacketReader* tmPacket) override;
bool isEnabled() const = 0;
void setEnabled(bool enabled) override;
void resetDownlinkedPacketCount() override;
ReturnValue_t setDumpTarget(object_id_t dumpTarget) override;
};
#endif /* MISSION_TMTC_TMSTOREBACKEND_H_ */

View File

@ -1,7 +0,0 @@
#include "TmStoreBackend.h"
const char* TmStoreBackend::getName() const { return "TM Store Backend"; }
MessageQueueId_t TmStoreBackend::getReportReceptionQueue(uint8_t virtualChannel) const {
return MessageQueueIF::NO_QUEUE;
}

View File

@ -1,14 +0,0 @@
#ifndef MISSION_TMTC_TMSTOREBACKEND_H_
#define MISSION_TMTC_TMSTOREBACKEND_H_
#include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
class TmStoreBackend : public AcceptsTelemetryIF {
public:
[[nodiscard]] const char* getName() const override;
[[nodiscard]] MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel) const override;
private:
};
#endif /* MISSION_TMTC_TMSTOREBACKEND_H_ */