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

some adaptions

Browse Source
This commit is contained in:
Robin Müller 2020-10-18 17:23:47 +02:00
parent 3b0b474ab6
commit 8e49806057
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parameters/ParameterMessage.cpp
View File

@ -25,10 +25,14 @@ void ParameterMessage::setParameterDumpReply(CommandMessage* message,
} }
void ParameterMessage::setParameterLoadCommand(CommandMessage* message, void ParameterMessage::setParameterLoadCommand(CommandMessage* message,
ParameterId_t id, store_address_t storageID) { ParameterId_t id, store_address_t storeId, uint8_t ptc, uint8_t pfc,
uint8_t row, uint8_t column) {
message->setCommand(CMD_PARAMETER_LOAD); message->setCommand(CMD_PARAMETER_LOAD);
message->setParameter(id); message->setParameter(id);
message->setParameter2(storageID.raw); message->setParameter2(storeId.raw);
uint32_t packedParameterSettings = (ptc << 24) | (pfc << 16) |
(row << 8) | column;
message->setParameter3(packedParameterSettings);
} }
void ParameterMessage::clear(CommandMessage* message) { void ParameterMessage::clear(CommandMessage* message) {

3
parameters/ParameterMessage.h
View File

@ -21,7 +21,8 @@ public:
static void setParameterDumpReply(CommandMessage* message, static void setParameterDumpReply(CommandMessage* message,
ParameterId_t id, store_address_t storageID); ParameterId_t id, store_address_t storageID);
static void setParameterLoadCommand(CommandMessage* message, static void setParameterLoadCommand(CommandMessage* message,
ParameterId_t id, store_address_t storageID); ParameterId_t id, store_address_t storeId, uint8_t ptc,
uint8_t pfc, uint8_t row, uint8_t column);
static void clear(CommandMessage* message); static void clear(CommandMessage* message);
}; };

6
parameters/ParameterWrapper.h
View File

@ -97,12 +97,14 @@ public:
} }
template<typename T> template<typename T>
void setMatrix(T& member) { void setMatrix(T& member) {
this->set(member[0], sizeof(member)/sizeof(member[0]), sizeof(member[0])/sizeof(member[0][0])); this->set(member[0], sizeof(member)/sizeof(member[0]),
sizeof(member[0])/sizeof(member[0][0]));
} }
template<typename T> template<typename T>
void setMatrix(const T& member) { void setMatrix(const T& member) {
this->set(member[0], sizeof(member)/sizeof(member[0]), sizeof(member[0])/sizeof(member[0][0])); this->set(member[0], sizeof(member)/sizeof(member[0]),
sizeof(member[0])/sizeof(member[0][0]));
} }
ReturnValue_t set(const uint8_t *stream, size_t streamSize, ReturnValue_t set(const uint8_t *stream, size_t streamSize,