eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

afmt

This commit is contained in:
Robin Müller 2022-05-24 10:40:25 +02:00
parent f288d5120d
commit 34658ef7db
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fsfw/pus/Service11TelecommandScheduling.h
View File

@ -45,17 +45,19 @@ class Service11TelecommandScheduling final : public PusServiceBase {
HasReturnvaluesIF::makeReturnCode(CLASS_ID, 3); HasReturnvaluesIF::makeReturnCode(CLASS_ID, 3);
// The types of PUS-11 subservices // The types of PUS-11 subservices
enum [[maybe_unused]] Subservice : uint8_t{ENABLE_SCHEDULING = 1, enum Subservice : uint8_t {
DISABLE_SCHEDULING = 2, ENABLE_SCHEDULING = 1,
RESET_SCHEDULING = 3, DISABLE_SCHEDULING = 2,
INSERT_ACTIVITY = 4, RESET_SCHEDULING = 3,
DELETE_ACTIVITY = 5, INSERT_ACTIVITY = 4,
FILTER_DELETE_ACTIVITY = 6, DELETE_ACTIVITY = 5,
TIMESHIFT_ACTIVITY = 7, FILTER_DELETE_ACTIVITY = 6,
FILTER_TIMESHIFT_ACTIVITY = 8, TIMESHIFT_ACTIVITY = 7,
DETAIL_REPORT = 9, FILTER_TIMESHIFT_ACTIVITY = 8,
TIMEBASE_SCHEDULE_DETAIL_REPORT = 10, DETAIL_REPORT = 9,
TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15}; TIMEBASE_SCHEDULE_DETAIL_REPORT = 10,
TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15
};
// The types of time windows for TC[11,6] and TC[11,8], as defined in ECSS-E-ST-70-41C, // The types of time windows for TC[11,6] and TC[11,8], as defined in ECSS-E-ST-70-41C,
// requirement 8.11.3c (p. 507) // requirement 8.11.3c (p. 507)

7
src/fsfw/tcdistribution/PUSDistributor.cpp
View File

@ -48,8 +48,8 @@ PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
sif::warning << "PUSDistributor::handlePacket: Packet format invalid, " << keyword sif::warning << "PUSDistributor::handlePacket: Packet format invalid, " << keyword
<< " error" << std::endl; << " error" << std::endl;
#else #else
sif::printWarning( sif::printWarning("PUSDistributor::handlePacket: Packet format invalid, %s error\n",
"PUSDistributor::handlePacket: Packet format invalid, %s error\n", keyword); keyword);
#endif #endif
#endif #endif
} }
@ -131,8 +131,7 @@ ReturnValue_t PUSDistributor::initialize() {
return ObjectManagerIF::CHILD_INIT_FAILED; return ObjectManagerIF::CHILD_INIT_FAILED;
} }
auto* ccsdsDistributor = auto* ccsdsDistributor = ObjectManager::instance()->get<CCSDSDistributorIF>(packetSource);
ObjectManager::instance()->get<CCSDSDistributorIF>(packetSource);
if (ccsdsDistributor == nullptr) { if (ccsdsDistributor == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PUSDistributor::initialize: Packet source invalid" << std::endl; sif::error << "PUSDistributor::initialize: Packet source invalid" << std::endl;

3
src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h
View File

@ -9,7 +9,8 @@
class TcPacketStoredIF { class TcPacketStoredIF {
public: public:
virtual ~TcPacketStoredIF()= default;; virtual ~TcPacketStoredIF() = default;
;
/** /**
* With this call, the stored packet can be set to another packet in a store. This is useful * With this call, the stored packet can be set to another packet in a store. This is useful