From 8e498060571c89c06574f1a9aec381fb3290f886 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Sun, 18 Oct 2020 17:23:47 +0200 Subject: [PATCH] some adaptions --- parameters/ParameterMessage.cpp | 8 ++++++-- parameters/ParameterMessage.h | 3 ++- parameters/ParameterWrapper.h | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/parameters/ParameterMessage.cpp b/parameters/ParameterMessage.cpp index e9f3191f..81bed871 100644 --- a/parameters/ParameterMessage.cpp +++ b/parameters/ParameterMessage.cpp @@ -25,10 +25,14 @@ void ParameterMessage::setParameterDumpReply(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->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) { diff --git a/parameters/ParameterMessage.h b/parameters/ParameterMessage.h index 31d7fe0b..6eb9ed8e 100644 --- a/parameters/ParameterMessage.h +++ b/parameters/ParameterMessage.h @@ -21,7 +21,8 @@ public: static void setParameterDumpReply(CommandMessage* message, ParameterId_t id, store_address_t storageID); 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); }; diff --git a/parameters/ParameterWrapper.h b/parameters/ParameterWrapper.h index 7a9145b4..75f7af9b 100644 --- a/parameters/ParameterWrapper.h +++ b/parameters/ParameterWrapper.h @@ -97,12 +97,14 @@ public: } template 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 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,