KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

added report status toggler

Browse Source
This commit is contained in:
Robin Müller 2020-09-11 14:06:08 +02:00
parent 71125c075a
commit f9612afe06
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
datapoollocal/LocalDataPoolManager.cpp
View File

@ -140,11 +140,6 @@ ReturnValue_t LocalDataPoolManager::handleHousekeepingMessage(
CommandMessage* message) { CommandMessage* message) {
Command_t command = message->getCommand(); Command_t command = message->getCommand();
switch(command) { switch(command) {
// I think those are the only commands which can be handled here..
case(HousekeepingMessage::ADD_HK_REPORT_STRUCT):
case(HousekeepingMessage::ADD_DIAGNOSTICS_REPORT_STRUCT):
// We should use OwnsLocalPoolDataIF to specify those functions..
return HasReturnvaluesIF::RETURN_OK;
case(HousekeepingMessage::REPORT_DIAGNOSTICS_REPORT_STRUCTURES): case(HousekeepingMessage::REPORT_DIAGNOSTICS_REPORT_STRUCTURES):
case(HousekeepingMessage::REPORT_HK_REPORT_STRUCTURES): case(HousekeepingMessage::REPORT_HK_REPORT_STRUCTURES):
//return generateSetStructurePacket(message->getSid()); //return generateSetStructurePacket(message->getSid());

24
housekeeping/HousekeepingMessage.cpp
View File

@ -27,6 +27,29 @@ sid_t HousekeepingMessage::getHkReportMessage(const CommandMessage *message,
return getSid(message); return getSid(message);
} }
void HousekeepingMessage::setToggleReportingMessage(CommandMessage *message,
sid_t sid, bool enableReporting, bool isDiagnostics) {
if(isDiagnostics) {
if(enableReporting) {
message->setCommand(ENABLE_PERIODIC_DIAGNOSTICS_GENERATION);
}
else {
message->setCommand(DISABLE_PERIODIC_DIAGNOSTICS_GENERATION);
}
}
else {
if(enableReporting) {
message->setCommand(ENABLE_PERIODIC_HK_GENERATION);
}
else {
message->setCommand(DISABLE_PERIODIC_HK_REPORT_GENERATION);
}
}
setSid(message, sid);
}
sid_t HousekeepingMessage::getSid(const CommandMessage* message) { sid_t HousekeepingMessage::getSid(const CommandMessage* message) {
sid_t sid; sid_t sid;
std::memcpy(&sid.raw, message->getData(), sizeof(sid.raw)); std::memcpy(&sid.raw, message->getData(), sizeof(sid.raw));
@ -36,4 +59,3 @@ sid_t HousekeepingMessage::getSid(const CommandMessage* message) {
void HousekeepingMessage::setSid(CommandMessage *message, sid_t sid) { void HousekeepingMessage::setSid(CommandMessage *message, sid_t sid) {
std::memcpy(message->getData(), &sid.raw, sizeof(sid.raw)); std::memcpy(message->getData(), &sid.raw, sizeof(sid.raw));
} }

16
housekeeping/HousekeepingMessage.h
View File

@ -58,15 +58,6 @@ public:
static constexpr uint8_t MESSAGE_ID = messagetypes::HOUSEKEEPING; static constexpr uint8_t MESSAGE_ID = messagetypes::HOUSEKEEPING;
static constexpr Command_t ADD_HK_REPORT_STRUCT =
MAKE_COMMAND_ID(1);
static constexpr Command_t ADD_DIAGNOSTICS_REPORT_STRUCT =
MAKE_COMMAND_ID(2);
static constexpr Command_t DELETE_HK_REPORT_STRUCT = MAKE_COMMAND_ID(3);
static constexpr Command_t DELETE_DIAGNOSTICS_REPORT_STRUCT =
MAKE_COMMAND_ID(4);
static constexpr Command_t ENABLE_PERIODIC_HK_GENERATION = static constexpr Command_t ENABLE_PERIODIC_HK_GENERATION =
MAKE_COMMAND_ID(5); MAKE_COMMAND_ID(5);
static constexpr Command_t DISABLE_PERIODIC_HK_REPORT_GENERATION = static constexpr Command_t DISABLE_PERIODIC_HK_REPORT_GENERATION =
@ -77,6 +68,11 @@ public:
static constexpr Command_t DISABLE_PERIODIC_DIAGNOSTICS_GENERATION = static constexpr Command_t DISABLE_PERIODIC_DIAGNOSTICS_GENERATION =
MAKE_COMMAND_ID(8); MAKE_COMMAND_ID(8);
static constexpr Command_t REPORTING_TOGGLE_SUCCESS =
MAKE_COMMAND_ID(128);
static constexpr Command_t REPORTING_TOGGLE_FAILURE =
MAKE_COMMAND_ID(129);
static constexpr Command_t REPORT_HK_REPORT_STRUCTURES = MAKE_COMMAND_ID(9); static constexpr Command_t REPORT_HK_REPORT_STRUCTURES = MAKE_COMMAND_ID(9);
static constexpr Command_t REPORT_DIAGNOSTICS_REPORT_STRUCTURES = static constexpr Command_t REPORT_DIAGNOSTICS_REPORT_STRUCTURES =
MAKE_COMMAND_ID(11); MAKE_COMMAND_ID(11);
@ -104,6 +100,8 @@ public:
static sid_t getSid(const CommandMessage* message); static sid_t getSid(const CommandMessage* message);
static void setToggleReportingMessage(CommandMessage* message, sid_t sid,
bool enableReporting, bool isDiagnostics);
static void setHkReportMessage(CommandMessage* message, sid_t sid, static void setHkReportMessage(CommandMessage* message, sid_t sid,
store_address_t storeId); store_address_t storeId);
static void setHkDiagnosticsMessage(CommandMessage* message, sid_t sid, static void setHkDiagnosticsMessage(CommandMessage* message, sid_t sid,