fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

PUS11 TC sched update and bugfixes #632

Merged
gaisser merged 8 commits from mueller/tc-11-tweaks into development 2022-05-24 17:48:08 +02:00
Conversation 0 Commits 8 Files Changed 11 +18 -16
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34658ef7db - Show all commits

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

@ -45,17 +45,19 @@ class Service11TelecommandScheduling final : public PusServiceBase {
HasReturnvaluesIF::makeReturnCode(CLASS_ID, 3);
// The types of PUS-11 subservices
enum [[maybe_unused]] Subservice : uint8_t{ENABLE_SCHEDULING = 1,
DISABLE_SCHEDULING = 2,
RESET_SCHEDULING = 3,
INSERT_ACTIVITY = 4,
DELETE_ACTIVITY = 5,
FILTER_DELETE_ACTIVITY = 6,
TIMESHIFT_ACTIVITY = 7,
FILTER_TIMESHIFT_ACTIVITY = 8,
DETAIL_REPORT = 9,
TIMEBASE_SCHEDULE_DETAIL_REPORT = 10,
TIMESHIFT_ALL_SCHEDULE_ACTIVITIES = 15};
enum Subservice : uint8_t {
muellerr marked this conversation as resolved Outdated
gaisser commented 2022-05-23 14:55:55 +02:00
Outdated
Review
Copy Link

Why do we need "maybe_unused" here?

Why do we need "maybe_unused" here?
muellerr commented 2022-05-23 15:35:22 +02:00
Outdated
Review
Copy Link

I think I wondered this myself. Maybe because some enum values are unused? This warning should not appear if the enum is public though..

I think I wondered this myself. Maybe because some enum values are unused? This warning should not appear if the enum is public though..
muellerr commented 2022-05-24 10:40:07 +02:00
Outdated
Review
Copy Link

Some enum values are just not used, because those services are unimplemented

Some enum values are just not used, because those services are unimplemented
ENABLE_SCHEDULING = 1,
DISABLE_SCHEDULING = 2,
RESET_SCHEDULING = 3,
INSERT_ACTIVITY = 4,
DELETE_ACTIVITY = 5,
FILTER_DELETE_ACTIVITY = 6,
TIMESHIFT_ACTIVITY = 7,
FILTER_TIMESHIFT_ACTIVITY = 8,
DETAIL_REPORT = 9,
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,
// 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
<< " error" << std::endl;
#else
sif::printWarning(
"PUSDistributor::handlePacket: Packet format invalid, %s error\n", keyword);
sif::printWarning("PUSDistributor::handlePacket: Packet format invalid, %s error\n",
keyword);
#endif
#endif
}
@ -131,8 +131,7 @@ ReturnValue_t PUSDistributor::initialize() {
return ObjectManagerIF::CHILD_INIT_FAILED;
}
auto* ccsdsDistributor =
ObjectManager::instance()->get<CCSDSDistributorIF>(packetSource);
auto* ccsdsDistributor = ObjectManager::instance()->get<CCSDSDistributorIF>(packetSource);
if (ccsdsDistributor == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
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 {
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