From 375d1409cde45729a80b281469f506f918fcf127 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 13:32:32 -0700 Subject: [PATCH 01/42] Revise code gen for params --- .../ComponentCppWriter.scala | 3 - .../ComponentParameters.scala | 38 ++++---- .../ActiveExternalParamsComponentAc.ref.cpp | 90 +++++++++-------- .../ActiveExternalParamsComponentAc.ref.hpp | 24 +++++ .../base/ActiveParamsComponentAc.ref.cpp | 7 +- .../base/ActiveParamsComponentAc.ref.hpp | 24 ++--- .../base/ActiveSerialComponentAc.ref.cpp | 97 +++++++++---------- .../base/ActiveSerialComponentAc.ref.hpp | 42 +++++--- .../base/ActiveTestComponentAc.ref.cpp | 97 +++++++++---------- .../base/ActiveTestComponentAc.ref.hpp | 42 +++++--- .../PassiveExternalParamsComponentAc.ref.cpp | 90 +++++++++-------- .../PassiveExternalParamsComponentAc.ref.hpp | 24 +++++ .../base/PassiveParamsComponentAc.ref.cpp | 7 +- .../base/PassiveParamsComponentAc.ref.hpp | 24 ++--- .../base/PassiveSerialComponentAc.ref.cpp | 97 +++++++++---------- .../base/PassiveSerialComponentAc.ref.hpp | 42 +++++--- .../base/PassiveTestComponentAc.ref.cpp | 97 +++++++++---------- .../base/PassiveTestComponentAc.ref.hpp | 42 +++++--- .../QueuedExternalParamsComponentAc.ref.cpp | 90 +++++++++-------- .../QueuedExternalParamsComponentAc.ref.hpp | 24 +++++ .../base/QueuedParamsComponentAc.ref.cpp | 7 +- .../base/QueuedParamsComponentAc.ref.hpp | 24 ++--- .../base/QueuedSerialComponentAc.ref.cpp | 97 +++++++++---------- .../base/QueuedSerialComponentAc.ref.hpp | 42 +++++--- .../base/QueuedTestComponentAc.ref.cpp | 97 +++++++++---------- .../base/QueuedTestComponentAc.ref.hpp | 42 +++++--- 26 files changed, 742 insertions(+), 568 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala index cedf06d86..b9fa4a5b7 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala @@ -555,9 +555,6 @@ case class ComponentCppWriter ( throttledEventsWithTimeout.map((_, event) => line( s"this->${eventThrottleTimeName(event.getName)} = Fw::Time();" )), - sortedParams.flatMap((_, param) => guardedList(!param.isExternal) ( - lines(s"this->${paramValidityFlagName(param.getName)} = Fw::ParamValid::UNINIT;") - )) ) ) ), diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 98b200192..03ad18082 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -156,7 +156,8 @@ case class ComponentParameters ( |""" ) ) - ) + ), + CppDoc.Lines.Hpp ) private def getParamIds = linesClassMember( @@ -277,16 +278,12 @@ case class ComponentParameters ( private def getValidityFlagForParam(param: Param) = { val paramName = param.getName val flagName = paramValidityFlagName(paramName) - guardedList (!param.isExternal) ( - List( - linesClassMember( - lines( - s"""| - |//! True if $paramName was successfully received - |Fw::ParamValid $flagName; - |""" - ) - ) + linesClassMember( + lines( + s"""| + |//! VALID if $paramName was successfully received + |Fw::ParamValid $flagName = Fw::ParamValid::UNINIT; + |""" ) ) } @@ -294,7 +291,7 @@ case class ComponentParameters ( private def getValidityFlags = addAccessTagAndComment( "private", "Parameter validity flags", - sortedParams.flatMap((_, param) => getValidityFlagForParam(param)), + sortedParams.map((_, param) => getValidityFlagForParam(param)), CppDoc.Lines.Hpp ) @@ -307,8 +304,10 @@ case class ComponentParameters ( private def writeGetterFunctionBodyForExternalParam(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") val idConstantName = paramIdConstantName(param.getName) + val validityFlagName = paramValidityFlagName(param.getName) lines( s"""|$paramType _local{}; + |this->m_paramLock.lock(); |Fw::ParamBuffer _getBuff; |// Get the base ID |const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -321,10 +320,11 @@ case class ComponentParameters ( |if(_stat == Fw::FW_SERIALIZE_OK) { | _stat = _getBuff.deserializeTo(_local); | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - | valid = Fw::ParamValid::VALID; + | valid = this->$validityFlagName; |} else { | valid = Fw::ParamValid::INVALID; |} + |this->m_paramLock.unLock(); |return _local; |""" ) @@ -348,16 +348,17 @@ case class ComponentParameters ( private def writeLoadForExternalParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) + val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) List.concat( - getParam(param, "_paramValid"), + getParam(param, s"this->$validityFlagName"), lines( s"""| |// If there was a deserialization issue, mark it invalid |""" ), wrapInIfElse( - s"_paramValid == Fw::ParamValid::VALID", + s"this->$validityFlagName == Fw::ParamValid::VALID", List.concat( lines( s"""|// Pass the local ID to the delegate @@ -365,17 +366,17 @@ case class ComponentParameters ( | |FW_ASSERT(this->paramDelegatePtr != nullptr); |// Call the delegate deserialize function for $varName - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + |_stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->$validityFlagName, _buff); |""" ), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", lines( - s"_paramValid = Fw::ParamValid::INVALID;" + s"this->$validityFlagName = Fw::ParamValid::INVALID;" ) ) ), - lines(s"_paramValid = Fw::ParamValid::INVALID;") + lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") ) ) } @@ -440,7 +441,6 @@ case class ComponentParameters ( |FwPrmIdType _id{}; |""" ), - guardedList (hasExternalParameters) (lines("Fw::ParamValid _paramValid;")), intersperseBlankLines( sortedParams.map((_, param) => if param.isExternal diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index b9603e34f..73c9750f5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1673,156 +1673,154 @@ void ActiveExternalParamsComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -3472,6 +3470,7 @@ I32 ActiveExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3484,10 +3483,11 @@ I32 ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3495,6 +3495,7 @@ F64 ActiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3507,10 +3508,11 @@ F64 ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3518,6 +3520,7 @@ Fw::ParamString ActiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3530,10 +3533,11 @@ Fw::ParamString ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3541,6 +3545,7 @@ E ActiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3553,10 +3558,11 @@ E ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3564,6 +3570,7 @@ A ActiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3576,10 +3583,11 @@ A ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3587,6 +3595,7 @@ S ActiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3599,10 +3608,11 @@ S ActiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -4958,7 +4968,3 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp index 921ac3c43..294041c82 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp @@ -2151,6 +2151,30 @@ class ActiveExternalParamsComponentBase : #endif + private: + + // ---------------------------------------------------------------------- + // Parameter validity flags + // ---------------------------------------------------------------------- + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 3549687fe..8d6cdbf0b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1843,12 +1843,7 @@ ActiveParamsComponentBase :: ActiveParamsComponentBase(const char* compName) : Fw::ActiveComponentBase(compName) { - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + } ActiveParamsComponentBase :: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp index fe0192717..108bf1cdd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp @@ -2145,23 +2145,23 @@ class ActiveParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 83601d41a..d67665eb9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2135,8 +2135,6 @@ void ActiveSerialComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -2298,151 +2296,151 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2464,13 +2462,6 @@ ActiveSerialComponentBase :: this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } ActiveSerialComponentBase :: @@ -7190,6 +7181,7 @@ I32 ActiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7202,10 +7194,11 @@ I32 ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7213,6 +7206,7 @@ F64 ActiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7225,10 +7219,11 @@ F64 ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7236,6 +7231,7 @@ Fw::ParamString ActiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7248,10 +7244,11 @@ Fw::ParamString ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7259,6 +7256,7 @@ E ActiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7271,10 +7269,11 @@ E ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7282,6 +7281,7 @@ A ActiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7294,10 +7294,11 @@ A ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7305,6 +7306,7 @@ S ActiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7317,10 +7319,11 @@ S ActiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -9682,7 +9685,3 @@ Fw::CmdResponse ActiveSerialComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index cd9873fb7..b80f04b90 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -3464,23 +3464,41 @@ class ActiveSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 45204dea0..1390d474e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2213,8 +2213,6 @@ namespace M { FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -2376,151 +2374,151 @@ namespace M { _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2542,13 +2540,6 @@ namespace M { this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } ActiveTestComponentBase :: @@ -7022,6 +7013,7 @@ namespace M { paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7034,10 +7026,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7045,6 +7038,7 @@ namespace M { paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7057,10 +7051,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7068,6 +7063,7 @@ namespace M { paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7080,10 +7076,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7091,6 +7088,7 @@ namespace M { paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7103,10 +7101,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7114,6 +7113,7 @@ namespace M { paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7126,10 +7126,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7137,6 +7138,7 @@ namespace M { paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7149,10 +7151,11 @@ namespace M { if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -9543,8 +9546,4 @@ namespace M { } } - // ---------------------------------------------------------------------- - // Parameter delegate - // ---------------------------------------------------------------------- - } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index 1056e80cf..87142dbae 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -3446,23 +3446,41 @@ namespace M { // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 1f285a2f4..bf9737bf8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1380,156 +1380,154 @@ void PassiveExternalParamsComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2510,6 +2508,7 @@ I32 PassiveExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2522,10 +2521,11 @@ I32 PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -2533,6 +2533,7 @@ F64 PassiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2545,10 +2546,11 @@ F64 PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -2556,6 +2558,7 @@ Fw::ParamString PassiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2568,10 +2571,11 @@ Fw::ParamString PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -2579,6 +2583,7 @@ E PassiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2591,10 +2596,11 @@ E PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -2602,6 +2608,7 @@ A PassiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2614,10 +2621,11 @@ A PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -2625,6 +2633,7 @@ S PassiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -2637,10 +2646,11 @@ S PassiveExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3426,7 +3436,3 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp index e5ee087ed..91249c142 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp @@ -1757,6 +1757,30 @@ class PassiveExternalParamsComponentBase : #endif + private: + + // ---------------------------------------------------------------------- + // Parameter validity flags + // ---------------------------------------------------------------------- + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index d5ed9f531..c198589d6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1550,12 +1550,7 @@ PassiveParamsComponentBase :: PassiveParamsComponentBase(const char* compName) : Fw::PassiveComponentBase(compName) { - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + } PassiveParamsComponentBase :: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp index cee47aaaa..758dd3027 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp @@ -1751,23 +1751,23 @@ class PassiveParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index c569b153d..7559d5321 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1625,8 +1625,6 @@ void PassiveSerialComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -1788,151 +1786,151 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -1954,13 +1952,6 @@ PassiveSerialComponentBase :: this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } PassiveSerialComponentBase :: @@ -5088,6 +5079,7 @@ I32 PassiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5100,10 +5092,11 @@ I32 PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5111,6 +5104,7 @@ F64 PassiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5123,10 +5117,11 @@ F64 PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5134,6 +5129,7 @@ Fw::ParamString PassiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5146,10 +5142,11 @@ Fw::ParamString PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5157,6 +5154,7 @@ E PassiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5169,10 +5167,11 @@ E PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5180,6 +5179,7 @@ A PassiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5192,10 +5192,11 @@ A PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5203,6 +5204,7 @@ S PassiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5215,10 +5217,11 @@ S PassiveSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -6428,7 +6431,3 @@ Fw::CmdResponse PassiveSerialComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index 349782b6f..d8b204694 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -2680,23 +2680,41 @@ class PassiveSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 4f75df3a6..356f97cb6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1857,8 +1857,6 @@ void PassiveTestComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -2020,151 +2018,151 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2186,13 +2184,6 @@ PassiveTestComponentBase :: this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } PassiveTestComponentBase :: @@ -5268,6 +5259,7 @@ I32 PassiveTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5280,10 +5272,11 @@ I32 PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5291,6 +5284,7 @@ F64 PassiveTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5303,10 +5297,11 @@ F64 PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5314,6 +5309,7 @@ Fw::ParamString PassiveTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5326,10 +5322,11 @@ Fw::ParamString PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5337,6 +5334,7 @@ E PassiveTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5349,10 +5347,11 @@ E PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5360,6 +5359,7 @@ A PassiveTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5372,10 +5372,11 @@ A PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -5383,6 +5384,7 @@ S PassiveTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -5395,10 +5397,11 @@ S PassiveTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -6736,7 +6739,3 @@ void PassiveTestComponentBase :: break; } } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index 3bbfd5aee..a5b4bbabf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -2825,23 +2825,41 @@ class PassiveTestComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 171214e50..cd2244099 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1673,156 +1673,154 @@ void QueuedExternalParamsComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -3472,6 +3470,7 @@ I32 QueuedExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3484,10 +3483,11 @@ I32 QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3495,6 +3495,7 @@ F64 QueuedExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3507,10 +3508,11 @@ F64 QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3518,6 +3520,7 @@ Fw::ParamString QueuedExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3530,10 +3533,11 @@ Fw::ParamString QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3541,6 +3545,7 @@ E QueuedExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3553,10 +3558,11 @@ E QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3564,6 +3570,7 @@ A QueuedExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3576,10 +3583,11 @@ A QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -3587,6 +3595,7 @@ S QueuedExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -3599,10 +3608,11 @@ S QueuedExternalParamsComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -4982,7 +4992,3 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp index 324aa3b88..6bdbdccd3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp @@ -2160,6 +2160,30 @@ class QueuedExternalParamsComponentBase : #endif + private: + + // ---------------------------------------------------------------------- + // Parameter validity flags + // ---------------------------------------------------------------------- + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index f784aa371..3e5b9c593 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1843,12 +1843,7 @@ QueuedParamsComponentBase :: QueuedParamsComponentBase(const char* compName) : Fw::QueuedComponentBase(compName) { - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + } QueuedParamsComponentBase :: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp index 51919de97..ae346e7dd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp @@ -2154,23 +2154,23 @@ class QueuedParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index b6c09849d..553e108aa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2135,8 +2135,6 @@ void QueuedSerialComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -2298,151 +2296,151 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2464,13 +2462,6 @@ QueuedSerialComponentBase :: this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } QueuedSerialComponentBase :: @@ -7190,6 +7181,7 @@ I32 QueuedSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7202,10 +7194,11 @@ I32 QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7213,6 +7206,7 @@ F64 QueuedSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7225,10 +7219,11 @@ F64 QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7236,6 +7231,7 @@ Fw::ParamString QueuedSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7248,10 +7244,11 @@ Fw::ParamString QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7259,6 +7256,7 @@ E QueuedSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7271,10 +7269,11 @@ E QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7282,6 +7281,7 @@ A QueuedSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7294,10 +7294,11 @@ A QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7305,6 +7306,7 @@ S QueuedSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7317,10 +7319,11 @@ S QueuedSerialComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -9706,7 +9709,3 @@ Fw::CmdResponse QueuedSerialComponentBase :: return Fw::CmdResponse::EXECUTION_ERROR; } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index fe31f2579..057bdb169 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -3473,23 +3473,41 @@ class QueuedSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 988607896..eb44d96e1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2211,8 +2211,6 @@ void QueuedTestComponentBase :: FwPrmIdType _id{}; - Fw::ParamValid _paramValid; - _id = _baseId + PARAMID_PARAMU32; // Get parameter ParamU32 @@ -2374,151 +2372,151 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; // Get parameter ParamI32Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext - _paramValid = this->prmGetOut_out( + this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt - _paramValid = this->prmGetOut_out( + this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, _buff ); // If there was a deserialization issue, mark it invalid - if (_paramValid == Fw::ParamValid::VALID) { + if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; FW_ASSERT(this->paramDelegatePtr != nullptr); // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, _paramValid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } } else { - _paramValid = Fw::ParamValid::INVALID; + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } // Call notifier @@ -2540,13 +2538,6 @@ QueuedTestComponentBase :: this->m_EventWarningLowThrottledIntervalThrottle = 0; this->m_EventWarningLowThrottledIntervalThrottleTime = Fw::Time(); - - this->m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamString_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - this->m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; } QueuedTestComponentBase :: @@ -7020,6 +7011,7 @@ I32 QueuedTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { I32 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7032,10 +7024,11 @@ I32 QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamI32Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7043,6 +7036,7 @@ F64 QueuedTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { F64 _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7055,10 +7049,11 @@ F64 QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamF64Ext_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7066,6 +7061,7 @@ Fw::ParamString QueuedTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { Fw::ParamString _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7078,10 +7074,11 @@ Fw::ParamString QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStringExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7089,6 +7086,7 @@ E QueuedTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { E _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7101,10 +7099,11 @@ E QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamEnumExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7112,6 +7111,7 @@ A QueuedTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { A _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7124,10 +7124,11 @@ A QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamArrayExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -7135,6 +7136,7 @@ S QueuedTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { S _local{}; + this->m_paramLock.lock(); Fw::ParamBuffer _getBuff; // Get the base ID const FwPrmIdType _baseId = static_cast(this->getIdBase()); @@ -7147,10 +7149,11 @@ S QueuedTestComponentBase :: if(_stat == Fw::FW_SERIALIZE_OK) { _stat = _getBuff.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = Fw::ParamValid::VALID; + valid = this->m_param_ParamStructExt_valid; } else { valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); return _local; } @@ -9564,7 +9567,3 @@ void QueuedTestComponentBase :: break; } } - -// ---------------------------------------------------------------------- -// Parameter delegate -// ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 27207703e..933633606 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -3453,23 +3453,41 @@ class QueuedTestComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received - Fw::ParamValid m_param_ParamU32_valid; + //! VALID if ParamU32 was successfully received + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64 was successfully received - Fw::ParamValid m_param_ParamF64_valid; + //! VALID if ParamF64 was successfully received + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! True if ParamString was successfully received - Fw::ParamValid m_param_ParamString_valid; + //! VALID if ParamString was successfully received + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnum was successfully received - Fw::ParamValid m_param_ParamEnum_valid; + //! VALID if ParamEnum was successfully received + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! True if ParamArray was successfully received - Fw::ParamValid m_param_ParamArray_valid; + //! VALID if ParamArray was successfully received + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! True if ParamStruct was successfully received - Fw::ParamValid m_param_ParamStruct_valid; + //! VALID if ParamStruct was successfully received + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamI32Ext was successfully received + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamF64Ext was successfully received + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStringExt was successfully received + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamEnumExt was successfully received + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamArrayExt was successfully received + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; + + //! VALID if ParamStructExt was successfully received + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: From 72e064875c82d58c9c06e1613413561da7ba0a8f Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 13:46:02 -0700 Subject: [PATCH 02/42] Revise parameter code gen --- .../ComponentParameters.scala | 6 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 24 +++++++++++++++ .../base/ActiveParamsComponentAc.ref.cpp | 6 ---- .../base/ActiveSerialComponentAc.ref.cpp | 30 +++++++++++++++---- .../base/ActiveTestComponentAc.ref.cpp | 30 +++++++++++++++---- .../PassiveExternalParamsComponentAc.ref.cpp | 24 +++++++++++++++ .../base/PassiveParamsComponentAc.ref.cpp | 6 ---- .../base/PassiveSerialComponentAc.ref.cpp | 30 +++++++++++++++---- .../base/PassiveTestComponentAc.ref.cpp | 30 +++++++++++++++---- .../QueuedExternalParamsComponentAc.ref.cpp | 24 +++++++++++++++ .../base/QueuedParamsComponentAc.ref.cpp | 6 ---- .../base/QueuedSerialComponentAc.ref.cpp | 30 +++++++++++++++---- .../base/QueuedTestComponentAc.ref.cpp | 30 +++++++++++++++---- 13 files changed, 220 insertions(+), 56 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 03ad18082..7ba3f2510 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -354,6 +354,8 @@ case class ComponentParameters ( getParam(param, s"this->$validityFlagName"), lines( s"""| + |this->m_paramLock.lock(); + | |// If there was a deserialization issue, mark it invalid |""" ), @@ -377,7 +379,8 @@ case class ComponentParameters ( ) ), lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") - ) + ), + Line.blank :: lines("this->m_paramLock.unLock();") ) } @@ -390,7 +393,6 @@ case class ComponentParameters ( getParam(param, s"this->$validityFlagName"), lines( s"""| - |// Deserialize value |this->m_paramLock.lock(); | |// If there was a deserialization issue, mark it invalid diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 73c9750f5..91c1f0e21 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1682,6 +1682,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1698,6 +1700,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -1707,6 +1711,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1723,6 +1729,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -1732,6 +1740,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1748,6 +1758,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -1757,6 +1769,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1773,6 +1787,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -1782,6 +1798,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1798,6 +1816,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -1807,6 +1827,8 @@ void ActiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1823,6 +1845,8 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 8d6cdbf0b..70ebfd4ad 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1682,7 +1682,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1707,7 +1706,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1732,7 +1730,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1761,7 +1758,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1786,7 +1782,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1815,7 +1810,6 @@ void ActiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index d67665eb9..5baa45bae 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2144,7 +2144,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2169,7 +2168,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2194,7 +2192,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2223,7 +2220,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2248,7 +2244,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2277,7 +2272,6 @@ void ActiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2302,6 +2296,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2318,6 +2314,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -2327,6 +2325,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2343,6 +2343,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -2352,6 +2354,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2368,6 +2372,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -2377,6 +2383,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2393,6 +2401,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -2402,6 +2412,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2418,6 +2430,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -2427,6 +2441,8 @@ void ActiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2443,6 +2459,8 @@ void ActiveSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 1390d474e..86fd6f2ff 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2222,7 +2222,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2247,7 +2246,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2272,7 +2270,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2301,7 +2298,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2326,7 +2322,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2355,7 +2350,6 @@ namespace M { _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2380,6 +2374,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2396,6 +2392,8 @@ namespace M { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -2405,6 +2403,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2421,6 +2421,8 @@ namespace M { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -2430,6 +2432,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2446,6 +2450,8 @@ namespace M { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -2455,6 +2461,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2471,6 +2479,8 @@ namespace M { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -2480,6 +2490,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2496,6 +2508,8 @@ namespace M { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -2505,6 +2519,8 @@ namespace M { _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2521,6 +2537,8 @@ namespace M { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index bf9737bf8..dd497e489 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1389,6 +1389,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1405,6 +1407,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -1414,6 +1418,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1430,6 +1436,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -1439,6 +1447,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1455,6 +1465,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -1464,6 +1476,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1480,6 +1494,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -1489,6 +1505,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1505,6 +1523,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -1514,6 +1534,8 @@ void PassiveExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1530,6 +1552,8 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index c198589d6..5cf137203 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1389,7 +1389,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1414,7 +1413,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1439,7 +1437,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1468,7 +1465,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1493,7 +1489,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1522,7 +1517,6 @@ void PassiveParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 7559d5321..6f72ff330 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1634,7 +1634,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1659,7 +1658,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1684,7 +1682,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1713,7 +1710,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1738,7 +1734,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1767,7 +1762,6 @@ void PassiveSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1792,6 +1786,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1808,6 +1804,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -1817,6 +1815,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1833,6 +1833,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -1842,6 +1844,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1858,6 +1862,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -1867,6 +1873,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1883,6 +1891,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -1892,6 +1902,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1908,6 +1920,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -1917,6 +1931,8 @@ void PassiveSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1933,6 +1949,8 @@ void PassiveSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 356f97cb6..d12371459 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1866,7 +1866,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1891,7 +1890,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1916,7 +1914,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1945,7 +1942,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1970,7 +1966,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1999,7 +1994,6 @@ void PassiveTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2024,6 +2018,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2040,6 +2036,8 @@ void PassiveTestComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -2049,6 +2047,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2065,6 +2065,8 @@ void PassiveTestComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -2074,6 +2076,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2090,6 +2094,8 @@ void PassiveTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -2099,6 +2105,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2115,6 +2123,8 @@ void PassiveTestComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -2124,6 +2134,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2140,6 +2152,8 @@ void PassiveTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -2149,6 +2163,8 @@ void PassiveTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2165,6 +2181,8 @@ void PassiveTestComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index cd2244099..1a78e1227 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1682,6 +1682,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1698,6 +1700,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -1707,6 +1711,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1723,6 +1729,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -1732,6 +1740,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1748,6 +1758,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -1757,6 +1769,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1773,6 +1787,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -1782,6 +1798,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1798,6 +1816,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -1807,6 +1827,8 @@ void QueuedExternalParamsComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -1823,6 +1845,8 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 3e5b9c593..879899faf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1682,7 +1682,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1707,7 +1706,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1732,7 +1730,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1761,7 +1758,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1786,7 +1782,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -1815,7 +1810,6 @@ void QueuedParamsComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 553e108aa..021de1252 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2144,7 +2144,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2169,7 +2168,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2194,7 +2192,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2223,7 +2220,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2248,7 +2244,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2277,7 +2272,6 @@ void QueuedSerialComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2302,6 +2296,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2318,6 +2314,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -2327,6 +2325,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2343,6 +2343,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -2352,6 +2354,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2368,6 +2372,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -2377,6 +2383,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2393,6 +2401,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -2402,6 +2412,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2418,6 +2430,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -2427,6 +2441,8 @@ void QueuedSerialComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2443,6 +2459,8 @@ void QueuedSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index eb44d96e1..b8cd51523 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2220,7 +2220,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2245,7 +2244,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2270,7 +2268,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2299,7 +2296,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2324,7 +2320,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2353,7 +2348,6 @@ void QueuedTestComponentBase :: _buff ); - // Deserialize value this->m_paramLock.lock(); // If there was a deserialization issue, mark it invalid @@ -2378,6 +2372,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2394,6 +2390,8 @@ void QueuedTestComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMF64EXT; // Get parameter ParamF64Ext @@ -2403,6 +2401,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2419,6 +2419,8 @@ void QueuedTestComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRINGEXT; // Get parameter ParamStringExt @@ -2428,6 +2430,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2444,6 +2448,8 @@ void QueuedTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMENUMEXT; // Get parameter ParamEnumExt @@ -2453,6 +2459,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2469,6 +2477,8 @@ void QueuedTestComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMARRAYEXT; // Get parameter ParamArrayExt @@ -2478,6 +2488,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2494,6 +2506,8 @@ void QueuedTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + _id = _baseId + PARAMID_PARAMSTRUCTEXT; // Get parameter ParamStructExt @@ -2503,6 +2517,8 @@ void QueuedTestComponentBase :: _buff ); + this->m_paramLock.lock(); + // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { // Pass the local ID to the delegate @@ -2519,6 +2535,8 @@ void QueuedTestComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } + this->m_paramLock.unLock(); + // Call notifier this->parametersLoaded(); } From f58b14bfd96bd4488c0a733e77cb98b8786d8330 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:00:50 -0700 Subject: [PATCH 03/42] Refactor param code gen --- .../ComponentParameters.scala | 112 ++++++++---------- 1 file changed, 51 insertions(+), 61 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 7ba3f2510..76b5ada42 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -350,37 +350,26 @@ case class ComponentParameters ( val idConstantName = paramIdConstantName(paramName) val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) - List.concat( - getParam(param, s"this->$validityFlagName"), - lines( - s"""| - |this->m_paramLock.lock(); - | - |// If there was a deserialization issue, mark it invalid - |""" - ), - wrapInIfElse( - s"this->$validityFlagName == Fw::ParamValid::VALID", - List.concat( + wrapInIfElse( + s"this->$validityFlagName == Fw::ParamValid::VALID", + List.concat( + lines( + s"""|// Pass the local ID to the delegate + |constexpr FwPrmIdType _localId = $idConstantName; + | + |FW_ASSERT(this->paramDelegatePtr != nullptr); + |// Call the delegate deserialize function for $varName + |_stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->$validityFlagName, _buff); + |""" + ), + wrapInIf( + "_stat != Fw::FW_SERIALIZE_OK", lines( - s"""|// Pass the local ID to the delegate - |constexpr FwPrmIdType _localId = $idConstantName; - | - |FW_ASSERT(this->paramDelegatePtr != nullptr); - |// Call the delegate deserialize function for $varName - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->$validityFlagName, _buff); - |""" - ), - wrapInIf( - "_stat != Fw::FW_SERIALIZE_OK", - lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) + s"this->$validityFlagName = Fw::ParamValid::INVALID;" ) - ), - lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") + ) ), - Line.blank :: lines("this->m_paramLock.unLock();") + lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") ) } @@ -389,43 +378,32 @@ case class ComponentParameters ( val idConstantName = paramIdConstantName(paramName) val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) - List.concat( - getParam(param, s"this->$validityFlagName"), - lines( - s"""| - |this->m_paramLock.lock(); - | - |// If there was a deserialization issue, mark it invalid - |""" - ), - wrapInIfElse( - s"this->$validityFlagName == Fw::ParamValid::VALID", - line(s"_stat = _buff.deserializeTo(this->$varName);") :: - wrapInIf( - "_stat != Fw::FW_SERIALIZE_OK", - param.default match { - case Some(value) => lines( - s"""|this->$validityFlagName = Fw::ParamValid::DEFAULT; - |// Set default value - |this->$varName = ${ValueCppWriter.write(s, value)}; - |""" - ) - case None => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) - } - ), + wrapInIfElse( + s"this->$validityFlagName == Fw::ParamValid::VALID", + line(s"_stat = _buff.deserializeTo(this->$varName);") :: + wrapInIf( + "_stat != Fw::FW_SERIALIZE_OK", param.default match { case Some(value) => lines( - s"""|// Set default value - |this->$validityFlagName = Fw::ParamValid::DEFAULT; + s"""|this->$validityFlagName = Fw::ParamValid::DEFAULT; + |// Set default value |this->$varName = ${ValueCppWriter.write(s, value)}; |""" ) - case None => lines("// No default") + case None => lines( + s"this->$validityFlagName = Fw::ParamValid::INVALID;" + ) } ), - Line.blank :: lines("this->m_paramLock.unLock();") + param.default match { + case Some(value) => lines( + s"""|// Set default value + |this->$validityFlagName = Fw::ParamValid::DEFAULT; + |this->$varName = ${ValueCppWriter.write(s, value)}; + |""" + ) + case None => lines("// No default") + } ) } @@ -445,9 +423,21 @@ case class ComponentParameters ( ), intersperseBlankLines( sortedParams.map((_, param) => - if param.isExternal - then writeLoadForExternalParam(param) - else writeLoadForInternalParam(param) + val validityFlagName = paramValidityFlagName(param.getName) + List.concat( + getParam(param, s"this->$validityFlagName"), + lines( + s"""| + |this->m_paramLock.lock(); + | + |// If there was a deserialization issue, mark it invalid + |""" + ), + if param.isExternal + then writeLoadForExternalParam(param) + else writeLoadForInternalParam(param), + Line.blank :: lines("this->m_paramLock.unLock();") + ) ) ), lines( From 4cd6303f4053a02b220f898a8acd7a7bfce24bd5 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:12:26 -0700 Subject: [PATCH 04/42] Refactor param code gen --- .../ComponentCppWriter/ComponentParameters.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 76b5ada42..d2878c1f5 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -127,15 +127,16 @@ case class ComponentParameters ( ) ) - private def getParam(param: Param, validityFlag: String) = { + private def getParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) val prmGetPortInvokerName = outputPortInvokerName(prmGetPort.get) + val validityFlagName = paramValidityFlagName(param.getName) lines( s"""|_id = _baseId + $idConstantName; | |// Get parameter $paramName - |$validityFlag = this->$prmGetPortInvokerName( + |this->$validityFlagName = this->$prmGetPortInvokerName( | 0, | _id, | _buff @@ -423,9 +424,8 @@ case class ComponentParameters ( ), intersperseBlankLines( sortedParams.map((_, param) => - val validityFlagName = paramValidityFlagName(param.getName) List.concat( - getParam(param, s"this->$validityFlagName"), + getParam(param), lines( s"""| |this->m_paramLock.lock(); From 355940c8fe9180e611863483162dc85b982ff6af Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:16:06 -0700 Subject: [PATCH 05/42] Refactor param code gen --- .../ComponentParameters.scala | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index d2878c1f5..3258ccfe8 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -408,6 +408,22 @@ case class ComponentParameters ( ) } + private def writeLoadForParam(param: Param) = + List.concat( + getParam(param), + lines( + s"""| + |this->m_paramLock.lock(); + | + |// If there was a deserialization issue, mark it invalid + |""" + ), + if param.isExternal + then writeLoadForExternalParam(param) + else writeLoadForInternalParam(param), + Line.blank :: lines("this->m_paramLock.unLock();") + ) + private def writeLoadFunctionBody = { val prmGetPortName = prmGetPort.get.getUnqualifiedName val prmGetIsConnected = outputPortIsConnectedName(prmGetPortName) @@ -423,22 +439,7 @@ case class ComponentParameters ( |""" ), intersperseBlankLines( - sortedParams.map((_, param) => - List.concat( - getParam(param), - lines( - s"""| - |this->m_paramLock.lock(); - | - |// If there was a deserialization issue, mark it invalid - |""" - ), - if param.isExternal - then writeLoadForExternalParam(param) - else writeLoadForInternalParam(param), - Line.blank :: lines("this->m_paramLock.unLock();") - ) - ) + sortedParams.map((_, param) => writeLoadForParam(param)) ), lines( """|// Call notifier From 2f701aecfd185aaf21a9cc907f378264a30c2dde Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:28:42 -0700 Subject: [PATCH 06/42] Refactor param code gen --- .../ComponentParameters.scala | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 3258ccfe8..337af64dc 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -133,7 +133,8 @@ case class ComponentParameters ( val prmGetPortInvokerName = outputPortInvokerName(prmGetPort.get) val validityFlagName = paramValidityFlagName(param.getName) lines( - s"""|_id = _baseId + $idConstantName; + s"""| + |_id = _baseId + $idConstantName; | |// Get parameter $paramName |this->$validityFlagName = this->$prmGetPortInvokerName( @@ -427,25 +428,22 @@ case class ComponentParameters ( private def writeLoadFunctionBody = { val prmGetPortName = prmGetPort.get.getUnqualifiedName val prmGetIsConnected = outputPortIsConnectedName(prmGetPortName) - intersperseBlankLines( - List( - lines( - s"""|Fw::ParamBuffer _buff; - |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; - |const FwPrmIdType _baseId = static_cast(this->getIdBase()); - |FW_ASSERT(this->$prmGetIsConnected(0)); - | - |FwPrmIdType _id{}; - |""" - ), - intersperseBlankLines( - sortedParams.map((_, param) => writeLoadForParam(param)) - ), - lines( - """|// Call notifier - |this->parametersLoaded(); - |""" - ) + List.concat( + lines( + s"""|Fw::ParamBuffer _buff; + |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; + |const FwPrmIdType _baseId = static_cast(this->getIdBase()); + |FW_ASSERT(this->$prmGetIsConnected(0)); + | + |FwPrmIdType _id{}; + |""" + ), + sortedParams.flatMap((_, param) => writeLoadForParam(param)), + lines( + """| + |// Call notifier + |this->parametersLoaded(); + |""" ) ) } From 660708ffcb9e53c2f3bba51633b556d0a8ec99d6 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:32:09 -0700 Subject: [PATCH 07/42] Revise param code gen --- .../ComponentParameters.scala | 8 ++--- .../ActiveExternalParamsComponentAc.ref.cpp | 36 ++++--------------- .../base/ActiveSerialComponentAc.ref.cpp | 36 ++++--------------- .../base/ActiveTestComponentAc.ref.cpp | 36 ++++--------------- .../PassiveExternalParamsComponentAc.ref.cpp | 36 ++++--------------- .../base/PassiveSerialComponentAc.ref.cpp | 36 ++++--------------- .../base/PassiveTestComponentAc.ref.cpp | 36 ++++--------------- .../QueuedExternalParamsComponentAc.ref.cpp | 36 ++++--------------- .../base/QueuedSerialComponentAc.ref.cpp | 36 ++++--------------- .../base/QueuedTestComponentAc.ref.cpp | 36 ++++--------------- 10 files changed, 56 insertions(+), 276 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 337af64dc..00e5fd7f3 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -356,12 +356,8 @@ case class ComponentParameters ( s"this->$validityFlagName == Fw::ParamValid::VALID", List.concat( lines( - s"""|// Pass the local ID to the delegate - |constexpr FwPrmIdType _localId = $idConstantName; - | - |FW_ASSERT(this->paramDelegatePtr != nullptr); - |// Call the delegate deserialize function for $varName - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->$validityFlagName, _buff); + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); + |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); |""" ), wrapInIf( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 91c1f0e21..166855dd6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1686,12 +1686,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1715,12 +1711,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1744,12 +1736,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1773,12 +1761,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1802,12 +1786,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -1831,12 +1811,8 @@ void ActiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 5baa45bae..540e779c6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2300,12 +2300,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2329,12 +2325,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2358,12 +2350,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2387,12 +2375,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2416,12 +2400,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -2445,12 +2425,8 @@ void ActiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 86fd6f2ff..f08429dc7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2378,12 +2378,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2407,12 +2403,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2436,12 +2428,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2465,12 +2453,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2494,12 +2478,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -2523,12 +2503,8 @@ namespace M { // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index dd497e489..3aefc330c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1393,12 +1393,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1422,12 +1418,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1451,12 +1443,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1480,12 +1468,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1509,12 +1493,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -1538,12 +1518,8 @@ void PassiveExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 6f72ff330..e79e05a7a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1790,12 +1790,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1819,12 +1815,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1848,12 +1840,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1877,12 +1865,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1906,12 +1890,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -1935,12 +1915,8 @@ void PassiveSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index d12371459..62b74fa2b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2022,12 +2022,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2051,12 +2047,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2080,12 +2072,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2109,12 +2097,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2138,12 +2122,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -2167,12 +2147,8 @@ void PassiveTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 1a78e1227..1f765a745 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1686,12 +1686,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1715,12 +1711,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1744,12 +1736,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1773,12 +1761,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1802,12 +1786,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -1831,12 +1811,8 @@ void QueuedExternalParamsComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 021de1252..9bd8c95ab 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2300,12 +2300,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2329,12 +2325,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2358,12 +2350,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2387,12 +2375,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2416,12 +2400,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -2445,12 +2425,8 @@ void QueuedSerialComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index b8cd51523..ecaa496b2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2376,12 +2376,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMI32EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamI32Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2405,12 +2401,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMF64EXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamF64Ext - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2434,12 +2426,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStringExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2463,12 +2451,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamEnumExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2492,12 +2476,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamArrayExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -2521,12 +2501,8 @@ void QueuedTestComponentBase :: // If there was a deserialization issue, mark it invalid if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - // Pass the local ID to the delegate - constexpr FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate deserialize function for m_ParamStructExt - _stat = this->paramDelegatePtr->deserializeParam(_baseId, _localId, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } From d775fc81e8bd8417ca3261beab3dac1f6844c33e Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:34:22 -0700 Subject: [PATCH 08/42] Refactor parameter code gen --- .../ComponentParameters.scala | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 00e5fd7f3..a2361f37b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -378,20 +378,22 @@ case class ComponentParameters ( val varName = paramVariableName(paramName) wrapInIfElse( s"this->$validityFlagName == Fw::ParamValid::VALID", - line(s"_stat = _buff.deserializeTo(this->$varName);") :: - wrapInIf( - "_stat != Fw::FW_SERIALIZE_OK", - param.default match { - case Some(value) => lines( - s"""|this->$validityFlagName = Fw::ParamValid::DEFAULT; - |// Set default value - |this->$varName = ${ValueCppWriter.write(s, value)}; - |""" - ) - case None => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) - } + List.concat( + lines(s"_stat = _buff.deserializeTo(this->$varName);"), + wrapInIf( + "_stat != Fw::FW_SERIALIZE_OK", + param.default match { + case Some(value) => lines( + s"""|this->$validityFlagName = Fw::ParamValid::DEFAULT; + |// Set default value + |this->$varName = ${ValueCppWriter.write(s, value)}; + |""" + ) + case None => lines( + s"this->$validityFlagName = Fw::ParamValid::INVALID;" + ) + } + ) ), param.default match { case Some(value) => lines( From dbac028b27193fa4c91458541bb5397cf01a4bd1 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:45:54 -0700 Subject: [PATCH 09/42] Revise param code gen --- .../ComponentParameters.scala | 41 ++++++++++++++----- .../ActiveExternalParamsComponentAc.ref.cpp | 12 +++--- .../base/ActiveSerialComponentAc.ref.cpp | 12 +++--- .../base/ActiveTestComponentAc.ref.cpp | 12 +++--- .../PassiveExternalParamsComponentAc.ref.cpp | 12 +++--- .../base/PassiveSerialComponentAc.ref.cpp | 12 +++--- .../base/PassiveTestComponentAc.ref.cpp | 12 +++--- .../QueuedExternalParamsComponentAc.ref.cpp | 12 +++--- .../base/QueuedSerialComponentAc.ref.cpp | 12 +++--- .../base/QueuedTestComponentAc.ref.cpp | 12 +++--- 10 files changed, 85 insertions(+), 64 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index a2361f37b..d58d31421 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -347,6 +347,22 @@ case class ComponentParameters ( ) } + private def deserializeParam(param: Param) = { + val paramName = param.getName + val varName = paramVariableName(paramName) + val validityFlagName = paramValidityFlagName(paramName) + if param.isExternal + then + val idConstantName = paramIdConstantName(paramName) + lines( + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); + |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); + |""" + ) + else + lines(s"_stat = _buff.deserializeTo(this->$varName);"), + } + private def writeLoadForExternalParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) @@ -355,19 +371,24 @@ case class ComponentParameters ( wrapInIfElse( s"this->$validityFlagName == Fw::ParamValid::VALID", List.concat( - lines( - s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); - |""" - ), + deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", - lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) + param.default match { + // TODO + case Some(value) => lines( + s"this->$validityFlagName = Fw::ParamValid::INVALID;" + ) + case None => lines( + s"this->$validityFlagName = Fw::ParamValid::INVALID;" + ) + } ) ), - lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") + param.default match { + case Some(value) => lines("// TODO: Set default value") + case None => lines("// No default") + } ) } @@ -379,7 +400,7 @@ case class ComponentParameters ( wrapInIfElse( s"this->$validityFlagName == Fw::ParamValid::VALID", List.concat( - lines(s"_stat = _buff.deserializeTo(this->$varName);"), + deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", param.default match { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 166855dd6..bce248321 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1693,7 +1693,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1718,7 +1718,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1743,7 +1743,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1768,7 +1768,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1793,7 +1793,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1818,7 +1818,7 @@ void ActiveExternalParamsComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 540e779c6..b562240fa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2307,7 +2307,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2332,7 +2332,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2357,7 +2357,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2382,7 +2382,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2407,7 +2407,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2432,7 +2432,7 @@ void ActiveSerialComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index f08429dc7..50435b8b6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2385,7 +2385,7 @@ namespace M { } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2410,7 +2410,7 @@ namespace M { } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2435,7 +2435,7 @@ namespace M { } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2460,7 +2460,7 @@ namespace M { } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2485,7 +2485,7 @@ namespace M { } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2510,7 +2510,7 @@ namespace M { } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 3aefc330c..dd1f39df1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1400,7 +1400,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1425,7 +1425,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1450,7 +1450,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1475,7 +1475,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1500,7 +1500,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1525,7 +1525,7 @@ void PassiveExternalParamsComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index e79e05a7a..74c21cff2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1797,7 +1797,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1822,7 +1822,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1847,7 +1847,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1872,7 +1872,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1897,7 +1897,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1922,7 +1922,7 @@ void PassiveSerialComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 62b74fa2b..015495c25 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2029,7 +2029,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2054,7 +2054,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2079,7 +2079,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2104,7 +2104,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2129,7 +2129,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2154,7 +2154,7 @@ void PassiveTestComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 1f765a745..67b8126b2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1693,7 +1693,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1718,7 +1718,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1743,7 +1743,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1768,7 +1768,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -1793,7 +1793,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -1818,7 +1818,7 @@ void QueuedExternalParamsComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 9bd8c95ab..d8eb858f1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2307,7 +2307,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2332,7 +2332,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2357,7 +2357,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2382,7 +2382,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2407,7 +2407,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2432,7 +2432,7 @@ void QueuedSerialComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index ecaa496b2..7635e0ebb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2383,7 +2383,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2408,7 +2408,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2433,7 +2433,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2458,7 +2458,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); @@ -2483,7 +2483,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + // TODO: Set default value } this->m_paramLock.unLock(); @@ -2508,7 +2508,7 @@ void QueuedTestComponentBase :: } } else { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; + // No default } this->m_paramLock.unLock(); From b966c8c2ce54b742fb38601689fe1abbcf357d2e Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 14:57:30 -0700 Subject: [PATCH 10/42] Revise param code gen --- .../ComponentParameters.scala | 4 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 12 ++++++++++ .../base/ActiveParamsComponentAc.ref.cpp | 12 ---------- .../base/ActiveSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/ActiveTestComponentAc.ref.cpp | 24 +++++++++---------- .../PassiveExternalParamsComponentAc.ref.cpp | 12 ++++++++++ .../base/PassiveParamsComponentAc.ref.cpp | 12 ---------- .../base/PassiveSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/PassiveTestComponentAc.ref.cpp | 24 +++++++++---------- .../QueuedExternalParamsComponentAc.ref.cpp | 12 ++++++++++ .../base/QueuedParamsComponentAc.ref.cpp | 12 ---------- .../base/QueuedSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/QueuedTestComponentAc.ref.cpp | 24 +++++++++---------- 13 files changed, 110 insertions(+), 110 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index d58d31421..55ae332c4 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -501,14 +501,14 @@ case class ComponentParameters ( |const FwPrmIdType _baseId = static_cast(this->getIdBase()); | |FW_ASSERT(this->paramDelegatePtr != nullptr); + |this->m_paramLock.lock(); |_stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + |this->m_paramLock.unLock(); |""" ) else lines ( s"""|this->m_paramLock.lock(); - | |_stat = _saveBuff.serializeFrom($paramVarName); - | |this->m_paramLock.unLock(); |""" ), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index bce248321..be97d1b07 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4789,7 +4789,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4821,7 +4823,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4853,7 +4857,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4885,7 +4891,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4917,7 +4925,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4949,7 +4959,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 70ebfd4ad..c94d9ed64 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4673,9 +4673,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4704,9 +4702,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4735,9 +4731,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4766,9 +4760,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4797,9 +4789,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4828,9 +4818,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index b562240fa..a842145a4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9310,9 +9310,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9341,9 +9339,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9372,9 +9368,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9403,9 +9397,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9434,9 +9426,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9465,9 +9455,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9500,7 +9488,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9532,7 +9522,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9564,7 +9556,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9596,7 +9590,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9628,7 +9624,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9660,7 +9658,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 50435b8b6..9966b1529 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9097,9 +9097,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9128,9 +9126,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9159,9 +9155,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9190,9 +9184,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9221,9 +9213,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9252,9 +9242,7 @@ namespace M { Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9287,7 +9275,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9319,7 +9309,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9351,7 +9343,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9383,7 +9377,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9415,7 +9411,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9447,7 +9445,9 @@ namespace M { const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index dd1f39df1..949dc8535 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3257,7 +3257,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -3289,7 +3291,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -3321,7 +3325,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -3353,7 +3359,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -3385,7 +3393,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -3417,7 +3427,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 5cf137203..893f4dbd1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3141,9 +3141,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -3172,9 +3170,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -3203,9 +3199,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -3234,9 +3228,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -3265,9 +3257,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -3296,9 +3286,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 74c21cff2..6cc923dfb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -6056,9 +6056,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6087,9 +6085,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6118,9 +6114,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6149,9 +6143,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6180,9 +6172,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6211,9 +6201,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6246,7 +6234,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6278,7 +6268,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6310,7 +6302,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6342,7 +6336,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6374,7 +6370,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6406,7 +6404,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 015495c25..5167a4d78 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6291,9 +6291,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6322,9 +6320,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6353,9 +6349,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6384,9 +6378,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6415,9 +6407,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6446,9 +6436,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -6481,7 +6469,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6513,7 +6503,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6545,7 +6537,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6577,7 +6571,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6609,7 +6605,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -6641,7 +6639,9 @@ Fw::CmdResponse PassiveTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 67b8126b2..bbd767d1f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4813,7 +4813,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4845,7 +4847,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4877,7 +4881,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4909,7 +4915,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4941,7 +4949,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -4973,7 +4983,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 879899faf..10b616410 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4697,9 +4697,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4728,9 +4726,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4759,9 +4755,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4790,9 +4784,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4821,9 +4813,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -4852,9 +4842,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index d8eb858f1..cadcb0c01 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9334,9 +9334,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9365,9 +9363,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9396,9 +9392,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9427,9 +9421,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9458,9 +9450,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9489,9 +9479,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9524,7 +9512,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9556,7 +9546,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9588,7 +9580,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9620,7 +9614,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9652,7 +9648,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9684,7 +9682,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 7635e0ebb..7006ad278 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9119,9 +9119,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9150,9 +9148,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9181,9 +9177,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9212,9 +9206,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9243,9 +9235,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9274,9 +9264,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; @@ -9309,7 +9297,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9341,7 +9331,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9373,7 +9365,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9405,7 +9399,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9437,7 +9433,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } @@ -9469,7 +9467,9 @@ Fw::CmdResponse QueuedTestComponentBase :: const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->paramDelegatePtr != nullptr); + this->m_paramLock.lock(); _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); + this->m_paramLock.unLock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } From 15f33f60420693e6a8da4fd1c9c6271aefc57115 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 16:41:20 -0700 Subject: [PATCH 11/42] Revise param code gen --- .../ComponentCppWriter/ComponentParameters.scala | 8 ++++---- .../test/component/base/ActiveParamsComponentAc.ref.cpp | 8 ++++---- .../test/component/base/ActiveSerialComponentAc.ref.cpp | 8 ++++---- .../test/component/base/ActiveTestComponentAc.ref.cpp | 8 ++++---- .../test/component/base/PassiveParamsComponentAc.ref.cpp | 8 ++++---- .../test/component/base/PassiveSerialComponentAc.ref.cpp | 8 ++++---- .../test/component/base/PassiveTestComponentAc.ref.cpp | 8 ++++---- .../test/component/base/QueuedParamsComponentAc.ref.cpp | 8 ++++---- .../test/component/base/QueuedSerialComponentAc.ref.cpp | 8 ++++---- .../test/component/base/QueuedTestComponentAc.ref.cpp | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 55ae332c4..0b3b121e7 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -360,7 +360,7 @@ case class ComponentParameters ( |""" ) else - lines(s"_stat = _buff.deserializeTo(this->$varName);"), + lines(s"_stat = _buff.deserializeTo(this->$varName);") } private def writeLoadForExternalParam(param: Param) = { @@ -405,8 +405,8 @@ case class ComponentParameters ( "_stat != Fw::FW_SERIALIZE_OK", param.default match { case Some(value) => lines( - s"""|this->$validityFlagName = Fw::ParamValid::DEFAULT; - |// Set default value + s"""|// Use default value + |this->$validityFlagName = Fw::ParamValid::DEFAULT; |this->$varName = ${ValueCppWriter.write(s, value)}; |""" ) @@ -418,7 +418,7 @@ case class ComponentParameters ( ), param.default match { case Some(value) => lines( - s"""|// Set default value + s"""|// Use default value |this->$validityFlagName = Fw::ParamValid::DEFAULT; |this->$varName = ${ValueCppWriter.write(s, value)}; |""" diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index c94d9ed64..2fd466a1d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1736,13 +1736,13 @@ void ActiveParamsComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -1788,13 +1788,13 @@ void ActiveParamsComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index a842145a4..56237f47c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2198,13 +2198,13 @@ void ActiveSerialComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -2250,13 +2250,13 @@ void ActiveSerialComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 9966b1529..e2fc3f0de 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2276,13 +2276,13 @@ namespace M { if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -2328,13 +2328,13 @@ namespace M { if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 893f4dbd1..5242da78a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1443,13 +1443,13 @@ void PassiveParamsComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -1495,13 +1495,13 @@ void PassiveParamsComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 6cc923dfb..68258280e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1688,13 +1688,13 @@ void PassiveSerialComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -1740,13 +1740,13 @@ void PassiveSerialComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 5167a4d78..f2751e3f6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1920,13 +1920,13 @@ void PassiveTestComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -1972,13 +1972,13 @@ void PassiveTestComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 10b616410..07f78dcd0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1736,13 +1736,13 @@ void QueuedParamsComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -1788,13 +1788,13 @@ void QueuedParamsComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index cadcb0c01..fae15e562 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2198,13 +2198,13 @@ void QueuedSerialComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -2250,13 +2250,13 @@ void QueuedSerialComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 7006ad278..b2310b070 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2274,13 +2274,13 @@ void QueuedTestComponentBase :: if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamString = Fw::String("default"); } } else { - // Set default value + // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; this->m_ParamString = Fw::String("default"); } @@ -2326,13 +2326,13 @@ void QueuedTestComponentBase :: if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - // Set default value this->m_ParamArray = A({1, 2, 3}); } } else { - // Set default value + // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; this->m_ParamArray = A({1, 2, 3}); } From 2f7db40bd4c2fe16e55383fd05683d310515817f Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 17:42:41 -0700 Subject: [PATCH 12/42] Revise param code gen --- .../ComponentParameters.scala | 64 +++++++++-------- .../ActiveExternalParamsComponentAc.ref.cpp | 34 ++++++---- .../base/ActiveParamsComponentAc.ref.cpp | 34 +++++----- .../base/ActiveSerialComponentAc.ref.cpp | 68 ++++++++++--------- .../base/ActiveTestComponentAc.ref.cpp | 68 ++++++++++--------- .../PassiveExternalParamsComponentAc.ref.cpp | 34 ++++++---- .../base/PassiveParamsComponentAc.ref.cpp | 34 +++++----- .../base/PassiveSerialComponentAc.ref.cpp | 68 ++++++++++--------- .../base/PassiveTestComponentAc.ref.cpp | 68 ++++++++++--------- .../QueuedExternalParamsComponentAc.ref.cpp | 34 ++++++---- .../base/QueuedParamsComponentAc.ref.cpp | 34 +++++----- .../base/QueuedSerialComponentAc.ref.cpp | 68 ++++++++++--------- .../base/QueuedTestComponentAc.ref.cpp | 68 ++++++++++--------- 13 files changed, 358 insertions(+), 318 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 0b3b121e7..92216dbe0 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -136,7 +136,7 @@ case class ComponentParameters ( s"""| |_id = _baseId + $idConstantName; | - |// Get parameter $paramName + |// Get serialized parameter $paramName |this->$validityFlagName = this->$prmGetPortInvokerName( | 0, | _id, @@ -397,33 +397,39 @@ case class ComponentParameters ( val idConstantName = paramIdConstantName(paramName) val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) - wrapInIfElse( - s"this->$validityFlagName == Fw::ParamValid::VALID", - List.concat( - deserializeParam(param), - wrapInIf( - "_stat != Fw::FW_SERIALIZE_OK", - param.default match { - case Some(value) => lines( - s"""|// Use default value - |this->$validityFlagName = Fw::ParamValid::DEFAULT; - |this->$varName = ${ValueCppWriter.write(s, value)}; - |""" - ) - case None => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) - } - ) + List.concat( + wrapInIfElse( + s"this->$validityFlagName == Fw::ParamValid::VALID", + List.concat( + deserializeParam(param), + wrapInIf( + "_stat != Fw::FW_SERIALIZE_OK", + param.default match { + case Some(value) => lines( + s"this->$validityFlagName = Fw::ParamValid::DEFAULT;" + ) + case None => lines( + s"this->$validityFlagName = Fw::ParamValid::INVALID;" + ) + } + ) + ), + param.default match { + case Some(value) => lines( + s"this->$validityFlagName = Fw::ParamValid::DEFAULT;" + ) + case None => lines("// No default") + } ), param.default match { - case Some(value) => lines( - s"""|// Use default value - |this->$validityFlagName = Fw::ParamValid::DEFAULT; - |this->$varName = ${ValueCppWriter.write(s, value)}; - |""" - ) - case None => lines("// No default") + case Some(value) => + wrapInIf( + s"this->$validityFlagName == Fw::ParamValid::DEFAULT", + if param.isExternal + then lines("// TODO: Set default value") + else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") + ) + case None => Nil } ) } @@ -435,12 +441,10 @@ case class ComponentParameters ( s"""| |this->m_paramLock.lock(); | - |// If there was a deserialization issue, mark it invalid + |// Deserialize parameter or use default value |""" ), - if param.isExternal - then writeLoadForExternalParam(param) - else writeLoadForInternalParam(param), + writeLoadForInternalParam(param), Line.blank :: lines("this->m_paramLock.unLock();") ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index be97d1b07..76c8c2f7f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1675,7 +1675,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -1684,7 +1684,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1700,7 +1700,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -1709,7 +1709,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1725,7 +1725,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -1734,15 +1734,18 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1750,7 +1753,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -1759,7 +1762,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1775,7 +1778,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -1784,15 +1787,18 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1800,7 +1806,7 @@ void ActiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -1809,7 +1815,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 2fd466a1d..740714241 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1675,7 +1675,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -1684,7 +1684,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1699,7 +1699,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -1708,7 +1708,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1723,7 +1723,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -1732,18 +1732,17 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -1751,7 +1750,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -1760,7 +1759,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1775,7 +1774,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -1784,18 +1783,17 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -1803,7 +1801,7 @@ void ActiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -1812,7 +1810,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 56237f47c..18769b81c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2137,7 +2137,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -2146,7 +2146,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2161,7 +2161,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -2170,7 +2170,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2185,7 +2185,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -2194,18 +2194,17 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -2213,7 +2212,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -2222,7 +2221,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2237,7 +2236,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -2246,18 +2245,17 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -2265,7 +2263,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -2274,7 +2272,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2289,7 +2287,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -2298,7 +2296,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2314,7 +2312,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -2323,7 +2321,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2339,7 +2337,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -2348,15 +2346,18 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2364,7 +2365,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -2373,7 +2374,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2389,7 +2390,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -2398,15 +2399,18 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2414,7 +2418,7 @@ void ActiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -2423,7 +2427,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index e2fc3f0de..dab0c9f66 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2215,7 +2215,7 @@ namespace M { _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -2224,7 +2224,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2239,7 +2239,7 @@ namespace M { _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -2248,7 +2248,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2263,7 +2263,7 @@ namespace M { _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -2272,18 +2272,17 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -2291,7 +2290,7 @@ namespace M { _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -2300,7 +2299,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2315,7 +2314,7 @@ namespace M { _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -2324,18 +2323,17 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -2343,7 +2341,7 @@ namespace M { _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -2352,7 +2350,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2367,7 +2365,7 @@ namespace M { _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -2376,7 +2374,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2392,7 +2390,7 @@ namespace M { _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -2401,7 +2399,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2417,7 +2415,7 @@ namespace M { _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -2426,15 +2424,18 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2442,7 +2443,7 @@ namespace M { _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -2451,7 +2452,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2467,7 +2468,7 @@ namespace M { _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -2476,15 +2477,18 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2492,7 +2496,7 @@ namespace M { _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -2501,7 +2505,7 @@ namespace M { this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 949dc8535..866dbc306 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1382,7 +1382,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -1391,7 +1391,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1407,7 +1407,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -1416,7 +1416,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1432,7 +1432,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -1441,15 +1441,18 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1457,7 +1460,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -1466,7 +1469,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1482,7 +1485,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -1491,15 +1494,18 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1507,7 +1513,7 @@ void PassiveExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -1516,7 +1522,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 5242da78a..a299278da 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1382,7 +1382,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -1391,7 +1391,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1406,7 +1406,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -1415,7 +1415,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1430,7 +1430,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -1439,18 +1439,17 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -1458,7 +1457,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -1467,7 +1466,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1482,7 +1481,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -1491,18 +1490,17 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -1510,7 +1508,7 @@ void PassiveParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -1519,7 +1517,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 68258280e..f05a74463 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1627,7 +1627,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -1636,7 +1636,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1651,7 +1651,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -1660,7 +1660,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1675,7 +1675,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -1684,18 +1684,17 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -1703,7 +1702,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -1712,7 +1711,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1727,7 +1726,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -1736,18 +1735,17 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -1755,7 +1753,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -1764,7 +1762,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1779,7 +1777,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -1788,7 +1786,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1804,7 +1802,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -1813,7 +1811,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1829,7 +1827,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -1838,15 +1836,18 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1854,7 +1855,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -1863,7 +1864,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1879,7 +1880,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -1888,15 +1889,18 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1904,7 +1908,7 @@ void PassiveSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -1913,7 +1917,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index f2751e3f6..3ca20af48 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1859,7 +1859,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -1868,7 +1868,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1883,7 +1883,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -1892,7 +1892,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1907,7 +1907,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -1916,18 +1916,17 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -1935,7 +1934,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -1944,7 +1943,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1959,7 +1958,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -1968,18 +1967,17 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -1987,7 +1985,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -1996,7 +1994,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2011,7 +2009,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -2020,7 +2018,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2036,7 +2034,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -2045,7 +2043,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2061,7 +2059,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -2070,15 +2068,18 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2086,7 +2087,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -2095,7 +2096,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2111,7 +2112,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -2120,15 +2121,18 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2136,7 +2140,7 @@ void PassiveTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -2145,7 +2149,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index bbd767d1f..e51b14523 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1675,7 +1675,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -1684,7 +1684,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1700,7 +1700,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -1709,7 +1709,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1725,7 +1725,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -1734,15 +1734,18 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1750,7 +1753,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -1759,7 +1762,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1775,7 +1778,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -1784,15 +1787,18 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -1800,7 +1806,7 @@ void QueuedExternalParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -1809,7 +1815,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 07f78dcd0..fa801b014 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1675,7 +1675,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -1684,7 +1684,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1699,7 +1699,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -1708,7 +1708,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1723,7 +1723,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -1732,18 +1732,17 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -1751,7 +1750,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -1760,7 +1759,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1775,7 +1774,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -1784,18 +1783,17 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -1803,7 +1801,7 @@ void QueuedParamsComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -1812,7 +1810,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index fae15e562..15b4695bc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2137,7 +2137,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -2146,7 +2146,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2161,7 +2161,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -2170,7 +2170,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2185,7 +2185,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -2194,18 +2194,17 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -2213,7 +2212,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -2222,7 +2221,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2237,7 +2236,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -2246,18 +2245,17 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -2265,7 +2263,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -2274,7 +2272,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2289,7 +2287,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -2298,7 +2296,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2314,7 +2312,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -2323,7 +2321,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2339,7 +2337,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -2348,15 +2346,18 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2364,7 +2365,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -2373,7 +2374,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2389,7 +2390,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -2398,15 +2399,18 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2414,7 +2418,7 @@ void QueuedSerialComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -2423,7 +2427,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index b2310b070..73d0a8cec 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2213,7 +2213,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMU32; - // Get parameter ParamU32 + // Get serialized parameter ParamU32 this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, @@ -2222,7 +2222,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2237,7 +2237,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMF64; - // Get parameter ParamF64 + // Get serialized parameter ParamF64 this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, @@ -2246,7 +2246,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2261,7 +2261,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRING; - // Get parameter ParamString + // Get serialized parameter ParamString this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, @@ -2270,18 +2270,17 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; - this->m_ParamString = Fw::String("default"); } } else { - // Use default value this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT) { this->m_ParamString = Fw::String("default"); } @@ -2289,7 +2288,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMENUM; - // Get parameter ParamEnum + // Get serialized parameter ParamEnum this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, @@ -2298,7 +2297,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2313,7 +2312,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMARRAY; - // Get parameter ParamArray + // Get serialized parameter ParamArray this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, @@ -2322,18 +2321,17 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; - this->m_ParamArray = A({1, 2, 3}); } } else { - // Use default value this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT) { this->m_ParamArray = A({1, 2, 3}); } @@ -2341,7 +2339,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCT; - // Get parameter ParamStruct + // Get serialized parameter ParamStruct this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, @@ -2350,7 +2348,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2365,7 +2363,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMI32EXT; - // Get parameter ParamI32Ext + // Get serialized parameter ParamI32Ext this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, @@ -2374,7 +2372,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2390,7 +2388,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMF64EXT; - // Get parameter ParamF64Ext + // Get serialized parameter ParamF64Ext this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, @@ -2399,7 +2397,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2415,7 +2413,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRINGEXT; - // Get parameter ParamStringExt + // Get serialized parameter ParamStringExt this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, @@ -2424,15 +2422,18 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2440,7 +2441,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMENUMEXT; - // Get parameter ParamEnumExt + // Get serialized parameter ParamEnumExt this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, @@ -2449,7 +2450,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2465,7 +2466,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMARRAYEXT; - // Get parameter ParamArrayExt + // Get serialized parameter ParamArrayExt this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, @@ -2474,15 +2475,18 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; + } + if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { // TODO: Set default value } @@ -2490,7 +2494,7 @@ void QueuedTestComponentBase :: _id = _baseId + PARAMID_PARAMSTRUCTEXT; - // Get parameter ParamStructExt + // Get serialized parameter ParamStructExt this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, @@ -2499,7 +2503,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // If there was a deserialization issue, mark it invalid + // Deserialize parameter or use default value if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); From ac3a2e92d6085da642af7e30ae81365dadccb2b1 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 17:48:49 -0700 Subject: [PATCH 13/42] Revise param code gen --- .../ComponentCppWriter/ComponentParameters.scala | 9 +++++++-- .../base/ActiveExternalParamsComponentAc.ref.cpp | 8 ++++---- .../base/ActiveParamsComponentAc.ref.cpp | 8 ++++---- .../base/ActiveSerialComponentAc.ref.cpp | 16 ++++++++-------- .../component/base/ActiveTestComponentAc.ref.cpp | 16 ++++++++-------- .../PassiveExternalParamsComponentAc.ref.cpp | 8 ++++---- .../base/PassiveParamsComponentAc.ref.cpp | 8 ++++---- .../base/PassiveSerialComponentAc.ref.cpp | 16 ++++++++-------- .../base/PassiveTestComponentAc.ref.cpp | 16 ++++++++-------- .../base/QueuedExternalParamsComponentAc.ref.cpp | 8 ++++---- .../base/QueuedParamsComponentAc.ref.cpp | 8 ++++---- .../base/QueuedSerialComponentAc.ref.cpp | 16 ++++++++-------- .../component/base/QueuedTestComponentAc.ref.cpp | 16 ++++++++-------- 13 files changed, 79 insertions(+), 74 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 92216dbe0..3b903c092 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -434,19 +434,24 @@ case class ComponentParameters ( ) } - private def writeLoadForParam(param: Param) = + private def writeLoadForParam(param: Param) = { + val orUseDefaultValue = param.default match { + case Some(_) => " or use default value" + case None => "" + } List.concat( getParam(param), lines( s"""| |this->m_paramLock.lock(); | - |// Deserialize parameter or use default value + |// Deserialize parameter$orUseDefaultValue |""" ), writeLoadForInternalParam(param), Line.blank :: lines("this->m_paramLock.unLock();") ) + } private def writeLoadFunctionBody = { val prmGetPortName = prmGetPort.get.getUnqualifiedName diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 76c8c2f7f..863a79d47 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1684,7 +1684,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1709,7 +1709,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1762,7 +1762,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1815,7 +1815,7 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 740714241..306d8f84a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1684,7 +1684,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1708,7 +1708,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1759,7 +1759,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1810,7 +1810,7 @@ void ActiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 18769b81c..8239f3f0b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2146,7 +2146,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2170,7 +2170,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2221,7 +2221,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2272,7 +2272,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2296,7 +2296,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2321,7 +2321,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2374,7 +2374,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2427,7 +2427,7 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index dab0c9f66..2ff5b65d4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2224,7 +2224,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2248,7 +2248,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2299,7 +2299,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2350,7 +2350,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2374,7 +2374,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2399,7 +2399,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2452,7 +2452,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2505,7 +2505,7 @@ namespace M { this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 866dbc306..79b7b31cf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1391,7 +1391,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1416,7 +1416,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1469,7 +1469,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1522,7 +1522,7 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index a299278da..97489a3cb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1391,7 +1391,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1415,7 +1415,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1466,7 +1466,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1517,7 +1517,7 @@ void PassiveParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index f05a74463..4335453ba 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1636,7 +1636,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1660,7 +1660,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1711,7 +1711,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1762,7 +1762,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1786,7 +1786,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1811,7 +1811,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1864,7 +1864,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1917,7 +1917,7 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 3ca20af48..db2459113 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1868,7 +1868,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1892,7 +1892,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1943,7 +1943,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1994,7 +1994,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2018,7 +2018,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2043,7 +2043,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2096,7 +2096,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2149,7 +2149,7 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index e51b14523..05ca7c764 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1684,7 +1684,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -1709,7 +1709,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -1762,7 +1762,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -1815,7 +1815,7 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index fa801b014..2f58369f7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1684,7 +1684,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1708,7 +1708,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1759,7 +1759,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -1810,7 +1810,7 @@ void QueuedParamsComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 15b4695bc..939982223 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2146,7 +2146,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2170,7 +2170,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2221,7 +2221,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2272,7 +2272,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2296,7 +2296,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2321,7 +2321,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2374,7 +2374,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2427,7 +2427,7 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 73d0a8cec..a6a17c818 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2222,7 +2222,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2246,7 +2246,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2297,7 +2297,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2348,7 +2348,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { _stat = _buff.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -2372,7 +2372,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); @@ -2397,7 +2397,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); @@ -2450,7 +2450,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); @@ -2503,7 +2503,7 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); - // Deserialize parameter or use default value + // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); From 45bcd4d06bd37c7defc21adb7a9eda0c4941eeed Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 17:57:57 -0700 Subject: [PATCH 14/42] Refactor param code gen --- .../ComponentParameters.scala | 77 +++++++------------ 1 file changed, 26 insertions(+), 51 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 3b903c092..7cda52fde 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -363,41 +363,25 @@ case class ComponentParameters ( lines(s"_stat = _buff.deserializeTo(this->$varName);") } - private def writeLoadForExternalParam(param: Param) = { - val paramName = param.getName - val idConstantName = paramIdConstantName(paramName) - val validityFlagName = paramValidityFlagName(paramName) - val varName = paramVariableName(paramName) - wrapInIfElse( - s"this->$validityFlagName == Fw::ParamValid::VALID", - List.concat( - deserializeParam(param), - wrapInIf( - "_stat != Fw::FW_SERIALIZE_OK", - param.default match { - // TODO - case Some(value) => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) - case None => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) - } - ) - ), - param.default match { - case Some(value) => lines("// TODO: Set default value") - case None => lines("// No default") - } - ) - } - - private def writeLoadForInternalParam(param: Param) = { + private def writeLoadForParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) List.concat( + getParam(param), + { + val orUseDefaultValue = param.default match { + case Some(_) => " or use default value" + case None => "" + } + lines( + s"""| + |this->m_paramLock.lock(); + | + |// Deserialize parameter$orUseDefaultValue""" + ) + }, wrapInIfElse( s"this->$validityFlagName == Fw::ParamValid::VALID", List.concat( @@ -425,32 +409,23 @@ case class ComponentParameters ( case Some(value) => wrapInIf( s"this->$validityFlagName == Fw::ParamValid::DEFAULT", - if param.isExternal - then lines("// TODO: Set default value") - else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") + setDefaultValue(param, value) ) case None => Nil - } + }, + lines( + """| + |this->m_paramLock.unLock();""" + ) ) } - private def writeLoadForParam(param: Param) = { - val orUseDefaultValue = param.default match { - case Some(_) => " or use default value" - case None => "" - } - List.concat( - getParam(param), - lines( - s"""| - |this->m_paramLock.lock(); - | - |// Deserialize parameter$orUseDefaultValue - |""" - ), - writeLoadForInternalParam(param), - Line.blank :: lines("this->m_paramLock.unLock();") - ) + private def setDefaultValue(param: Param, value: Value) = { + val paramName = param.getName + val varName = paramVariableName(paramName) + if param.isExternal + then lines("// TODO: Set default value") + else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") } private def writeLoadFunctionBody = { From df15e32cc35a9055c2e3b058dca1530ecd26c310 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 23 Apr 2026 18:01:56 -0700 Subject: [PATCH 15/42] Refactor param code gen --- .../ComponentParameters.scala | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 7cda52fde..d73317421 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -40,6 +40,22 @@ case class ComponentParameters ( guardedList (hasExternalParameters) (getParamDelegate) ) + private def deserializeParam(param: Param) = { + val paramName = param.getName + val varName = paramVariableName(paramName) + val validityFlagName = paramValidityFlagName(paramName) + if param.isExternal + then + val idConstantName = paramIdConstantName(paramName) + lines( + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); + |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); + |""" + ) + else + lines(s"_stat = _buff.deserializeTo(this->$varName);") + } + private def getExternalParameterFunctions: List[CppDoc.Class.Member] = { lazy val delegateInit = addAccessTagAndComment( "protected", @@ -303,6 +319,14 @@ case class ComponentParameters ( private def paramVariableName(name: String) = s"m_$name" + private def setDefaultValue(param: Param, value: Value) = { + val paramName = param.getName + val varName = paramVariableName(paramName) + if param.isExternal + then lines("// TODO: Set default value") + else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") + } + private def writeGetterFunctionBodyForExternalParam(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") val idConstantName = paramIdConstantName(param.getName) @@ -347,22 +371,6 @@ case class ComponentParameters ( ) } - private def deserializeParam(param: Param) = { - val paramName = param.getName - val varName = paramVariableName(paramName) - val validityFlagName = paramValidityFlagName(paramName) - if param.isExternal - then - val idConstantName = paramIdConstantName(paramName) - lines( - s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); - |""" - ) - else - lines(s"_stat = _buff.deserializeTo(this->$varName);") - } - private def writeLoadForParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) @@ -389,20 +397,18 @@ case class ComponentParameters ( wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", param.default match { - case Some(value) => lines( - s"this->$validityFlagName = Fw::ParamValid::DEFAULT;" - ) - case None => lines( - s"this->$validityFlagName = Fw::ParamValid::INVALID;" - ) + case Some(value) => + lines(s"this->$validityFlagName = Fw::ParamValid::DEFAULT;") + case None => + lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") } ) ), param.default match { - case Some(value) => lines( - s"this->$validityFlagName = Fw::ParamValid::DEFAULT;" - ) - case None => lines("// No default") + case Some(value) => + lines(s"this->$validityFlagName = Fw::ParamValid::DEFAULT;") + case None => + lines("// No default") } ), param.default match { @@ -420,14 +426,6 @@ case class ComponentParameters ( ) } - private def setDefaultValue(param: Param, value: Value) = { - val paramName = param.getName - val varName = paramVariableName(paramName) - if param.isExternal - then lines("// TODO: Set default value") - else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") - } - private def writeLoadFunctionBody = { val prmGetPortName = prmGetPort.get.getUnqualifiedName val prmGetIsConnected = outputPortIsConnectedName(prmGetPortName) From 5119cdd00ce73a12e542bb55412f15d6e38677cf Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 13:38:39 -0700 Subject: [PATCH 16/42] Revise code gen for parameters --- .../ComponentParameters.scala | 25 ++++++++++++++-- .../ActiveExternalParamsComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/ActiveSerialComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/ActiveTestComponentAc.ref.cpp | 30 +++++++++++++++++-- .../PassiveExternalParamsComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/PassiveSerialComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/PassiveTestComponentAc.ref.cpp | 30 +++++++++++++++++-- .../QueuedExternalParamsComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/QueuedSerialComponentAc.ref.cpp | 30 +++++++++++++++++-- .../base/QueuedTestComponentAc.ref.cpp | 30 +++++++++++++++++-- 10 files changed, 275 insertions(+), 20 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index d73317421..57932f5b6 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -322,9 +322,30 @@ case class ComponentParameters ( private def setDefaultValue(param: Param, value: Value) = { val paramName = param.getName val varName = paramVariableName(paramName) + val cppValue = ValueCppWriter.write(s, value) if param.isExternal - then lines("// TODO: Set default value") - else lines(s"this->$varName = ${ValueCppWriter.write(s, value)};") + then + val cppType = TypeCppWriter.getName(s, value.getType, "Fw::String") + val idConstantName = paramIdConstantName(param.getName) + val validityFlagName = paramValidityFlagName(paramName) + lines( + s"""|$cppType _val = $cppValue; + |_buff.resetSer(); + |_stat = _buff.serializeFrom(_val); + |if (_stat == Fw::FW_SERIALIZE_OK) { + | _stat = this->paramDelegatePtr->deserializeParam( + | _baseId, + | $idConstantName, + | this->$validityFlagName, + | _buff + | ); + |} + |if (_stat != Fw::FW_SERIALIZE_OK) { + | this->$validityFlagName = Fw::ParamValid::INVALID; + |}""" + ) + else + lines(s"this->$varName = $cppValue;") } private def writeGetterFunctionBodyForExternalParam(param: Param) = { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 863a79d47..a12454629 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1746,7 +1746,20 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -1799,7 +1812,20 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 8239f3f0b..7eb0132c2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2358,7 +2358,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -2411,7 +2424,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 2ff5b65d4..3e71b5705 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2436,7 +2436,20 @@ namespace M { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -2489,7 +2502,20 @@ namespace M { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 79b7b31cf..9a21a33e7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1453,7 +1453,20 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -1506,7 +1519,20 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 4335453ba..abd6eaabe 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1848,7 +1848,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -1901,7 +1914,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index db2459113..0200535a4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2080,7 +2080,20 @@ void PassiveTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -2133,7 +2146,20 @@ void PassiveTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 05ca7c764..e60002bc2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1746,7 +1746,20 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -1799,7 +1812,20 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 939982223..2e7044758 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2358,7 +2358,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -2411,7 +2424,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index a6a17c818..57dd6a92f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2434,7 +2434,20 @@ void QueuedTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + Fw::String _val = Fw::String("external default"); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); @@ -2487,7 +2500,20 @@ void QueuedTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { - // TODO: Set default value + A _val = A({1, 2, 3}); + _buff.resetSer(); + _stat = _buff.serializeFrom(_val); + if (_stat == Fw::FW_SERIALIZE_OK) { + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); + } + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); From 1984e58af696e3fb47feeaf9846d4bc5ecc8e5f0 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 13:48:16 -0700 Subject: [PATCH 17/42] Revise parameter code gen --- .../ComponentParameters.scala | 40 +++++++++-------- .../ActiveExternalParamsComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/ActiveSerialComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/ActiveTestComponentAc.ref.cpp | 44 ++++++++++++++++--- .../PassiveExternalParamsComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/PassiveSerialComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/PassiveTestComponentAc.ref.cpp | 44 ++++++++++++++++--- .../QueuedExternalParamsComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/QueuedSerialComponentAc.ref.cpp | 44 ++++++++++++++++--- .../base/QueuedTestComponentAc.ref.cpp | 44 ++++++++++++++++--- 10 files changed, 363 insertions(+), 73 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 57932f5b6..059a6e45a 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -49,8 +49,12 @@ case class ComponentParameters ( val idConstantName = paramIdConstantName(paramName) lines( s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); - |_stat = this->paramDelegatePtr->deserializeParam(_baseId, $idConstantName, this->$validityFlagName, _buff); - |""" + |_stat = this->paramDelegatePtr->deserializeParam( + | _baseId, + | $idConstantName, + | this->$validityFlagName, + | _buff + |);""" ) else lines(s"_stat = _buff.deserializeTo(this->$varName);") @@ -326,23 +330,21 @@ case class ComponentParameters ( if param.isExternal then val cppType = TypeCppWriter.getName(s, value.getType, "Fw::String") - val idConstantName = paramIdConstantName(param.getName) - val validityFlagName = paramValidityFlagName(paramName) - lines( - s"""|$cppType _val = $cppValue; - |_buff.resetSer(); - |_stat = _buff.serializeFrom(_val); - |if (_stat == Fw::FW_SERIALIZE_OK) { - | _stat = this->paramDelegatePtr->deserializeParam( - | _baseId, - | $idConstantName, - | this->$validityFlagName, - | _buff - | ); - |} - |if (_stat != Fw::FW_SERIALIZE_OK) { - | this->$validityFlagName = Fw::ParamValid::INVALID; - |}""" + val validityFlagName = paramValidityFlagName(param.getName) + List.concat( + lines( + s"""|$cppType _val = $cppValue; + |_buff.resetSer(); + |_stat = _buff.serializeFrom(_val);""" + ), + wrapInIf( + "_stat == Fw::FW_SERIALIZE_OK", + deserializeParam(param) + ), + wrapInIf( + "_stat != Fw::FW_SERIALIZE_OK", + lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") + ) ) else lines(s"this->$varName = $cppValue;") diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index a12454629..c58906bbb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1687,7 +1687,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1712,7 +1717,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1737,7 +1747,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -1750,6 +1765,7 @@ void ActiveExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -1778,7 +1794,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1803,7 +1824,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -1816,6 +1842,7 @@ void ActiveExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -1844,7 +1871,12 @@ void ActiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 7eb0132c2..5f38b210b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2299,7 +2299,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2324,7 +2329,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2349,7 +2359,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -2362,6 +2377,7 @@ void ActiveSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -2390,7 +2406,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2415,7 +2436,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -2428,6 +2454,7 @@ void ActiveSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -2456,7 +2483,12 @@ void ActiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 3e71b5705..14a384b4d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2377,7 +2377,12 @@ namespace M { // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2402,7 +2407,12 @@ namespace M { // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2427,7 +2437,12 @@ namespace M { // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -2440,6 +2455,7 @@ namespace M { _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -2468,7 +2484,12 @@ namespace M { // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2493,7 +2514,12 @@ namespace M { // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -2506,6 +2532,7 @@ namespace M { _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -2534,7 +2561,12 @@ namespace M { // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 9a21a33e7..e9f927d2c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1394,7 +1394,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1419,7 +1424,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1444,7 +1454,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -1457,6 +1472,7 @@ void PassiveExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -1485,7 +1501,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1510,7 +1531,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -1523,6 +1549,7 @@ void PassiveExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -1551,7 +1578,12 @@ void PassiveExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index abd6eaabe..30e1999c0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1789,7 +1789,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1814,7 +1819,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1839,7 +1849,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -1852,6 +1867,7 @@ void PassiveSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -1880,7 +1896,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1905,7 +1926,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -1918,6 +1944,7 @@ void PassiveSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -1946,7 +1973,12 @@ void PassiveSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 0200535a4..1c55d39b2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2021,7 +2021,12 @@ void PassiveTestComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2046,7 +2051,12 @@ void PassiveTestComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2071,7 +2081,12 @@ void PassiveTestComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -2084,6 +2099,7 @@ void PassiveTestComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -2112,7 +2128,12 @@ void PassiveTestComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2137,7 +2158,12 @@ void PassiveTestComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -2150,6 +2176,7 @@ void PassiveTestComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -2178,7 +2205,12 @@ void PassiveTestComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index e60002bc2..6fea35f13 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1687,7 +1687,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -1712,7 +1717,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -1737,7 +1747,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -1750,6 +1765,7 @@ void QueuedExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -1778,7 +1794,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -1803,7 +1824,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -1816,6 +1842,7 @@ void QueuedExternalParamsComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -1844,7 +1871,12 @@ void QueuedExternalParamsComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 2e7044758..bdbc9b5fd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2299,7 +2299,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2324,7 +2329,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2349,7 +2359,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -2362,6 +2377,7 @@ void QueuedSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -2390,7 +2406,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2415,7 +2436,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -2428,6 +2454,7 @@ void QueuedSerialComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -2456,7 +2483,12 @@ void QueuedSerialComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 57dd6a92f..afff82ec3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2375,7 +2375,12 @@ void QueuedTestComponentBase :: // Deserialize parameter if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } @@ -2400,7 +2405,12 @@ void QueuedTestComponentBase :: // Deserialize parameter if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } @@ -2425,7 +2435,12 @@ void QueuedTestComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; } @@ -2438,6 +2453,7 @@ void QueuedTestComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, @@ -2466,7 +2482,12 @@ void QueuedTestComponentBase :: // Deserialize parameter if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } @@ -2491,7 +2512,12 @@ void QueuedTestComponentBase :: // Deserialize parameter or use default value if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; } @@ -2504,6 +2530,7 @@ void QueuedTestComponentBase :: _buff.resetSer(); _stat = _buff.serializeFrom(_val); if (_stat == Fw::FW_SERIALIZE_OK) { + FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, @@ -2532,7 +2559,12 @@ void QueuedTestComponentBase :: // Deserialize parameter if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam(_baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, _buff); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } From f52387b362a313bdcc43beb292ba72fc12c5fa59 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 17:25:16 -0700 Subject: [PATCH 18/42] Revise param code gen --- .../ComponentParameters.scala | 80 ++++--- .../ActiveExternalParamsComponentAc.ref.cpp | 180 ++++++++-------- .../base/ActiveParamsComponentAc.ref.cpp | 24 ++- .../base/ActiveSerialComponentAc.ref.cpp | 204 +++++++++--------- .../base/ActiveTestComponentAc.ref.cpp | 204 +++++++++--------- .../PassiveExternalParamsComponentAc.ref.cpp | 180 ++++++++-------- .../base/PassiveParamsComponentAc.ref.cpp | 24 ++- .../base/PassiveSerialComponentAc.ref.cpp | 204 +++++++++--------- .../base/PassiveTestComponentAc.ref.cpp | 204 +++++++++--------- .../QueuedExternalParamsComponentAc.ref.cpp | 180 ++++++++-------- .../base/QueuedParamsComponentAc.ref.cpp | 24 ++- .../base/QueuedSerialComponentAc.ref.cpp | 204 +++++++++--------- .../base/QueuedTestComponentAc.ref.cpp | 204 +++++++++--------- 13 files changed, 1027 insertions(+), 889 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 059a6e45a..7ebbcbe6a 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -147,7 +147,7 @@ case class ComponentParameters ( ) ) - private def getParam(param: Param) = { + private def getParamFromPort(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) val prmGetPortInvokerName = outputPortInvokerName(prmGetPort.get) @@ -357,21 +357,21 @@ case class ComponentParameters ( lines( s"""|$paramType _local{}; |this->m_paramLock.lock(); - |Fw::ParamBuffer _getBuff; - |// Get the base ID - |const FwPrmIdType _baseId = static_cast(this->getIdBase()); - |// Get the local ID to pass to the delegate - |const FwPrmIdType _localId = $idConstantName; - | - |FW_ASSERT(this->paramDelegatePtr != nullptr); - |// Get the external parameter from the delegate - |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - |if(_stat == Fw::FW_SERIALIZE_OK) { - | _stat = _getBuff.deserializeTo(_local); - | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - | valid = this->$validityFlagName; - |} else { - | valid = Fw::ParamValid::INVALID; + |valid = this->$validityFlagName; + |if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + | Fw::ParamBuffer _getBuff; + | FW_ASSERT(this->paramDelegatePtr != nullptr); + | Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + | static_cast(this->getIdBase()), + | $idConstantName, + | _getBuff + | ); + | if(_stat == Fw::FW_SERIALIZE_OK) { + | _stat = _getBuff.deserializeTo(_local); + | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + | } else { + | valid = Fw::ParamValid::INVALID; + | } |} |this->m_paramLock.unLock(); |return _local; @@ -379,18 +379,48 @@ case class ComponentParameters ( ) } + private def getParamFromComponent(param: Param) = { + if param.isExternal + then + val idConstantName = paramIdConstantName(param.getName) + lines( + s"""|Fw::ParamBuffer _getBuff; + |FW_ASSERT(this->paramDelegatePtr != nullptr); + |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + | static_cast(this->getIdBase()), + | $idConstantName, + | _getBuff + |); + |if(_stat == Fw::FW_SERIALIZE_OK) { + | _stat = _getBuff.deserializeTo(_local); + | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + |} else { + | valid = Fw::ParamValid::INVALID; + |}""" + ) + else + val variableName = paramVariableName(param.getName) + lines(s"_local = this->$variableName;") + } + private def writeGetterFunctionBodyForInternalParam(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") val validityFlagName = paramValidityFlagName(param.getName) val variableName = paramVariableName(param.getName) - lines( - s"""|$paramType _local{}; - |this->m_paramLock.lock(); - |valid = this->$validityFlagName; - |_local = this->$variableName; - |this->m_paramLock.unLock(); - |return _local; - |""" + List.concat( + lines( + s"""|$paramType _local{}; + |this->m_paramLock.lock(); + |valid = this->$validityFlagName;""" + ), + wrapInIf( + "(valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)", + getParamFromComponent(param) + ), + lines( + """|this->m_paramLock.unLock(); + |return _local;""" + ) ) } @@ -400,7 +430,7 @@ case class ComponentParameters ( val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) List.concat( - getParam(param), + getParamFromPort(param), { val orUseDefaultValue = param.default match { case Some(_) => " or use default value" diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index c58906bbb..23fcffe7a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -3535,21 +3535,21 @@ I32 ActiveExternalParamsComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3560,21 +3560,21 @@ F64 ActiveExternalParamsComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3585,21 +3585,21 @@ Fw::ParamString ActiveExternalParamsComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3610,21 +3610,21 @@ E ActiveExternalParamsComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3635,21 +3635,21 @@ A ActiveExternalParamsComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3660,21 +3660,21 @@ S ActiveExternalParamsComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 306d8f84a..cb52571dc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -3471,7 +3471,9 @@ U32 ActiveParamsComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -3482,7 +3484,9 @@ F64 ActiveParamsComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -3493,7 +3497,9 @@ Fw::ParamString ActiveParamsComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -3504,7 +3510,9 @@ E ActiveParamsComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -3515,7 +3523,9 @@ A ActiveParamsComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -3526,7 +3536,9 @@ S ActiveParamsComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 5f38b210b..217d483bc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -7173,7 +7173,9 @@ U32 ActiveSerialComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -7184,7 +7186,9 @@ F64 ActiveSerialComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -7195,7 +7199,9 @@ Fw::ParamString ActiveSerialComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -7206,7 +7212,9 @@ E ActiveSerialComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -7217,7 +7225,9 @@ A ActiveSerialComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -7228,7 +7238,9 @@ S ActiveSerialComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -7238,21 +7250,21 @@ I32 ActiveSerialComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7263,21 +7275,21 @@ F64 ActiveSerialComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7288,21 +7300,21 @@ Fw::ParamString ActiveSerialComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7313,21 +7325,21 @@ E ActiveSerialComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7338,21 +7350,21 @@ A ActiveSerialComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7363,21 +7375,21 @@ S ActiveSerialComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 14a384b4d..3b650937d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -7005,7 +7005,9 @@ namespace M { U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -7016,7 +7018,9 @@ namespace M { F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -7027,7 +7031,9 @@ namespace M { Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -7038,7 +7044,9 @@ namespace M { E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -7049,7 +7057,9 @@ namespace M { A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -7060,7 +7070,9 @@ namespace M { S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -7070,21 +7082,21 @@ namespace M { { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7095,21 +7107,21 @@ namespace M { { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7120,21 +7132,21 @@ namespace M { { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7145,21 +7157,21 @@ namespace M { { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7170,21 +7182,21 @@ namespace M { { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7195,21 +7207,21 @@ namespace M { { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index e9f927d2c..1c51a2698 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -2573,21 +2573,21 @@ I32 PassiveExternalParamsComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -2598,21 +2598,21 @@ F64 PassiveExternalParamsComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -2623,21 +2623,21 @@ Fw::ParamString PassiveExternalParamsComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -2648,21 +2648,21 @@ E PassiveExternalParamsComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -2673,21 +2673,21 @@ A PassiveExternalParamsComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -2698,21 +2698,21 @@ S PassiveExternalParamsComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 97489a3cb..fec4534ef 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -2509,7 +2509,9 @@ U32 PassiveParamsComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -2520,7 +2522,9 @@ F64 PassiveParamsComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -2531,7 +2535,9 @@ Fw::ParamString PassiveParamsComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -2542,7 +2548,9 @@ E PassiveParamsComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -2553,7 +2561,9 @@ A PassiveParamsComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -2564,7 +2574,9 @@ S PassiveParamsComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 30e1999c0..acce8ee7b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -5071,7 +5071,9 @@ U32 PassiveSerialComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -5082,7 +5084,9 @@ F64 PassiveSerialComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -5093,7 +5097,9 @@ Fw::ParamString PassiveSerialComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -5104,7 +5110,9 @@ E PassiveSerialComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -5115,7 +5123,9 @@ A PassiveSerialComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -5126,7 +5136,9 @@ S PassiveSerialComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -5136,21 +5148,21 @@ I32 PassiveSerialComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5161,21 +5173,21 @@ F64 PassiveSerialComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5186,21 +5198,21 @@ Fw::ParamString PassiveSerialComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5211,21 +5223,21 @@ E PassiveSerialComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5236,21 +5248,21 @@ A PassiveSerialComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5261,21 +5273,21 @@ S PassiveSerialComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 1c55d39b2..ed6400399 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -5251,7 +5251,9 @@ U32 PassiveTestComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -5262,7 +5264,9 @@ F64 PassiveTestComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -5273,7 +5277,9 @@ Fw::ParamString PassiveTestComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -5284,7 +5290,9 @@ E PassiveTestComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -5295,7 +5303,9 @@ A PassiveTestComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -5306,7 +5316,9 @@ S PassiveTestComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -5316,21 +5328,21 @@ I32 PassiveTestComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5341,21 +5353,21 @@ F64 PassiveTestComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5366,21 +5378,21 @@ Fw::ParamString PassiveTestComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5391,21 +5403,21 @@ E PassiveTestComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5416,21 +5428,21 @@ A PassiveTestComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -5441,21 +5453,21 @@ S PassiveTestComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 6fea35f13..f0873ad77 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -3535,21 +3535,21 @@ I32 QueuedExternalParamsComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3560,21 +3560,21 @@ F64 QueuedExternalParamsComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3585,21 +3585,21 @@ Fw::ParamString QueuedExternalParamsComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3610,21 +3610,21 @@ E QueuedExternalParamsComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3635,21 +3635,21 @@ A QueuedExternalParamsComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -3660,21 +3660,21 @@ S QueuedExternalParamsComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 2f58369f7..1e8715a3c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -3471,7 +3471,9 @@ U32 QueuedParamsComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -3482,7 +3484,9 @@ F64 QueuedParamsComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -3493,7 +3497,9 @@ Fw::ParamString QueuedParamsComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -3504,7 +3510,9 @@ E QueuedParamsComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -3515,7 +3523,9 @@ A QueuedParamsComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -3526,7 +3536,9 @@ S QueuedParamsComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index bdbc9b5fd..fbda40de5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -7173,7 +7173,9 @@ U32 QueuedSerialComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -7184,7 +7186,9 @@ F64 QueuedSerialComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -7195,7 +7199,9 @@ Fw::ParamString QueuedSerialComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -7206,7 +7212,9 @@ E QueuedSerialComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -7217,7 +7225,9 @@ A QueuedSerialComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -7228,7 +7238,9 @@ S QueuedSerialComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -7238,21 +7250,21 @@ I32 QueuedSerialComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7263,21 +7275,21 @@ F64 QueuedSerialComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7288,21 +7300,21 @@ Fw::ParamString QueuedSerialComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7313,21 +7325,21 @@ E QueuedSerialComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7338,21 +7350,21 @@ A QueuedSerialComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7363,21 +7375,21 @@ S QueuedSerialComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index afff82ec3..c0d240def 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -7003,7 +7003,9 @@ U32 QueuedTestComponentBase :: U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; - _local = this->m_ParamU32; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamU32; + } this->m_paramLock.unLock(); return _local; } @@ -7014,7 +7016,9 @@ F64 QueuedTestComponentBase :: F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; - _local = this->m_ParamF64; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamF64; + } this->m_paramLock.unLock(); return _local; } @@ -7025,7 +7029,9 @@ Fw::ParamString QueuedTestComponentBase :: Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; - _local = this->m_ParamString; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamString; + } this->m_paramLock.unLock(); return _local; } @@ -7036,7 +7042,9 @@ E QueuedTestComponentBase :: E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; - _local = this->m_ParamEnum; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamEnum; + } this->m_paramLock.unLock(); return _local; } @@ -7047,7 +7055,9 @@ A QueuedTestComponentBase :: A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; - _local = this->m_ParamArray; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamArray; + } this->m_paramLock.unLock(); return _local; } @@ -7058,7 +7068,9 @@ S QueuedTestComponentBase :: S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; - _local = this->m_ParamStruct; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + _local = this->m_ParamStruct; + } this->m_paramLock.unLock(); return _local; } @@ -7068,21 +7080,21 @@ I32 QueuedTestComponentBase :: { I32 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamI32Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamI32Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7093,21 +7105,21 @@ F64 QueuedTestComponentBase :: { F64 _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamF64Ext_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamF64Ext_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7118,21 +7130,21 @@ Fw::ParamString QueuedTestComponentBase :: { Fw::ParamString _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStringExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStringExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7143,21 +7155,21 @@ E QueuedTestComponentBase :: { E _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamEnumExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamEnumExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7168,21 +7180,21 @@ A QueuedTestComponentBase :: { A _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamArrayExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamArrayExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; @@ -7193,21 +7205,21 @@ S QueuedTestComponentBase :: { S _local{}; this->m_paramLock.lock(); - Fw::ParamBuffer _getBuff; - // Get the base ID - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - // Get the local ID to pass to the delegate - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - - FW_ASSERT(this->paramDelegatePtr != nullptr); - // Get the external parameter from the delegate - Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam(_baseId, _localId, _getBuff); - if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); - FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - valid = this->m_param_ParamStructExt_valid; - } else { - valid = Fw::ParamValid::INVALID; + valid = this->m_param_ParamStructExt_valid; + if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { + Fw::ParamBuffer _getBuff; + FW_ASSERT(this->paramDelegatePtr != nullptr); + Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _getBuff + ); + if(_stat == Fw::FW_SERIALIZE_OK) { + _stat = _getBuff.deserializeTo(_local); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + } else { + valid = Fw::ParamValid::INVALID; + } } this->m_paramLock.unLock(); return _local; From eb757f77e26fc1e89eb1638b48bf24d0b5985a01 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 17:39:46 -0700 Subject: [PATCH 19/42] Refactor parameter code gen --- .../ComponentParameters.scala | 118 +++++++----------- 1 file changed, 43 insertions(+), 75 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 7ebbcbe6a..fff8b1396 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -104,9 +104,7 @@ case class ComponentParameters ( ) ), CppDoc.Type(writeParamType(param.paramType, "Fw::ParamString")), - if param.isExternal - then writeGetterFunctionBodyForExternalParam(param) - else writeGetterFunctionBodyForInternalParam(param) + writeGetterFunctionBody(param) ) private def getGetterFunctions: List[CppDoc.Class.Member] = @@ -147,6 +145,47 @@ case class ComponentParameters ( ) ) + private def getParamDelegate = + addAccessTagAndComment( + "private", + "Parameter delegate", + List( + linesClassMember( + lines( + s"""| + |//! Delegate to serialize/deserialize an externally stored parameter + |Fw::ParamExternalDelegate* paramDelegatePtr; + |""" + ) + ) + ), + CppDoc.Lines.Hpp + ) + + private def getParamFromComponent(param: Param) = { + if param.isExternal + then + val idConstantName = paramIdConstantName(param.getName) + lines( + s"""|Fw::ParamBuffer _getBuff; + |FW_ASSERT(this->paramDelegatePtr != nullptr); + |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + | static_cast(this->getIdBase()), + | $idConstantName, + | _getBuff + |); + |if(_stat == Fw::FW_SERIALIZE_OK) { + | _stat = _getBuff.deserializeTo(_local); + | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); + |} else { + | valid = Fw::ParamValid::INVALID; + |}""" + ) + else + val variableName = paramVariableName(param.getName) + lines(s"_local = this->$variableName;") + } + private def getParamFromPort(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) @@ -165,23 +204,6 @@ case class ComponentParameters ( ) } - private def getParamDelegate = - addAccessTagAndComment( - "private", - "Parameter delegate", - List( - linesClassMember( - lines( - s"""| - |//! Delegate to serialize/deserialize an externally stored parameter - |Fw::ParamExternalDelegate* paramDelegatePtr; - |""" - ) - ) - ), - CppDoc.Lines.Hpp - ) - private def getParamIds = linesClassMember( List.concat( Line.blank :: lines(s"//! Parameter IDs"), @@ -350,63 +372,9 @@ case class ComponentParameters ( lines(s"this->$varName = $cppValue;") } - private def writeGetterFunctionBodyForExternalParam(param: Param) = { - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val idConstantName = paramIdConstantName(param.getName) - val validityFlagName = paramValidityFlagName(param.getName) - lines( - s"""|$paramType _local{}; - |this->m_paramLock.lock(); - |valid = this->$validityFlagName; - |if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - | Fw::ParamBuffer _getBuff; - | FW_ASSERT(this->paramDelegatePtr != nullptr); - | Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - | static_cast(this->getIdBase()), - | $idConstantName, - | _getBuff - | ); - | if(_stat == Fw::FW_SERIALIZE_OK) { - | _stat = _getBuff.deserializeTo(_local); - | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - | } else { - | valid = Fw::ParamValid::INVALID; - | } - |} - |this->m_paramLock.unLock(); - |return _local; - |""" - ) - } - - private def getParamFromComponent(param: Param) = { - if param.isExternal - then - val idConstantName = paramIdConstantName(param.getName) - lines( - s"""|Fw::ParamBuffer _getBuff; - |FW_ASSERT(this->paramDelegatePtr != nullptr); - |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - | static_cast(this->getIdBase()), - | $idConstantName, - | _getBuff - |); - |if(_stat == Fw::FW_SERIALIZE_OK) { - | _stat = _getBuff.deserializeTo(_local); - | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); - |} else { - | valid = Fw::ParamValid::INVALID; - |}""" - ) - else - val variableName = paramVariableName(param.getName) - lines(s"_local = this->$variableName;") - } - - private def writeGetterFunctionBodyForInternalParam(param: Param) = { + private def writeGetterFunctionBody(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") val validityFlagName = paramValidityFlagName(param.getName) - val variableName = paramVariableName(param.getName) List.concat( lines( s"""|$paramType _local{}; From a74329a4dde2de24f662b9a795a11d1e420be6ab Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 19:41:34 -0700 Subject: [PATCH 20/42] Revise parameter code gen --- .../ComponentParameters.scala | 30 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 162 ++++++++++++------ .../base/ActiveSerialComponentAc.ref.cpp | 162 ++++++++++++------ .../base/ActiveTestComponentAc.ref.cpp | 162 ++++++++++++------ .../PassiveExternalParamsComponentAc.ref.cpp | 162 ++++++++++++------ .../base/PassiveSerialComponentAc.ref.cpp | 162 ++++++++++++------ .../base/PassiveTestComponentAc.ref.cpp | 162 ++++++++++++------ .../QueuedExternalParamsComponentAc.ref.cpp | 162 ++++++++++++------ .../base/QueuedSerialComponentAc.ref.cpp | 162 ++++++++++++------ .../base/QueuedTestComponentAc.ref.cpp | 162 ++++++++++++------ 10 files changed, 991 insertions(+), 497 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index fff8b1396..ae51f8e1b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -540,27 +540,35 @@ case class ComponentParameters ( private def writeSetterBodyForExternalParam(param: Param) = { val idConstantName = paramIdConstantName(param.getName) - val varName = paramVariableName(param.getName) + val validityFlagName = paramValidityFlagName(param.getName) lines( - s"""|const FwPrmIdType _localId = $idConstantName; - |const FwPrmIdType _baseId = static_cast(this->getIdBase()); + s"""|Fw::CmdResponse _response{}; | + |this->m_paramLock.lock(); + |// Update the external parameter |FW_ASSERT(this->paramDelegatePtr != nullptr); - |// Call the delegate serialize function for $varName |const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - | _baseId, - | _localId, + | static_cast(this->getIdBase()), + | $idConstantName, | Fw::ParamValid::VALID, | val |); - |if (_stat != Fw::FW_SERIALIZE_OK) { - | return Fw::CmdResponse::VALIDATION_ERROR; + |// Set response and update component state + |if (_stat == Fw::FW_SERIALIZE_OK) { + | this->$validityFlagName = Fw::ParamValid::VALID; + | _response = Fw::CmdResponse::OK; + |} + |else { + | _response = Fw::CmdResponse::VALIDATION_ERROR; |} + |this->m_paramLock.unLock(); | |// Call notifier - |this->parameterUpdated($idConstantName); - |return Fw::CmdResponse::OK; - |""" + |if (_response == Fw::CmdResponse::OK) { + | this->parameterUpdated($idConstantName); + |} + |// Return response + |return _response;""" ) } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 23fcffe7a..b875483f2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4702,139 +4702,193 @@ void ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 217d483bc..92307c3c5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9237,139 +9237,193 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveSerialComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 3b650937d..89fa90ef5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9024,139 +9024,193 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse ActiveTestComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 1c51a2698..e4be29b95 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3170,139 +3170,193 @@ void PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index acce8ee7b..4c9b19121 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -5983,139 +5983,193 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveSerialComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index ed6400399..729fd0eec 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6218,139 +6218,193 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse PassiveTestComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index f0873ad77..aefa251e6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4726,139 +4726,193 @@ void QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index fbda40de5..b5ee82f4e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9261,139 +9261,193 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedSerialComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index c0d240def..80bf716ad 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9046,139 +9046,193 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamI32Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamI32Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamF64Ext(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamF64Ext const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamStringExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStringExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStringExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamEnumExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamEnumExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamArrayExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamArrayExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; + } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } + // Return response + return _response; } Fw::CmdResponse QueuedTestComponentBase :: paramSet_ParamStructExt(Fw::SerialBufferBase& val) { - const FwPrmIdType _localId = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); + Fw::CmdResponse _response{}; + this->m_paramLock.lock(); + // Update the external parameter FW_ASSERT(this->paramDelegatePtr != nullptr); - // Call the delegate serialize function for m_ParamStructExt const Fw::SerializeStatus _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - _localId, + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, Fw::ParamValid::VALID, val ); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; + // Set response and update component state + if (_stat == Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::VALID; + _response = Fw::CmdResponse::OK; + } + else { + _response = Fw::CmdResponse::VALIDATION_ERROR; } + this->m_paramLock.unLock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - return Fw::CmdResponse::OK; + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } + // Return response + return _response; } // ---------------------------------------------------------------------- From d9fe4d38b10a455742eeae19659bcdf727acb911 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Mon, 27 Apr 2026 20:41:46 -0700 Subject: [PATCH 21/42] Revise param code gen --- .../ComponentParameters.scala | 43 ++- .../ActiveExternalParamsComponentAc.ref.cpp | 156 +++++------ .../base/ActiveParamsComponentAc.ref.cpp | 96 +++---- .../base/ActiveSerialComponentAc.ref.cpp | 252 +++++++----------- .../base/ActiveTestComponentAc.ref.cpp | 252 +++++++----------- .../PassiveExternalParamsComponentAc.ref.cpp | 156 +++++------ .../base/PassiveParamsComponentAc.ref.cpp | 96 +++---- .../base/PassiveSerialComponentAc.ref.cpp | 252 +++++++----------- .../base/PassiveTestComponentAc.ref.cpp | 252 +++++++----------- .../QueuedExternalParamsComponentAc.ref.cpp | 156 +++++------ .../base/QueuedParamsComponentAc.ref.cpp | 96 +++---- .../base/QueuedSerialComponentAc.ref.cpp | 252 +++++++----------- .../base/QueuedTestComponentAc.ref.cpp | 252 +++++++----------- 13 files changed, 935 insertions(+), 1376 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index ae51f8e1b..c6d41d9d6 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -487,48 +487,39 @@ case class ComponentParameters ( val prmSetIsConnected = outputPortIsConnectedName(prmSetPortName) val prmSetPortInvokerName = outputPortInvokerName(prmSetPort.get) List.concat( - lines( - s"""|Fw::ParamBuffer _saveBuff; - |FwPrmIdType _id; - |Fw::SerializeStatus _stat; - | - |""" - ), wrapInIf( s"this->$prmSetIsConnected(0)", List.concat( + lines( + """|Fw::ParamBuffer _saveBuff; + |const FwIdType idBase = this->getIdBase(); + |// Serialize the parameter + |this->m_paramLock.lock();""" + ), if (param.isExternal) then lines( - s"""|// Get the local and base ID to pass to the delegate - |_id = $idConstantName; - |const FwPrmIdType _baseId = static_cast(this->getIdBase()); - | - |FW_ASSERT(this->paramDelegatePtr != nullptr); - |this->m_paramLock.lock(); - |_stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - |this->m_paramLock.unLock(); - |""" + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); + |const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + | static_cast(idBase), + | $idConstantName, + | _saveBuff + |);""" ) else lines ( - s"""|this->m_paramLock.lock(); - |_stat = _saveBuff.serializeFrom($paramVarName); - |this->m_paramLock.unLock(); - |""" + s"const Fw::SerializeStatus _stat = _saveBuff.serializeFrom($paramVarName);" ), lines( - s"""|if (_stat != Fw::FW_SERIALIZE_OK) { + s"""|this->m_paramLock.unlock(); + |if (_stat != Fw::FW_SERIALIZE_OK) { | return Fw::CmdResponse::VALIDATION_ERROR; |} - | - |_id = static_cast(this->getIdBase() + $idConstantName); - | |// Save the parameter |this->$prmSetPortInvokerName( | 0, - | _id, + | static_cast(idBase + $idConstantName), | _saveBuff |); - | + |// Return the command response |return Fw::CmdResponse::OK; |""" ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index b875483f2..0c158842f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4898,31 +4898,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4932,31 +4928,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4966,31 +4958,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5000,31 +4988,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5034,31 +5018,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5068,31 +5048,27 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index cb52571dc..dfe5ca22f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4678,26 +4678,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4707,26 +4703,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4736,26 +4728,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4765,26 +4753,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4794,26 +4778,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4823,26 +4803,22 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 92307c3c5..fd0f56853 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9433,26 +9433,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9462,26 +9458,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9491,26 +9483,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9520,26 +9508,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9549,26 +9533,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9578,26 +9558,22 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9607,31 +9583,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9641,31 +9613,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9675,31 +9643,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9709,31 +9673,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9743,31 +9703,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9777,31 +9733,27 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 89fa90ef5..08a8c8d90 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9220,26 +9220,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9249,26 +9245,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9278,26 +9270,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9307,26 +9295,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9336,26 +9320,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9365,26 +9345,22 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9394,31 +9370,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9428,31 +9400,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9462,31 +9430,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9496,31 +9460,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9530,31 +9490,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9564,31 +9520,27 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index e4be29b95..4a326394b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3366,31 +3366,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3400,31 +3396,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3434,31 +3426,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3468,31 +3456,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3502,31 +3486,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3536,31 +3516,27 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index fec4534ef..8f9e6d5dd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3146,26 +3146,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3175,26 +3171,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3204,26 +3196,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3233,26 +3221,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3262,26 +3246,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -3291,26 +3271,22 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 4c9b19121..1c7bcd315 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -6179,26 +6179,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6208,26 +6204,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6237,26 +6229,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6266,26 +6254,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6295,26 +6279,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6324,26 +6304,22 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6353,31 +6329,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6387,31 +6359,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6421,31 +6389,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6455,31 +6419,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6489,31 +6449,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6523,31 +6479,27 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 729fd0eec..df49588b7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6414,26 +6414,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6443,26 +6439,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6472,26 +6464,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6501,26 +6489,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6530,26 +6514,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6559,26 +6539,22 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6588,31 +6564,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6622,31 +6594,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6656,31 +6624,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6690,31 +6654,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6724,31 +6684,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -6758,31 +6714,27 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index aefa251e6..9e20dbaaa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4922,31 +4922,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4956,31 +4952,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4990,31 +4982,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5024,31 +5012,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5058,31 +5042,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -5092,31 +5072,27 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 1e8715a3c..ad313bf1b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4702,26 +4702,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4731,26 +4727,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4760,26 +4752,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4789,26 +4777,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4818,26 +4802,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -4847,26 +4827,22 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index b5ee82f4e..f8dd61637 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9457,26 +9457,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9486,26 +9482,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9515,26 +9507,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9544,26 +9532,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9573,26 +9557,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9602,26 +9582,22 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9631,31 +9607,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9665,31 +9637,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9699,31 +9667,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9733,31 +9697,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9767,31 +9727,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9801,31 +9757,27 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 80bf716ad..3381960f3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9242,26 +9242,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamU32() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMU32); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMU32), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9271,26 +9267,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9300,26 +9292,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamString() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRING); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRING), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9329,26 +9317,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnum() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUM); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUM), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9358,26 +9342,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArray() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAY); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAY), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9387,26 +9367,22 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStruct() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unLock(); + const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9416,31 +9392,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamI32Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMI32EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMI32EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMI32EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9450,31 +9422,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64Ext() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMF64EXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMF64EXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMF64EXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9484,31 +9452,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStringExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRINGEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRINGEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9518,31 +9482,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnumExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMENUMEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMENUMEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9552,31 +9512,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArrayExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMARRAYEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMARRAYEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } @@ -9586,31 +9542,27 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStructExt() { - Fw::ParamBuffer _saveBuff; - FwPrmIdType _id; - Fw::SerializeStatus _stat; if (this->isConnected_prmSetOut_OutputPort(0)) { - // Get the local and base ID to pass to the delegate - _id = PARAMID_PARAMSTRUCTEXT; - const FwPrmIdType _baseId = static_cast(this->getIdBase()); - - FW_ASSERT(this->paramDelegatePtr != nullptr); + // Serialize the parameter + Fw::ParamBuffer _saveBuff; this->m_paramLock.lock(); - _stat = this->paramDelegatePtr->serializeParam(_baseId, _id, _saveBuff); - this->m_paramLock.unLock(); + FW_ASSERT(this->paramDelegatePtr != nullptr); + const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + static_cast(this->getIdBase()), + PARAMID_PARAMSTRUCTEXT, + _saveBuff + ); + this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { return Fw::CmdResponse::VALIDATION_ERROR; } - - _id = static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT); - // Save the parameter this->prmSetOut_out( 0, - _id, + static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), _saveBuff ); - + // Return the command response return Fw::CmdResponse::OK; } From 0ae960f65464f676aac0a8c18646751471645f45 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 10:35:33 -0700 Subject: [PATCH 22/42] Revise parameter code gen --- .../ComponentParameters.scala | 5 +- .../ActiveExternalParamsComponentAc.ref.cpp | 74 +++++++------ .../base/ActiveParamsComponentAc.ref.cpp | 30 +++-- .../base/ActiveSerialComponentAc.ref.cpp | 104 ++++++++++-------- .../base/ActiveTestComponentAc.ref.cpp | 104 ++++++++++-------- .../PassiveExternalParamsComponentAc.ref.cpp | 74 +++++++------ .../base/PassiveParamsComponentAc.ref.cpp | 30 +++-- .../base/PassiveSerialComponentAc.ref.cpp | 104 ++++++++++-------- .../base/PassiveTestComponentAc.ref.cpp | 104 ++++++++++-------- .../QueuedExternalParamsComponentAc.ref.cpp | 74 +++++++------ .../base/QueuedParamsComponentAc.ref.cpp | 30 +++-- .../base/QueuedSerialComponentAc.ref.cpp | 104 ++++++++++-------- .../base/QueuedTestComponentAc.ref.cpp | 104 ++++++++++-------- 13 files changed, 505 insertions(+), 436 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index c6d41d9d6..4787b3caa 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -359,10 +359,7 @@ case class ComponentParameters ( |_buff.resetSer(); |_stat = _buff.serializeFrom(_val);""" ), - wrapInIf( - "_stat == Fw::FW_SERIALIZE_OK", - deserializeParam(param) - ), + deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 0c158842f..5da013b11 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1764,15 +1764,13 @@ void ActiveExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1841,15 +1839,13 @@ void ActiveExternalParamsComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -4899,12 +4895,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -4915,7 +4912,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -4929,12 +4926,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -4945,7 +4943,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -4959,12 +4957,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -4975,7 +4974,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -4989,12 +4988,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -5005,7 +5005,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -5019,12 +5019,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -5035,7 +5036,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -5049,12 +5050,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -5065,7 +5067,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index dfe5ca22f..57af67107 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4679,8 +4679,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -4690,7 +4691,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -4704,8 +4705,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -4715,7 +4717,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -4729,8 +4731,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -4740,7 +4743,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -4754,8 +4757,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -4765,7 +4769,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -4779,8 +4783,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -4790,7 +4795,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -4804,8 +4809,9 @@ Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -4815,7 +4821,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index fd0f56853..e8fc1c8f4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2376,15 +2376,13 @@ void ActiveSerialComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2453,15 +2451,13 @@ void ActiveSerialComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -9434,8 +9430,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -9445,7 +9442,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -9459,8 +9456,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -9470,7 +9468,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -9484,8 +9482,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -9495,7 +9494,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -9509,8 +9508,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -9520,7 +9520,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -9534,8 +9534,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -9545,7 +9546,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -9559,8 +9560,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -9570,7 +9572,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -9584,12 +9586,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -9600,7 +9603,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -9614,12 +9617,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -9630,7 +9634,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -9644,12 +9648,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -9660,7 +9665,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -9674,12 +9679,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -9690,7 +9696,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -9704,12 +9710,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -9720,7 +9727,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -9734,12 +9741,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -9750,7 +9758,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 08a8c8d90..ec96b6787 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2454,15 +2454,13 @@ namespace M { Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2531,15 +2529,13 @@ namespace M { A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -9221,8 +9217,9 @@ namespace M { paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -9232,7 +9229,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -9246,8 +9243,9 @@ namespace M { paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -9257,7 +9255,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -9271,8 +9269,9 @@ namespace M { paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -9282,7 +9281,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -9296,8 +9295,9 @@ namespace M { paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -9307,7 +9307,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -9321,8 +9321,9 @@ namespace M { paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -9332,7 +9333,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -9346,8 +9347,9 @@ namespace M { paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -9357,7 +9359,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -9371,12 +9373,13 @@ namespace M { paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -9387,7 +9390,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -9401,12 +9404,13 @@ namespace M { paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -9417,7 +9421,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -9431,12 +9435,13 @@ namespace M { paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -9447,7 +9452,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -9461,12 +9466,13 @@ namespace M { paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -9477,7 +9483,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -9491,12 +9497,13 @@ namespace M { paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -9507,7 +9514,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -9521,12 +9528,13 @@ namespace M { paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -9537,7 +9545,7 @@ namespace M { // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 4a326394b..bcd9f8d4d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1471,15 +1471,13 @@ void PassiveExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1548,15 +1546,13 @@ void PassiveExternalParamsComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -3367,12 +3363,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -3383,7 +3380,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -3397,12 +3394,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -3413,7 +3411,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -3427,12 +3425,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -3443,7 +3442,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -3457,12 +3456,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -3473,7 +3473,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -3487,12 +3487,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -3503,7 +3504,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -3517,12 +3518,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -3533,7 +3535,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 8f9e6d5dd..998c668ac 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3147,8 +3147,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -3158,7 +3159,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -3172,8 +3173,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -3183,7 +3185,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -3197,8 +3199,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -3208,7 +3211,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -3222,8 +3225,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -3233,7 +3237,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -3247,8 +3251,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -3258,7 +3263,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -3272,8 +3277,9 @@ Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -3283,7 +3289,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 1c7bcd315..41a0854d8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1866,15 +1866,13 @@ void PassiveSerialComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1943,15 +1941,13 @@ void PassiveSerialComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -6180,8 +6176,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -6191,7 +6188,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -6205,8 +6202,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -6216,7 +6214,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -6230,8 +6228,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -6241,7 +6240,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -6255,8 +6254,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -6266,7 +6266,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -6280,8 +6280,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -6291,7 +6292,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -6305,8 +6306,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -6316,7 +6318,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -6330,12 +6332,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -6346,7 +6349,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -6360,12 +6363,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -6376,7 +6380,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -6390,12 +6394,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -6406,7 +6411,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -6420,12 +6425,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -6436,7 +6442,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -6450,12 +6456,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -6466,7 +6473,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -6480,12 +6487,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -6496,7 +6504,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index df49588b7..f70bb1090 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2098,15 +2098,13 @@ void PassiveTestComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2175,15 +2173,13 @@ void PassiveTestComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -6415,8 +6411,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -6426,7 +6423,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -6440,8 +6437,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -6451,7 +6449,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -6465,8 +6463,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -6476,7 +6475,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -6490,8 +6489,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -6501,7 +6501,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -6515,8 +6515,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -6526,7 +6527,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -6540,8 +6541,9 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -6551,7 +6553,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -6565,12 +6567,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -6581,7 +6584,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -6595,12 +6598,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -6611,7 +6615,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -6625,12 +6629,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -6641,7 +6646,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -6655,12 +6660,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -6671,7 +6677,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -6685,12 +6691,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -6701,7 +6708,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -6715,12 +6722,13 @@ Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -6731,7 +6739,7 @@ Fw::CmdResponse PassiveTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 9e20dbaaa..5cfd8ccc4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1764,15 +1764,13 @@ void QueuedExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -1841,15 +1839,13 @@ void QueuedExternalParamsComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -4923,12 +4919,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -4939,7 +4936,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -4953,12 +4950,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -4969,7 +4967,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -4983,12 +4981,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -4999,7 +4998,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -5013,12 +5012,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -5029,7 +5029,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -5043,12 +5043,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -5059,7 +5060,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -5073,12 +5074,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -5089,7 +5091,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index ad313bf1b..19a4c7750 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4703,8 +4703,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -4714,7 +4715,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -4728,8 +4729,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -4739,7 +4741,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -4753,8 +4755,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -4764,7 +4767,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -4778,8 +4781,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -4789,7 +4793,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -4803,8 +4807,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -4814,7 +4819,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -4828,8 +4833,9 @@ Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -4839,7 +4845,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index f8dd61637..860364f19 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2376,15 +2376,13 @@ void QueuedSerialComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2453,15 +2451,13 @@ void QueuedSerialComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -9458,8 +9454,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -9469,7 +9466,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -9483,8 +9480,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -9494,7 +9492,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -9508,8 +9506,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -9519,7 +9518,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -9533,8 +9532,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -9544,7 +9544,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -9558,8 +9558,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -9569,7 +9570,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -9583,8 +9584,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -9594,7 +9596,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -9608,12 +9610,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -9624,7 +9627,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -9638,12 +9641,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -9654,7 +9658,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -9668,12 +9672,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -9684,7 +9689,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -9698,12 +9703,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -9714,7 +9720,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -9728,12 +9734,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -9744,7 +9751,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -9758,12 +9765,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -9774,7 +9782,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 3381960f3..69d8477e5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2452,15 +2452,13 @@ void QueuedTestComponentBase :: Fw::String _val = Fw::String("external default"); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRINGEXT, - this->m_param_ParamStringExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRINGEXT, + this->m_param_ParamStringExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } @@ -2529,15 +2527,13 @@ void QueuedTestComponentBase :: A _val = A({1, 2, 3}); _buff.resetSer(); _stat = _buff.serializeFrom(_val); - if (_stat == Fw::FW_SERIALIZE_OK) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMARRAYEXT, - this->m_param_ParamArrayExt_valid, - _buff - ); - } + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMARRAYEXT, + this->m_param_ParamArrayExt_valid, + _buff + ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } @@ -9243,8 +9239,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamU32() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); this->m_paramLock.unlock(); @@ -9254,7 +9251,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMU32), + static_cast(idBase + PARAMID_PARAMU32), _saveBuff ); // Return the command response @@ -9268,8 +9265,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); this->m_paramLock.unlock(); @@ -9279,7 +9277,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64), + static_cast(idBase + PARAMID_PARAMF64), _saveBuff ); // Return the command response @@ -9293,8 +9291,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamString() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); this->m_paramLock.unlock(); @@ -9304,7 +9303,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRING), + static_cast(idBase + PARAMID_PARAMSTRING), _saveBuff ); // Return the command response @@ -9318,8 +9317,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnum() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); this->m_paramLock.unlock(); @@ -9329,7 +9329,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUM), + static_cast(idBase + PARAMID_PARAMENUM), _saveBuff ); // Return the command response @@ -9343,8 +9343,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArray() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); this->m_paramLock.unlock(); @@ -9354,7 +9355,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAY), + static_cast(idBase + PARAMID_PARAMARRAY), _saveBuff ); // Return the command response @@ -9368,8 +9369,9 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStruct() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); this->m_paramLock.unlock(); @@ -9379,7 +9381,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCT), + static_cast(idBase + PARAMID_PARAMSTRUCT), _saveBuff ); // Return the command response @@ -9393,12 +9395,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamI32Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); @@ -9409,7 +9412,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMI32EXT), + static_cast(idBase + PARAMID_PARAMI32EXT), _saveBuff ); // Return the command response @@ -9423,12 +9426,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64Ext() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); @@ -9439,7 +9443,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMF64EXT), + static_cast(idBase + PARAMID_PARAMF64EXT), _saveBuff ); // Return the command response @@ -9453,12 +9457,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStringExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); @@ -9469,7 +9474,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRINGEXT), + static_cast(idBase + PARAMID_PARAMSTRINGEXT), _saveBuff ); // Return the command response @@ -9483,12 +9488,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnumExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); @@ -9499,7 +9505,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMENUMEXT), + static_cast(idBase + PARAMID_PARAMENUMEXT), _saveBuff ); // Return the command response @@ -9513,12 +9519,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArrayExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); @@ -9529,7 +9536,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMARRAYEXT), + static_cast(idBase + PARAMID_PARAMARRAYEXT), _saveBuff ); // Return the command response @@ -9543,12 +9550,13 @@ Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStructExt() { if (this->isConnected_prmSetOut_OutputPort(0)) { - // Serialize the parameter Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + // Serialize the parameter this->m_paramLock.lock(); FW_ASSERT(this->paramDelegatePtr != nullptr); const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - static_cast(this->getIdBase()), + static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); @@ -9559,7 +9567,7 @@ Fw::CmdResponse QueuedTestComponentBase :: // Save the parameter this->prmSetOut_out( 0, - static_cast(this->getIdBase() + PARAMID_PARAMSTRUCTEXT), + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), _saveBuff ); // Return the command response From 175b9ab96b9f7ac5bd6ae1bea667ac25a76b71b8 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 12:02:44 -0700 Subject: [PATCH 23/42] Revise parameter code gen --- .../ComponentParameters.scala | 29 ++++++--- .../ActiveExternalParamsComponentAc.ref.cpp | 37 ++++++----- .../ActiveExternalParamsComponentAc.ref.hpp | 9 +++ .../base/ActiveParamsComponentAc.ref.cpp | 25 ++++---- .../base/ActiveParamsComponentAc.ref.hpp | 3 + .../base/ActiveSerialComponentAc.ref.cpp | 61 +++++++++---------- .../base/ActiveSerialComponentAc.ref.hpp | 3 + .../base/ActiveTestComponentAc.ref.cpp | 61 +++++++++---------- .../base/ActiveTestComponentAc.ref.hpp | 3 + .../PassiveExternalParamsComponentAc.ref.cpp | 37 ++++++----- .../PassiveExternalParamsComponentAc.ref.hpp | 9 +++ .../base/PassiveParamsComponentAc.ref.cpp | 25 ++++---- .../base/PassiveParamsComponentAc.ref.hpp | 3 + .../base/PassiveSerialComponentAc.ref.cpp | 61 +++++++++---------- .../base/PassiveSerialComponentAc.ref.hpp | 3 + .../base/PassiveTestComponentAc.ref.cpp | 61 +++++++++---------- .../base/PassiveTestComponentAc.ref.hpp | 3 + .../QueuedExternalParamsComponentAc.ref.cpp | 37 ++++++----- .../QueuedExternalParamsComponentAc.ref.hpp | 9 +++ .../base/QueuedParamsComponentAc.ref.cpp | 25 ++++---- .../base/QueuedParamsComponentAc.ref.hpp | 3 + .../base/QueuedSerialComponentAc.ref.cpp | 61 +++++++++---------- .../base/QueuedSerialComponentAc.ref.hpp | 3 + .../base/QueuedTestComponentAc.ref.cpp | 61 +++++++++---------- .../base/QueuedTestComponentAc.ref.hpp | 3 + 25 files changed, 345 insertions(+), 290 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 4787b3caa..29eb6088e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -10,6 +10,8 @@ case class ComponentParameters ( aNode: Ast.Annotated[AstNode[Ast.DefComponent]] ) extends ComponentCppWriterUtils(s, aNode) { + val paramBufferName = "m___fprime_ac_paramBuffer" + def getConstantMembers: List[CppDoc.Class.Member] = guardedList (hasParameters) (List(getParamIds)) @@ -53,11 +55,11 @@ case class ComponentParameters ( | _baseId, | $idConstantName, | this->$validityFlagName, - | _buff + | this->$paramBufferName |);""" ) else - lines(s"_stat = _buff.deserializeTo(this->$varName);") + lines(s"_stat = this->$paramBufferName.deserializeTo(this->$varName);") } private def getExternalParameterFunctions: List[CppDoc.Class.Member] = { @@ -199,7 +201,7 @@ case class ComponentParameters ( |this->$validityFlagName = this->$prmGetPortInvokerName( | 0, | _id, - | _buff + | this->$paramBufferName |);""" ) } @@ -262,10 +264,22 @@ case class ComponentParameters ( ) } + private def getParamBuffer = + linesClassMember( + lines( + s"""| + |//! Scratch buffer for parameter management + |Fw::ParamBuffer $paramBufferName;""" + ) + ) + private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", - sortedParams.flatMap((_, param) => getParamVarForParam(param)), + List.concat( + guardedList(!sortedParams.isEmpty) (List(getParamBuffer)), + sortedParams.flatMap((_, param) => getParamVarForParam(param)) + ), CppDoc.Lines.Hpp ) @@ -356,8 +370,8 @@ case class ComponentParameters ( List.concat( lines( s"""|$cppType _val = $cppValue; - |_buff.resetSer(); - |_stat = _buff.serializeFrom(_val);""" + |this->$paramBufferName.resetSer(); + |_stat = this->$paramBufferName.serializeFrom(_val);""" ), deserializeParam(param), wrapInIf( @@ -449,8 +463,7 @@ case class ComponentParameters ( val prmGetIsConnected = outputPortIsConnectedName(prmGetPortName) List.concat( lines( - s"""|Fw::ParamBuffer _buff; - |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; + s"""|Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; |const FwPrmIdType _baseId = static_cast(this->getIdBase()); |FW_ASSERT(this->$prmGetIsConnected(0)); | diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 5da013b11..29e5a8013 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1666,7 +1666,6 @@ void ActiveExternalParamsComponentBase :: void ActiveExternalParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1679,7 +1678,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1691,7 +1690,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -1709,7 +1708,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1721,7 +1720,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -1739,7 +1738,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1751,7 +1750,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1762,14 +1761,14 @@ void ActiveExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -1784,7 +1783,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1796,7 +1795,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -1814,7 +1813,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1826,7 +1825,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1837,14 +1836,14 @@ void ActiveExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -1859,7 +1858,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1871,7 +1870,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp index 294041c82..5b8d075cb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp @@ -2175,6 +2175,15 @@ class ActiveExternalParamsComponentBase : //! VALID if ParamStructExt was successfully received Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: + + // ---------------------------------------------------------------------- + // Parameter variables + // ---------------------------------------------------------------------- + + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 57af67107..7aeecde05 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1666,7 +1666,6 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1679,14 +1678,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -1703,14 +1702,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -1727,14 +1726,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1754,14 +1753,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -1778,14 +1777,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1805,14 +1804,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp index 108bf1cdd..810012555 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp @@ -2169,6 +2169,9 @@ class ActiveParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index e8fc1c8f4..e00218923 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2128,7 +2128,6 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -2141,14 +2140,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -2165,14 +2164,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -2189,14 +2188,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2216,14 +2215,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -2240,14 +2239,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2267,14 +2266,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -2291,7 +2290,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2303,7 +2302,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -2321,7 +2320,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2333,7 +2332,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -2351,7 +2350,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2363,7 +2362,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2374,14 +2373,14 @@ void ActiveSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -2396,7 +2395,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2408,7 +2407,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -2426,7 +2425,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2438,7 +2437,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2449,14 +2448,14 @@ void ActiveSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -2471,7 +2470,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2483,7 +2482,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index b80f04b90..ba73171a4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -3506,6 +3506,9 @@ class ActiveSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index ec96b6787..f54ec61be 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2206,7 +2206,6 @@ namespace M { void ActiveTestComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -2219,14 +2218,14 @@ namespace M { this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -2243,14 +2242,14 @@ namespace M { this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -2267,14 +2266,14 @@ namespace M { this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2294,14 +2293,14 @@ namespace M { this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -2318,14 +2317,14 @@ namespace M { this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2345,14 +2344,14 @@ namespace M { this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -2369,7 +2368,7 @@ namespace M { this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2381,7 +2380,7 @@ namespace M { _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -2399,7 +2398,7 @@ namespace M { this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2411,7 +2410,7 @@ namespace M { _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -2429,7 +2428,7 @@ namespace M { this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2441,7 +2440,7 @@ namespace M { _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2452,14 +2451,14 @@ namespace M { } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -2474,7 +2473,7 @@ namespace M { this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2486,7 +2485,7 @@ namespace M { _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -2504,7 +2503,7 @@ namespace M { this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2516,7 +2515,7 @@ namespace M { _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2527,14 +2526,14 @@ namespace M { } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -2549,7 +2548,7 @@ namespace M { this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2561,7 +2560,7 @@ namespace M { _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index 87142dbae..9492ce492 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -3488,6 +3488,9 @@ namespace M { // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index bcd9f8d4d..a88aef136 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1373,7 +1373,6 @@ void PassiveExternalParamsComponentBase :: void PassiveExternalParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1386,7 +1385,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1398,7 +1397,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -1416,7 +1415,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1428,7 +1427,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -1446,7 +1445,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1458,7 +1457,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1469,14 +1468,14 @@ void PassiveExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -1491,7 +1490,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1503,7 +1502,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -1521,7 +1520,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1533,7 +1532,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1544,14 +1543,14 @@ void PassiveExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -1566,7 +1565,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1578,7 +1577,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp index 91249c142..403d218c1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp @@ -1781,6 +1781,15 @@ class PassiveExternalParamsComponentBase : //! VALID if ParamStructExt was successfully received Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: + + // ---------------------------------------------------------------------- + // Parameter variables + // ---------------------------------------------------------------------- + + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 998c668ac..bea4e837c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1373,7 +1373,6 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1386,14 +1385,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -1410,14 +1409,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -1434,14 +1433,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1461,14 +1460,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -1485,14 +1484,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1512,14 +1511,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp index 758dd3027..c793fec12 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp @@ -1775,6 +1775,9 @@ class PassiveParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 41a0854d8..1d06b8905 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1618,7 +1618,6 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1631,14 +1630,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -1655,14 +1654,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -1679,14 +1678,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1706,14 +1705,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -1730,14 +1729,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1757,14 +1756,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -1781,7 +1780,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1793,7 +1792,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -1811,7 +1810,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1823,7 +1822,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -1841,7 +1840,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1853,7 +1852,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1864,14 +1863,14 @@ void PassiveSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -1886,7 +1885,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1898,7 +1897,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -1916,7 +1915,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1928,7 +1927,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1939,14 +1938,14 @@ void PassiveSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -1961,7 +1960,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1973,7 +1972,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index d8b204694..ceac1911c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -2722,6 +2722,9 @@ class PassiveSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index f70bb1090..dd46c7f72 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1850,7 +1850,6 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1863,14 +1862,14 @@ void PassiveTestComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -1887,14 +1886,14 @@ void PassiveTestComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -1911,14 +1910,14 @@ void PassiveTestComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1938,14 +1937,14 @@ void PassiveTestComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -1962,14 +1961,14 @@ void PassiveTestComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1989,14 +1988,14 @@ void PassiveTestComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -2013,7 +2012,7 @@ void PassiveTestComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2025,7 +2024,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -2043,7 +2042,7 @@ void PassiveTestComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2055,7 +2054,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -2073,7 +2072,7 @@ void PassiveTestComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2085,7 +2084,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2096,14 +2095,14 @@ void PassiveTestComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -2118,7 +2117,7 @@ void PassiveTestComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2130,7 +2129,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -2148,7 +2147,7 @@ void PassiveTestComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2160,7 +2159,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2171,14 +2170,14 @@ void PassiveTestComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -2193,7 +2192,7 @@ void PassiveTestComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2205,7 +2204,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index a5b4bbabf..3cfc744b1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -2867,6 +2867,9 @@ class PassiveTestComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 5cfd8ccc4..8cc3baa9d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1666,7 +1666,6 @@ void QueuedExternalParamsComponentBase :: void QueuedExternalParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1679,7 +1678,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1691,7 +1690,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -1709,7 +1708,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1721,7 +1720,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -1739,7 +1738,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1751,7 +1750,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1762,14 +1761,14 @@ void QueuedExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -1784,7 +1783,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1796,7 +1795,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -1814,7 +1813,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1826,7 +1825,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1837,14 +1836,14 @@ void QueuedExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -1859,7 +1858,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -1871,7 +1870,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp index 6bdbdccd3..5fb2df5e6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp @@ -2184,6 +2184,15 @@ class QueuedExternalParamsComponentBase : //! VALID if ParamStructExt was successfully received Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; + private: + + // ---------------------------------------------------------------------- + // Parameter variables + // ---------------------------------------------------------------------- + + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 19a4c7750..4bbfc8e01 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1666,7 +1666,6 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -1679,14 +1678,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -1703,14 +1702,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -1727,14 +1726,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1754,14 +1753,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -1778,14 +1777,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1805,14 +1804,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp index ae346e7dd..784694b0a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp @@ -2178,6 +2178,9 @@ class QueuedParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 860364f19..200a9cae4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2128,7 +2128,6 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -2141,14 +2140,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -2165,14 +2164,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -2189,14 +2188,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2216,14 +2215,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -2240,14 +2239,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2267,14 +2266,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -2291,7 +2290,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2303,7 +2302,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -2321,7 +2320,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2333,7 +2332,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -2351,7 +2350,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2363,7 +2362,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2374,14 +2373,14 @@ void QueuedSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -2396,7 +2395,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2408,7 +2407,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -2426,7 +2425,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2438,7 +2437,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2449,14 +2448,14 @@ void QueuedSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -2471,7 +2470,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2483,7 +2482,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index 057bdb169..71e612ea0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -3515,6 +3515,9 @@ class QueuedSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 69d8477e5..9eabb1a2f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2204,7 +2204,6 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: loadParameters() { - Fw::ParamBuffer _buff; Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_OK; const FwPrmIdType _baseId = static_cast(this->getIdBase()); FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); @@ -2217,14 +2216,14 @@ void QueuedTestComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } @@ -2241,14 +2240,14 @@ void QueuedTestComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } @@ -2265,14 +2264,14 @@ void QueuedTestComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2292,14 +2291,14 @@ void QueuedTestComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } @@ -2316,14 +2315,14 @@ void QueuedTestComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2343,14 +2342,14 @@ void QueuedTestComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = _buff.deserializeTo(this->m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } @@ -2367,7 +2366,7 @@ void QueuedTestComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2379,7 +2378,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; @@ -2397,7 +2396,7 @@ void QueuedTestComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2409,7 +2408,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; @@ -2427,7 +2426,7 @@ void QueuedTestComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2439,7 +2438,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2450,14 +2449,14 @@ void QueuedTestComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; @@ -2472,7 +2471,7 @@ void QueuedTestComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2484,7 +2483,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; @@ -2502,7 +2501,7 @@ void QueuedTestComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2514,7 +2513,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2525,14 +2524,14 @@ void QueuedTestComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - _buff.resetSer(); - _stat = _buff.serializeFrom(_val); + this->m___fprime_ac_paramBuffer.resetSer(); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; @@ -2547,7 +2546,7 @@ void QueuedTestComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - _buff + this->m___fprime_ac_paramBuffer ); this->m_paramLock.lock(); @@ -2559,7 +2558,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - _buff + this->m___fprime_ac_paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 933633606..a7e941613 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -3495,6 +3495,9 @@ class QueuedTestComponentBase : // Parameter variables // ---------------------------------------------------------------------- + //! Scratch buffer for parameter management + Fw::ParamBuffer m___fprime_ac_paramBuffer; + //! Parameter ParamU32 //! //! A parameter with U32 data From ad21d2ce59b8a774cb18bc392f3f74c2c05bf42c Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 13:44:48 -0700 Subject: [PATCH 24/42] Revise parameter code gen --- .../CppWriter/ComponentCppWriter/ComponentCppWriter.scala | 1 - .../CppWriter/ComponentCppWriter/ComponentParameters.scala | 2 +- .../component/base/ActiveExternalParamsComponentAc.ref.cpp | 3 +-- .../component/base/ActiveExternalParamsComponentAc.ref.hpp | 2 +- .../test/component/base/ActiveSerialComponentAc.ref.cpp | 3 +-- .../test/component/base/ActiveSerialComponentAc.ref.hpp | 2 +- .../test/component/base/ActiveTestComponentAc.ref.cpp | 3 +-- .../test/component/base/ActiveTestComponentAc.ref.hpp | 2 +- .../component/base/PassiveExternalParamsComponentAc.ref.cpp | 3 +-- .../component/base/PassiveExternalParamsComponentAc.ref.hpp | 2 +- .../test/component/base/PassiveSerialComponentAc.ref.cpp | 3 +-- .../test/component/base/PassiveSerialComponentAc.ref.hpp | 2 +- .../test/component/base/PassiveTestComponentAc.ref.cpp | 3 +-- .../test/component/base/PassiveTestComponentAc.ref.hpp | 2 +- .../component/base/QueuedExternalParamsComponentAc.ref.cpp | 3 +-- .../component/base/QueuedExternalParamsComponentAc.ref.hpp | 2 +- .../test/component/base/QueuedSerialComponentAc.ref.cpp | 3 +-- .../test/component/base/QueuedSerialComponentAc.ref.hpp | 2 +- .../test/component/base/QueuedTestComponentAc.ref.cpp | 3 +-- .../test/component/base/QueuedTestComponentAc.ref.hpp | 2 +- 20 files changed, 19 insertions(+), 29 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala index b9fa4a5b7..84fe54485 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala @@ -536,7 +536,6 @@ case class ComponentCppWriter ( ) ), List(s"Fw::${kindStr}ComponentBase(compName)") ::: - (if (hasExternalParameters) List("paramDelegatePtr(nullptr)") else Nil) ::: smInstancesByName.map { (name, smi) => val sm = s.a.stateMachineMap(smi.symbol) val hasActionsOrGuards = sm.hasActions || sm.hasGuards diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 29eb6088e..18b8fb96e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -156,7 +156,7 @@ case class ComponentParameters ( lines( s"""| |//! Delegate to serialize/deserialize an externally stored parameter - |Fw::ParamExternalDelegate* paramDelegatePtr; + |Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; |""" ) ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 29e5a8013..7c29430f4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1892,8 +1892,7 @@ void ActiveExternalParamsComponentBase :: ActiveExternalParamsComponentBase :: ActiveExternalParamsComponentBase(const char* compName) : - Fw::ActiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::ActiveComponentBase(compName) { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp index 5b8d075cb..4cf82dbb4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp @@ -2191,7 +2191,7 @@ class ActiveExternalParamsComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index e00218923..7de79daab 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2504,8 +2504,7 @@ void ActiveSerialComponentBase :: ActiveSerialComponentBase :: ActiveSerialComponentBase(const char* compName) : - Fw::ActiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::ActiveComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index ba73171a4..efcd60e74 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -3547,7 +3547,7 @@ class ActiveSerialComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index f54ec61be..9c1280763 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2582,8 +2582,7 @@ namespace M { ActiveTestComponentBase :: ActiveTestComponentBase(const char* compName) : - Fw::ActiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::ActiveComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index 9492ce492..d5795c659 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -3529,7 +3529,7 @@ namespace M { // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index a88aef136..a99bdee2b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1599,8 +1599,7 @@ void PassiveExternalParamsComponentBase :: PassiveExternalParamsComponentBase :: PassiveExternalParamsComponentBase(const char* compName) : - Fw::PassiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::PassiveComponentBase(compName) { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp index 403d218c1..82a563c91 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp @@ -1797,7 +1797,7 @@ class PassiveExternalParamsComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 1d06b8905..639a6d569 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1994,8 +1994,7 @@ void PassiveSerialComponentBase :: PassiveSerialComponentBase :: PassiveSerialComponentBase(const char* compName) : - Fw::PassiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::PassiveComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index ceac1911c..7d66ccefd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -2763,7 +2763,7 @@ class PassiveSerialComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index dd46c7f72..81fdca7c1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2226,8 +2226,7 @@ void PassiveTestComponentBase :: PassiveTestComponentBase :: PassiveTestComponentBase(const char* compName) : - Fw::PassiveComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::PassiveComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index 3cfc744b1..ca16e8791 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -2908,7 +2908,7 @@ class PassiveTestComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 8cc3baa9d..6a415d88b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1892,8 +1892,7 @@ void QueuedExternalParamsComponentBase :: QueuedExternalParamsComponentBase :: QueuedExternalParamsComponentBase(const char* compName) : - Fw::QueuedComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::QueuedComponentBase(compName) { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp index 5fb2df5e6..a2ba367ee 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp @@ -2200,7 +2200,7 @@ class QueuedExternalParamsComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 200a9cae4..644a2c483 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2504,8 +2504,7 @@ void QueuedSerialComponentBase :: QueuedSerialComponentBase :: QueuedSerialComponentBase(const char* compName) : - Fw::QueuedComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::QueuedComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index 71e612ea0..fb9336b22 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -3556,7 +3556,7 @@ class QueuedSerialComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 9eabb1a2f..3fa93d37f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2580,8 +2580,7 @@ void QueuedTestComponentBase :: QueuedTestComponentBase :: QueuedTestComponentBase(const char* compName) : - Fw::QueuedComponentBase(compName), - paramDelegatePtr(nullptr) + Fw::QueuedComponentBase(compName) { this->m_EventActivityLowThrottledThrottle = 0; this->m_EventFatalThrottledThrottle = 0; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index a7e941613..26b1188eb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -3536,7 +3536,7 @@ class QueuedTestComponentBase : // ---------------------------------------------------------------------- //! Delegate to serialize/deserialize an externally stored parameter - Fw::ParamExternalDelegate* paramDelegatePtr; + Fw::ParamExternalDelegate* paramDelegatePtr = nullptr; private: From 9e94ab758f1bb87d463029181d930ffcea090c8b Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 15:17:42 -0700 Subject: [PATCH 25/42] Revise parameter code gen --- .../ComponentParameters.scala | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 18b8fb96e..5d4b21fd9 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -403,11 +403,22 @@ case class ComponentParameters ( ) } + private def setValidityFlagString(param: Param, flagValue: String) = + val validityFlagName = paramValidityFlagName(paramName) + s"this->$validityFlagName = Fw::ParamValid::$flagValue;" + + private def setValidityFlag(param: Param, flagValue: String) = + lines(setValidityFlagString(param, flagValue)) + private def writeLoadForParam(param: Param) = { val paramName = param.getName val idConstantName = paramIdConstantName(paramName) - val validityFlagName = paramValidityFlagName(paramName) val varName = paramVariableName(paramName) + // Optimize the external no-default case + def optimizedIfElse(condition: String, ifBody: List[Line], elseBody: List[Line]) = + if param.isExternal && !param.default.isDefined + then ifBody + else wrapInIfElse(condition, ifBody, elseBody) List.concat( getParamFromPort(param), { @@ -422,31 +433,27 @@ case class ComponentParameters ( |// Deserialize parameter$orUseDefaultValue""" ) }, - wrapInIfElse( - s"this->$validityFlagName == Fw::ParamValid::VALID", + optimizedIfElse( + setValidityFlagString(param, "VALID"), List.concat( deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", param.default match { - case Some(value) => - lines(s"this->$validityFlagName = Fw::ParamValid::DEFAULT;") - case None => - lines(s"this->$validityFlagName = Fw::ParamValid::INVALID;") + case Some(value) => setValidityFlag(param, "DEFAULT") + case None => setValidityFlag(param, "INVALID") } ) ), param.default match { - case Some(value) => - lines(s"this->$validityFlagName = Fw::ParamValid::DEFAULT;") - case None => - lines("// No default") + case Some(value) => setValidityFlag(param, "DEFAULT") + case None => lines("// No default") } ), param.default match { case Some(value) => wrapInIf( - s"this->$validityFlagName == Fw::ParamValid::DEFAULT", + setValidityFlagString(param, "DEFAULT"), setDefaultValue(param, value) ) case None => Nil From 72ff801b59ed4835b58d9d5f6c331b2be86d11ab Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 16:59:58 -0700 Subject: [PATCH 26/42] Revise parameter code gen --- .../ComponentParameters.scala | 65 +++++++------ .../ActiveExternalParamsComponentAc.ref.cpp | 92 ++++++++----------- .../base/ActiveSerialComponentAc.ref.cpp | 92 ++++++++----------- .../base/ActiveTestComponentAc.ref.cpp | 92 ++++++++----------- .../PassiveExternalParamsComponentAc.ref.cpp | 92 ++++++++----------- .../base/PassiveSerialComponentAc.ref.cpp | 92 ++++++++----------- .../base/PassiveTestComponentAc.ref.cpp | 92 ++++++++----------- .../QueuedExternalParamsComponentAc.ref.cpp | 92 ++++++++----------- .../base/QueuedSerialComponentAc.ref.cpp | 92 ++++++++----------- .../base/QueuedTestComponentAc.ref.cpp | 92 ++++++++----------- 10 files changed, 359 insertions(+), 534 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 5d4b21fd9..dfde38053 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -42,6 +42,11 @@ case class ComponentParameters ( guardedList (hasExternalParameters) (getParamDelegate) ) + private def checkValidityFlag(param: Param, flagValue: String) = + val paramName = param.getName + val validityFlagName = paramValidityFlagName(paramName) + s"this->$validityFlagName == Fw::ParamValid::$flagValue" + private def deserializeParam(param: Param) = { val paramName = param.getName val varName = paramVariableName(paramName) @@ -147,6 +152,15 @@ case class ComponentParameters ( ) ) + private def getParamBuffer = + linesClassMember( + lines( + s"""| + |//! Scratch buffer for parameter management + |Fw::ParamBuffer $paramBufferName;""" + ) + ) + private def getParamDelegate = addAccessTagAndComment( "private", @@ -264,15 +278,6 @@ case class ComponentParameters ( ) } - private def getParamBuffer = - linesClassMember( - lines( - s"""| - |//! Scratch buffer for parameter management - |Fw::ParamBuffer $paramBufferName;""" - ) - ) - private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", @@ -383,6 +388,11 @@ case class ComponentParameters ( lines(s"this->$varName = $cppValue;") } + private def setValidityFlag(param: Param, flagValue: String) = + val paramName = param.getName + val validityFlagName = paramValidityFlagName(paramName) + lines(s"this->$validityFlagName = Fw::ParamValid::$flagValue;") + private def writeGetterFunctionBody(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") val validityFlagName = paramValidityFlagName(param.getName) @@ -403,19 +413,15 @@ case class ComponentParameters ( ) } - private def setValidityFlagString(param: Param, flagValue: String) = - val validityFlagName = paramValidityFlagName(paramName) - s"this->$validityFlagName = Fw::ParamValid::$flagValue;" - - private def setValidityFlag(param: Param, flagValue: String) = - lines(setValidityFlagString(param, flagValue)) - private def writeLoadForParam(param: Param) = { - val paramName = param.getName - val idConstantName = paramIdConstantName(paramName) - val varName = paramVariableName(paramName) // Optimize the external no-default case - def optimizedIfElse(condition: String, ifBody: List[Line], elseBody: List[Line]) = + // Here there is no if condition, because we always call + // the external serialization interface + def optimizedIfElse( + condition: => String, + ifBody: List[Line], + elseBody: => List[Line] + ) = if param.isExternal && !param.default.isDefined then ifBody else wrapInIfElse(condition, ifBody, elseBody) @@ -434,26 +440,25 @@ case class ComponentParameters ( ) }, optimizedIfElse( - setValidityFlagString(param, "VALID"), + checkValidityFlag(param, "VALID"), List.concat( deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", - param.default match { - case Some(value) => setValidityFlag(param, "DEFAULT") - case None => setValidityFlag(param, "INVALID") - } + setValidityFlag( + param, + if param.default.isDefined then "DEFAULT" else "INVALID" + ) ) ), - param.default match { - case Some(value) => setValidityFlag(param, "DEFAULT") - case None => lines("// No default") - } + if param.default.isDefined + then setValidityFlag(param, "DEFAULT") + else lines("// No default") ), param.default match { case Some(value) => wrapInIf( - setValidityFlagString(param, "DEFAULT"), + checkValidityFlag(param, "DEFAULT"), setDefaultValue(param, value) ) case None => Nil diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 7c29430f4..209f2946d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1684,20 +1684,15 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1714,20 +1709,15 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1789,20 +1779,15 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1864,20 +1849,15 @@ void ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 7de79daab..a9f5db6fa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2296,20 +2296,15 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2326,20 +2321,15 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2401,20 +2391,15 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2476,20 +2461,15 @@ void ActiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 9c1280763..c60a0f130 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2374,20 +2374,15 @@ namespace M { this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2404,20 +2399,15 @@ namespace M { this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2479,20 +2469,15 @@ namespace M { this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2554,20 +2539,15 @@ namespace M { this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index a99bdee2b..91cd5e6c0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1391,20 +1391,15 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1421,20 +1416,15 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1496,20 +1486,15 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1571,20 +1556,15 @@ void PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 639a6d569..fc6d63efe 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1786,20 +1786,15 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1816,20 +1811,15 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1891,20 +1881,15 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1966,20 +1951,15 @@ void PassiveSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 81fdca7c1..404fa0d9f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2018,20 +2018,15 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2048,20 +2043,15 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2123,20 +2113,15 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2198,20 +2183,15 @@ void PassiveTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 6a415d88b..79f988426 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1684,20 +1684,15 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1714,20 +1709,15 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1789,20 +1779,15 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -1864,20 +1849,15 @@ void QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 644a2c483..8dd5b4beb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2296,20 +2296,15 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2326,20 +2321,15 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2401,20 +2391,15 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2476,20 +2461,15 @@ void QueuedSerialComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 3fa93d37f..8092a7e8d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2372,20 +2372,15 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMI32EXT, - this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMI32EXT, + this->m_param_ParamI32Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2402,20 +2397,15 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMF64EXT, - this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMF64EXT, + this->m_param_ParamF64Ext_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2477,20 +2467,15 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMENUMEXT, - this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMENUMEXT, + this->m_param_ParamEnumExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); @@ -2552,20 +2537,15 @@ void QueuedTestComponentBase :: this->m_paramLock.lock(); // Deserialize parameter - if (this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) { - FW_ASSERT(this->paramDelegatePtr != nullptr); - _stat = this->paramDelegatePtr->deserializeParam( - _baseId, - PARAMID_PARAMSTRUCTEXT, - this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer - ); - if (_stat != Fw::FW_SERIALIZE_OK) { - this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; - } - } - else { - // No default + FW_ASSERT(this->paramDelegatePtr != nullptr); + _stat = this->paramDelegatePtr->deserializeParam( + _baseId, + PARAMID_PARAMSTRUCTEXT, + this->m_param_ParamStructExt_valid, + this->m___fprime_ac_paramBuffer + ); + if (_stat != Fw::FW_SERIALIZE_OK) { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } this->m_paramLock.unLock(); From 6c1400851a2a180301873f16d21e1edd08870909 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 17:16:15 -0700 Subject: [PATCH 27/42] Revise param code gen --- .../ComponentParameters.scala | 25 ++++++++++--------- .../base/ActiveParamsComponentAc.ref.cpp | 12 --------- .../base/ActiveSerialComponentAc.ref.cpp | 12 --------- .../base/ActiveTestComponentAc.ref.cpp | 12 --------- .../base/PassiveParamsComponentAc.ref.cpp | 12 --------- .../base/PassiveSerialComponentAc.ref.cpp | 12 --------- .../base/PassiveTestComponentAc.ref.cpp | 12 --------- .../base/QueuedParamsComponentAc.ref.cpp | 12 --------- .../base/QueuedSerialComponentAc.ref.cpp | 12 --------- .../base/QueuedTestComponentAc.ref.cpp | 12 --------- 10 files changed, 13 insertions(+), 120 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index dfde38053..af68be346 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -414,17 +414,20 @@ case class ComponentParameters ( } private def writeLoadForParam(param: Param) = { - // Optimize the external no-default case - // Here there is no if condition, because we always call - // the external serialization interface - def optimizedIfElse( + // Generate a block, or an if statement, or an if-else statement + def writeCondition( condition: => String, - ifBody: List[Line], - elseBody: => List[Line] + ifBlock: List[Line], + elseBlock: => List[Line] ) = if param.isExternal && !param.default.isDefined - then ifBody - else wrapInIfElse(condition, ifBody, elseBody) + // External parameter, no default: no condition needed + then ifBlock + else if param.default.isDefined + // Default: if and else needed + then wrapInIfElse(condition, ifBlock, elseBlock) + // Internal parameter, no default: if needed + else wrapInIf(condition, ifBlock) List.concat( getParamFromPort(param), { @@ -439,7 +442,7 @@ case class ComponentParameters ( |// Deserialize parameter$orUseDefaultValue""" ) }, - optimizedIfElse( + writeCondition( checkValidityFlag(param, "VALID"), List.concat( deserializeParam(param), @@ -451,9 +454,7 @@ case class ComponentParameters ( ) ) ), - if param.default.isDefined - then setValidityFlag(param, "DEFAULT") - else lines("// No default") + setValidityFlag(param, "DEFAULT") ), param.default match { case Some(value) => diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 7aeecde05..fce6508ec 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1690,9 +1690,6 @@ void ActiveParamsComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1714,9 +1711,6 @@ void ActiveParamsComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1765,9 +1759,6 @@ void ActiveParamsComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1816,9 +1807,6 @@ void ActiveParamsComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index a9f5db6fa..14f19b842 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2152,9 +2152,6 @@ void ActiveSerialComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2176,9 +2173,6 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2227,9 +2221,6 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2278,9 +2269,6 @@ void ActiveSerialComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index c60a0f130..105debc5a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2230,9 +2230,6 @@ namespace M { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2254,9 +2251,6 @@ namespace M { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2305,9 +2299,6 @@ namespace M { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2356,9 +2347,6 @@ namespace M { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index bea4e837c..e2016fbf6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1397,9 +1397,6 @@ void PassiveParamsComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1421,9 +1418,6 @@ void PassiveParamsComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1472,9 +1466,6 @@ void PassiveParamsComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1523,9 +1514,6 @@ void PassiveParamsComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index fc6d63efe..2d30fac6e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1642,9 +1642,6 @@ void PassiveSerialComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1666,9 +1663,6 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1717,9 +1711,6 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1768,9 +1759,6 @@ void PassiveSerialComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 404fa0d9f..e06da9a5f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1874,9 +1874,6 @@ void PassiveTestComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1898,9 +1895,6 @@ void PassiveTestComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1949,9 +1943,6 @@ void PassiveTestComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2000,9 +1991,6 @@ void PassiveTestComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 4bbfc8e01..8a8b5b056 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1690,9 +1690,6 @@ void QueuedParamsComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1714,9 +1711,6 @@ void QueuedParamsComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1765,9 +1759,6 @@ void QueuedParamsComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -1816,9 +1807,6 @@ void QueuedParamsComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 8dd5b4beb..955ef23f0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2152,9 +2152,6 @@ void QueuedSerialComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2176,9 +2173,6 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2227,9 +2221,6 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2278,9 +2269,6 @@ void QueuedSerialComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 8092a7e8d..bd958c4c4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2228,9 +2228,6 @@ void QueuedTestComponentBase :: this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2252,9 +2249,6 @@ void QueuedTestComponentBase :: this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2303,9 +2297,6 @@ void QueuedTestComponentBase :: this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); @@ -2354,9 +2345,6 @@ void QueuedTestComponentBase :: this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - else { - // No default - } this->m_paramLock.unLock(); From e88285d8e43a3808100e26f29c424dc8f71ac8a8 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 17:39:45 -0700 Subject: [PATCH 28/42] Revise parameter code gen --- .../ComponentParameters.scala | 6 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 36 +++++++++---------- .../base/ActiveSerialComponentAc.ref.cpp | 36 +++++++++---------- .../base/ActiveTestComponentAc.ref.cpp | 36 +++++++++---------- .../PassiveExternalParamsComponentAc.ref.cpp | 36 +++++++++---------- .../base/PassiveSerialComponentAc.ref.cpp | 36 +++++++++---------- .../base/PassiveTestComponentAc.ref.cpp | 36 +++++++++---------- .../QueuedExternalParamsComponentAc.ref.cpp | 36 +++++++++---------- .../base/QueuedSerialComponentAc.ref.cpp | 36 +++++++++---------- .../base/QueuedTestComponentAc.ref.cpp | 36 +++++++++---------- 10 files changed, 165 insertions(+), 165 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index af68be346..8a600fb48 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -183,15 +183,15 @@ case class ComponentParameters ( then val idConstantName = paramIdConstantName(param.getName) lines( - s"""|Fw::ParamBuffer _getBuff; + s"""|$paramBufferName.resetSer(); |FW_ASSERT(this->paramDelegatePtr != nullptr); |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( | static_cast(this->getIdBase()), | $idConstantName, - | _getBuff + | $paramBufferName |); |if(_stat == Fw::FW_SERIALIZE_OK) { - | _stat = _getBuff.deserializeTo(_local); + | _stat = $paramBufferName.deserializeTo(_local); | FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); |} else { | valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 209f2946d..008a76489 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -3511,15 +3511,15 @@ I32 ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3536,15 +3536,15 @@ F64 ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3561,15 +3561,15 @@ Fw::ParamString ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3586,15 +3586,15 @@ E ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3611,15 +3611,15 @@ A ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3636,15 +3636,15 @@ S ActiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 14f19b842..28e088e35 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -7214,15 +7214,15 @@ I32 ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7239,15 +7239,15 @@ F64 ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7264,15 +7264,15 @@ Fw::ParamString ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7289,15 +7289,15 @@ E ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7314,15 +7314,15 @@ A ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7339,15 +7339,15 @@ S ActiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 105debc5a..3dc42579d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -7046,15 +7046,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7071,15 +7071,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7096,15 +7096,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7121,15 +7121,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7146,15 +7146,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7171,15 +7171,15 @@ namespace M { this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 91cd5e6c0..c64aecb25 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -2549,15 +2549,15 @@ I32 PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -2574,15 +2574,15 @@ F64 PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -2599,15 +2599,15 @@ Fw::ParamString PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -2624,15 +2624,15 @@ E PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -2649,15 +2649,15 @@ A PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -2674,15 +2674,15 @@ S PassiveExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 2d30fac6e..a5e7e2b1e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -5112,15 +5112,15 @@ I32 PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5137,15 +5137,15 @@ F64 PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5162,15 +5162,15 @@ Fw::ParamString PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5187,15 +5187,15 @@ E PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5212,15 +5212,15 @@ A PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5237,15 +5237,15 @@ S PassiveSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index e06da9a5f..57cb29157 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -5292,15 +5292,15 @@ I32 PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5317,15 +5317,15 @@ F64 PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5342,15 +5342,15 @@ Fw::ParamString PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5367,15 +5367,15 @@ E PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5392,15 +5392,15 @@ A PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -5417,15 +5417,15 @@ S PassiveTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 79f988426..f7ac09c31 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -3511,15 +3511,15 @@ I32 QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3536,15 +3536,15 @@ F64 QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3561,15 +3561,15 @@ Fw::ParamString QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3586,15 +3586,15 @@ E QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3611,15 +3611,15 @@ A QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -3636,15 +3636,15 @@ S QueuedExternalParamsComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 955ef23f0..f641707af 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -7214,15 +7214,15 @@ I32 QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7239,15 +7239,15 @@ F64 QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7264,15 +7264,15 @@ Fw::ParamString QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7289,15 +7289,15 @@ E QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7314,15 +7314,15 @@ A QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7339,15 +7339,15 @@ S QueuedSerialComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index bd958c4c4..65fb86f6e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -7044,15 +7044,15 @@ I32 QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7069,15 +7069,15 @@ F64 QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7094,15 +7094,15 @@ Fw::ParamString QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7119,15 +7119,15 @@ E QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7144,15 +7144,15 @@ A QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; @@ -7169,15 +7169,15 @@ S QueuedTestComponentBase :: this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - Fw::ParamBuffer _getBuff; + m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - _getBuff + m___fprime_ac_paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = _getBuff.deserializeTo(_local); + _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; From c4cf5c0d6281241792a54d6647bd2d3bcc29bc77 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 29 Apr 2026 18:01:07 -0700 Subject: [PATCH 29/42] Revise parameter code gen --- .../ComponentParameters.scala | 18 +++++----- .../ActiveExternalParamsComponentAc.ref.cpp | 36 +++++++------------ .../base/ActiveSerialComponentAc.ref.cpp | 36 +++++++------------ .../base/ActiveTestComponentAc.ref.cpp | 36 +++++++------------ .../PassiveExternalParamsComponentAc.ref.cpp | 36 +++++++------------ .../base/PassiveSerialComponentAc.ref.cpp | 36 +++++++------------ .../base/PassiveTestComponentAc.ref.cpp | 36 +++++++------------ .../QueuedExternalParamsComponentAc.ref.cpp | 36 +++++++------------ .../base/QueuedSerialComponentAc.ref.cpp | 36 +++++++------------ .../base/QueuedTestComponentAc.ref.cpp | 36 +++++++------------ 10 files changed, 117 insertions(+), 225 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 8a600fb48..9d9eb9eee 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -391,7 +391,10 @@ case class ComponentParameters ( private def setValidityFlag(param: Param, flagValue: String) = val paramName = param.getName val validityFlagName = paramValidityFlagName(paramName) - lines(s"this->$validityFlagName = Fw::ParamValid::$flagValue;") + s"this->$validityFlagName = Fw::ParamValid::$flagValue;" + + private def setValidityFlagLines(param: Param, flagValue: String) = + lines(setValidityFlag(param, flagValue)) private def writeGetterFunctionBody(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") @@ -448,13 +451,13 @@ case class ComponentParameters ( deserializeParam(param), wrapInIf( "_stat != Fw::FW_SERIALIZE_OK", - setValidityFlag( + setValidityFlagLines( param, if param.default.isDefined then "DEFAULT" else "INVALID" ) ) ), - setValidityFlag(param, "DEFAULT") + setValidityFlagLines(param, "DEFAULT") ), param.default match { case Some(value) => @@ -554,7 +557,6 @@ case class ComponentParameters ( private def writeSetterBodyForExternalParam(param: Param) = { val idConstantName = paramIdConstantName(param.getName) - val validityFlagName = paramValidityFlagName(param.getName) lines( s"""|Fw::CmdResponse _response{}; | @@ -569,19 +571,17 @@ case class ComponentParameters ( |); |// Set response and update component state |if (_stat == Fw::FW_SERIALIZE_OK) { - | this->$validityFlagName = Fw::ParamValid::VALID; + | ${setValidityFlag(param, "VALID")} | _response = Fw::CmdResponse::OK; |} |else { + | ${setValidityFlag(param, "INVALID")} | _response = Fw::CmdResponse::VALIDATION_ERROR; |} |this->m_paramLock.unLock(); | |// Call notifier - |if (_response == Fw::CmdResponse::OK) { - | this->parameterUpdated($idConstantName); - |} - |// Return response + |this->parameterUpdated($idConstantName); |return _response;""" ) } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 008a76489..a1979ab6d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4693,15 +4693,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -4725,15 +4723,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -4757,15 +4753,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -4789,15 +4783,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -4821,15 +4813,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -4853,15 +4843,13 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 28e088e35..1da8bcc61 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9216,15 +9216,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -9248,15 +9246,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -9280,15 +9276,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -9312,15 +9306,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -9344,15 +9336,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -9376,15 +9366,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 3dc42579d..cd0dda3df 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9003,15 +9003,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -9035,15 +9033,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -9067,15 +9063,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -9099,15 +9093,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -9131,15 +9123,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -9163,15 +9153,13 @@ namespace M { _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index c64aecb25..ca16e27d4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3161,15 +3161,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -3193,15 +3191,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -3225,15 +3221,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -3257,15 +3251,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -3289,15 +3281,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -3321,15 +3311,13 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index a5e7e2b1e..c94bb53c6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -5962,15 +5962,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -5994,15 +5992,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -6026,15 +6022,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -6058,15 +6052,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -6090,15 +6082,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -6122,15 +6112,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 57cb29157..6c66e80bf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6197,15 +6197,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -6229,15 +6227,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -6261,15 +6257,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -6293,15 +6287,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -6325,15 +6317,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -6357,15 +6347,13 @@ Fw::CmdResponse PassiveTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index f7ac09c31..61faf6577 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4717,15 +4717,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -4749,15 +4747,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -4781,15 +4777,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -4813,15 +4807,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -4845,15 +4837,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -4877,15 +4867,13 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index f641707af..44f498540 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9240,15 +9240,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -9272,15 +9270,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -9304,15 +9300,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -9336,15 +9330,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -9368,15 +9360,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -9400,15 +9390,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 65fb86f6e..cb9a5e566 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9025,15 +9025,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMI32EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMI32EXT); return _response; } @@ -9057,15 +9055,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMF64EXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMF64EXT); return _response; } @@ -9089,15 +9085,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); return _response; } @@ -9121,15 +9115,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMENUMEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMENUMEXT); return _response; } @@ -9153,15 +9145,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMARRAYEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMARRAYEXT); return _response; } @@ -9185,15 +9175,13 @@ Fw::CmdResponse QueuedTestComponentBase :: _response = Fw::CmdResponse::OK; } else { + this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } this->m_paramLock.unLock(); // Call notifier - if (_response == Fw::CmdResponse::OK) { - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); - } - // Return response + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); return _response; } From 40985abf79d6f25671da0bedfa0293c9d36bd93a Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 14:43:09 -0700 Subject: [PATCH 30/42] Revise parameter code gen --- .../ComponentParameters.scala | 81 +-- .../ActiveExternalParamsComponentAc.ref.cpp | 252 ++++----- .../base/ActiveParamsComponentAc.ref.cpp | 252 ++++----- .../base/ActiveSerialComponentAc.ref.cpp | 504 +++++++++--------- .../base/ActiveTestComponentAc.ref.cpp | 504 +++++++++--------- .../PassiveExternalParamsComponentAc.ref.cpp | 252 ++++----- .../base/PassiveParamsComponentAc.ref.cpp | 252 ++++----- .../base/PassiveSerialComponentAc.ref.cpp | 504 +++++++++--------- .../base/PassiveTestComponentAc.ref.cpp | 504 +++++++++--------- .../QueuedExternalParamsComponentAc.ref.cpp | 252 ++++----- .../base/QueuedParamsComponentAc.ref.cpp | 252 ++++----- .../base/QueuedSerialComponentAc.ref.cpp | 504 +++++++++--------- .../base/QueuedTestComponentAc.ref.cpp | 504 +++++++++--------- 13 files changed, 2421 insertions(+), 2196 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 9d9eb9eee..831c2bfda 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -47,6 +47,14 @@ case class ComponentParameters ( val validityFlagName = paramValidityFlagName(paramName) s"this->$validityFlagName == Fw::ParamValid::$flagValue" + private def checkValidityFlagValidOrDefault(param: Param) = + s"(${checkValidityFlag(param, "VALID")}) || (${checkValidityFlag(param, "DEFAULT")})" + + private def checkValidityFlagValidBitSet(param: Param) = + val paramName = param.getName + val validityFlagName = paramValidityFlagName(paramName) + s"$validityFlagName & Fw::ParamValid::VALID" + private def deserializeParam(param: Param) = { val paramName = param.getName val varName = paramVariableName(paramName) @@ -513,45 +521,46 @@ case class ComponentParameters ( val prmSetIsConnected = outputPortIsConnectedName(prmSetPortName) val prmSetPortInvokerName = outputPortInvokerName(prmSetPort.get) List.concat( + lines( + s"""|if (!this->$prmSetIsConnected(0)) { + | return Fw::CmdResponse::EXECUTION_ERROR; + |} + |Fw::ParamBuffer _saveBuff; + |const FwIdType idBase = this->getIdBase(); + |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + |// Serialize the parameter + |this->m_paramLock.lock();""" + ), wrapInIf( - s"this->$prmSetIsConnected(0)", - List.concat( - lines( - """|Fw::ParamBuffer _saveBuff; - |const FwIdType idBase = this->getIdBase(); - |// Serialize the parameter - |this->m_paramLock.lock();""" - ), - if (param.isExternal) - then lines( - s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); - |const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( - | static_cast(idBase), - | $idConstantName, - | _saveBuff - |);""" - ) - else lines ( - s"const Fw::SerializeStatus _stat = _saveBuff.serializeFrom($paramVarName);" - ), - lines( - s"""|this->m_paramLock.unlock(); - |if (_stat != Fw::FW_SERIALIZE_OK) { - | return Fw::CmdResponse::VALIDATION_ERROR; - |} - |// Save the parameter - |this->$prmSetPortInvokerName( - | 0, - | static_cast(idBase + $idConstantName), - | _saveBuff - |); - |// Return the command response - |return Fw::CmdResponse::OK; - |""" - ) + checkValidityFlagValidBitSet(param), + if (param.isExternal) + then lines( + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); + |_stat = this->paramDelegatePtr->serializeParam( + | static_cast(idBase), + | $idConstantName, + | _saveBuff + |);""" + ) + else lines ( + s"_stat = _saveBuff.serializeFrom($paramVarName);" ) ), - Line.blank :: lines("return Fw::CmdResponse::EXECUTION_ERROR;") + lines( + s"""|this->m_paramLock.unlock(); + |if (_stat != Fw::FW_SERIALIZE_OK) { + | return Fw::CmdResponse::VALIDATION_ERROR; + |} + |// Save the parameter + |this->$prmSetPortInvokerName( + | 0, + | static_cast(idBase + $idConstantName), + | _saveBuff + |); + |// Return the command response + |return Fw::CmdResponse::OK; + |""" + ) ) } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index a1979ab6d..5a7439a02 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4860,185 +4860,197 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveExternalParamsComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index fce6508ec..85b2759a9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4665,155 +4665,167 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveParamsComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 1da8bcc61..048d17838 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9383,341 +9383,365 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveSerialComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index cd0dda3df..8a1464288 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9170,343 +9170,367 @@ namespace M { Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse ActiveTestComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index ca16e27d4..d57337049 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3328,185 +3328,197 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveExternalParamsComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index e2016fbf6..88a2c7688 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3133,155 +3133,167 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveParamsComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index c94bb53c6..71ff5f967 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -6129,341 +6129,365 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveSerialComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 6c66e80bf..cdeae11bc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6364,343 +6364,367 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse PassiveTestComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 61faf6577..b53c257c8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4884,185 +4884,197 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedExternalParamsComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 8a8b5b056..631787c92 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4689,155 +4689,167 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedParamsComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 44f498540..504bbaa30 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9407,341 +9407,365 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedSerialComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index cb9a5e566..8759bf146 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9192,343 +9192,367 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamU32() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamU32); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMU32), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamU32); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMU32), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamF64); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamF64); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamString() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamString); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamString); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRING), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnum() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamEnum); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamEnum); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUM), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArray() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamArray); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamArray); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAY), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStruct() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); - const Fw::SerializeStatus _stat = _saveBuff.serializeFrom(m_ParamStruct); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; } - - return Fw::CmdResponse::EXECUTION_ERROR; + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + _stat = _saveBuff.serializeFrom(m_ParamStruct); + } + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamI32Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMI32EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamF64Ext() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMF64EXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStringExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRINGEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamEnumExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMENUMEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamArrayExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMARRAYEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } Fw::CmdResponse QueuedTestComponentBase :: paramSave_ParamStructExt() { - if (this->isConnected_prmSetOut_OutputPort(0)) { - Fw::ParamBuffer _saveBuff; - const FwIdType idBase = this->getIdBase(); - // Serialize the parameter - this->m_paramLock.lock(); + if (!this->isConnected_prmSetOut_OutputPort(0)) { + return Fw::CmdResponse::EXECUTION_ERROR; + } + Fw::ParamBuffer _saveBuff; + const FwIdType idBase = this->getIdBase(); + Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; + // Serialize the parameter + this->m_paramLock.lock(); + if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { FW_ASSERT(this->paramDelegatePtr != nullptr); - const Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( + _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, _saveBuff ); - this->m_paramLock.unlock(); - if (_stat != Fw::FW_SERIALIZE_OK) { - return Fw::CmdResponse::VALIDATION_ERROR; - } - // Save the parameter - this->prmSetOut_out( - 0, - static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff - ); - // Return the command response - return Fw::CmdResponse::OK; } - - return Fw::CmdResponse::EXECUTION_ERROR; + this->m_paramLock.unlock(); + if (_stat != Fw::FW_SERIALIZE_OK) { + return Fw::CmdResponse::VALIDATION_ERROR; + } + // Save the parameter + this->prmSetOut_out( + 0, + static_cast(idBase + PARAMID_PARAMSTRUCTEXT), + _saveBuff + ); + // Return the command response + return Fw::CmdResponse::OK; } // ---------------------------------------------------------------------- From c82df1830056f726906be576661eac11b975e2ef Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 14:54:58 -0700 Subject: [PATCH 31/42] Revise param code gen --- .../ComponentParameters.scala | 7 +----- .../ActiveExternalParamsComponentAc.ref.cpp | 12 +++++----- .../base/ActiveParamsComponentAc.ref.cpp | 12 +++++----- .../base/ActiveSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/ActiveTestComponentAc.ref.cpp | 24 +++++++++---------- .../PassiveExternalParamsComponentAc.ref.cpp | 12 +++++----- .../base/PassiveParamsComponentAc.ref.cpp | 12 +++++----- .../base/PassiveSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/PassiveTestComponentAc.ref.cpp | 24 +++++++++---------- .../QueuedExternalParamsComponentAc.ref.cpp | 12 +++++----- .../base/QueuedParamsComponentAc.ref.cpp | 12 +++++----- .../base/QueuedSerialComponentAc.ref.cpp | 24 +++++++++---------- .../base/QueuedTestComponentAc.ref.cpp | 24 +++++++++---------- 13 files changed, 109 insertions(+), 114 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 831c2bfda..8d565356b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -50,11 +50,6 @@ case class ComponentParameters ( private def checkValidityFlagValidOrDefault(param: Param) = s"(${checkValidityFlag(param, "VALID")}) || (${checkValidityFlag(param, "DEFAULT")})" - private def checkValidityFlagValidBitSet(param: Param) = - val paramName = param.getName - val validityFlagName = paramValidityFlagName(paramName) - s"$validityFlagName & Fw::ParamValid::VALID" - private def deserializeParam(param: Param) = { val paramName = param.getName val varName = paramVariableName(paramName) @@ -532,7 +527,7 @@ case class ComponentParameters ( |this->m_paramLock.lock();""" ), wrapInIf( - checkValidityFlagValidBitSet(param), + checkValidityFlagValidOrDefault(param), if (param.isExternal) then lines( s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 5a7439a02..2d006b665 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4868,7 +4868,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4901,7 +4901,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4934,7 +4934,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4967,7 +4967,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -5000,7 +5000,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -5033,7 +5033,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 85b2759a9..ac22a784b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4673,7 +4673,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -4701,7 +4701,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -4729,7 +4729,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -4757,7 +4757,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -4785,7 +4785,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -4813,7 +4813,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 048d17838..f60d622f5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9391,7 +9391,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -9419,7 +9419,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -9447,7 +9447,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -9475,7 +9475,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -9503,7 +9503,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -9531,7 +9531,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -9559,7 +9559,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9592,7 +9592,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9625,7 +9625,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9658,7 +9658,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9691,7 +9691,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9724,7 +9724,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 8a1464288..34578e8af 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9178,7 +9178,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -9206,7 +9206,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -9234,7 +9234,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -9262,7 +9262,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -9290,7 +9290,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -9318,7 +9318,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -9346,7 +9346,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9379,7 +9379,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9412,7 +9412,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9445,7 +9445,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9478,7 +9478,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9511,7 +9511,7 @@ namespace M { Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index d57337049..2f6faa91b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3336,7 +3336,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -3369,7 +3369,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -3402,7 +3402,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -3435,7 +3435,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -3468,7 +3468,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -3501,7 +3501,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 88a2c7688..c0e59a772 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3141,7 +3141,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -3169,7 +3169,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -3197,7 +3197,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -3225,7 +3225,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -3253,7 +3253,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -3281,7 +3281,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 71ff5f967..6ba2d9d3d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -6137,7 +6137,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -6165,7 +6165,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -6193,7 +6193,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -6221,7 +6221,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -6249,7 +6249,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -6277,7 +6277,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -6305,7 +6305,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6338,7 +6338,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6371,7 +6371,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6404,7 +6404,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6437,7 +6437,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6470,7 +6470,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index cdeae11bc..54dc3cd22 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6372,7 +6372,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -6400,7 +6400,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -6428,7 +6428,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -6456,7 +6456,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -6484,7 +6484,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -6512,7 +6512,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -6540,7 +6540,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6573,7 +6573,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6606,7 +6606,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6639,7 +6639,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6672,7 +6672,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -6705,7 +6705,7 @@ Fw::CmdResponse PassiveTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index b53c257c8..ebbd91d40 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4892,7 +4892,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4925,7 +4925,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4958,7 +4958,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -4991,7 +4991,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -5024,7 +5024,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -5057,7 +5057,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 631787c92..306de6b60 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4697,7 +4697,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -4725,7 +4725,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -4753,7 +4753,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -4781,7 +4781,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -4809,7 +4809,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -4837,7 +4837,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 504bbaa30..4e45de19e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9415,7 +9415,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -9443,7 +9443,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -9471,7 +9471,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -9499,7 +9499,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -9527,7 +9527,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -9555,7 +9555,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -9583,7 +9583,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9616,7 +9616,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9649,7 +9649,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9682,7 +9682,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9715,7 +9715,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9748,7 +9748,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 8759bf146..c91b4b455 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9200,7 +9200,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamU32_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); @@ -9228,7 +9228,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); @@ -9256,7 +9256,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamString_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); @@ -9284,7 +9284,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnum_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); @@ -9312,7 +9312,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArray_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); @@ -9340,7 +9340,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStruct_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { _stat = _saveBuff.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); @@ -9368,7 +9368,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamI32Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9401,7 +9401,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamF64Ext_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9434,7 +9434,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStringExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9467,7 +9467,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamEnumExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9500,7 +9500,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamArrayExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), @@ -9533,7 +9533,7 @@ Fw::CmdResponse QueuedTestComponentBase :: Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - if (m_param_ParamStructExt_valid & Fw::ParamValid::VALID) { + if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), From a2cc736a15510a121557396505df0d9fac561459 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 16:45:05 -0700 Subject: [PATCH 32/42] Revise parameter code gen --- .../ComponentParameters.scala | 13 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 36 +++++----- .../base/ActiveParamsComponentAc.ref.cpp | 36 +++++----- .../base/ActiveSerialComponentAc.ref.cpp | 72 +++++++++---------- .../base/ActiveTestComponentAc.ref.cpp | 72 +++++++++---------- .../PassiveExternalParamsComponentAc.ref.cpp | 36 +++++----- .../base/PassiveParamsComponentAc.ref.cpp | 36 +++++----- .../base/PassiveSerialComponentAc.ref.cpp | 72 +++++++++---------- .../base/PassiveTestComponentAc.ref.cpp | 72 +++++++++---------- .../QueuedExternalParamsComponentAc.ref.cpp | 36 +++++----- .../base/QueuedParamsComponentAc.ref.cpp | 36 +++++----- .../base/QueuedSerialComponentAc.ref.cpp | 72 +++++++++---------- .../base/QueuedTestComponentAc.ref.cpp | 72 +++++++++---------- 13 files changed, 330 insertions(+), 331 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 8d565356b..8645bd1ae 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -520,11 +520,11 @@ case class ComponentParameters ( s"""|if (!this->$prmSetIsConnected(0)) { | return Fw::CmdResponse::EXECUTION_ERROR; |} - |Fw::ParamBuffer _saveBuff; |const FwIdType idBase = this->getIdBase(); |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; |// Serialize the parameter - |this->m_paramLock.lock();""" + |this->m_paramLock.lock(); + |this->$paramBufferName.resetSer();""" ), wrapInIf( checkValidityFlagValidOrDefault(param), @@ -534,11 +534,11 @@ case class ComponentParameters ( |_stat = this->paramDelegatePtr->serializeParam( | static_cast(idBase), | $idConstantName, - | _saveBuff + | this->$paramBufferName |);""" ) else lines ( - s"_stat = _saveBuff.serializeFrom($paramVarName);" + s"_stat = this->$paramBufferName.serializeFrom($paramVarName);" ) ), lines( @@ -550,11 +550,10 @@ case class ComponentParameters ( |this->$prmSetPortInvokerName( | 0, | static_cast(idBase + $idConstantName), - | _saveBuff + | this->$paramBufferName |); |// Return the command response - |return Fw::CmdResponse::OK; - |""" + |return Fw::CmdResponse::OK;""" ) ) } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index 2d006b665..a3153d585 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -4863,17 +4863,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4884,7 +4884,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4896,17 +4896,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4917,7 +4917,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4929,17 +4929,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4950,7 +4950,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4962,17 +4962,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4983,7 +4983,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4995,17 +4995,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -5016,7 +5016,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5028,17 +5028,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -5049,7 +5049,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index ac22a784b..156a314b7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -4668,13 +4668,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4684,7 +4684,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4696,13 +4696,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4712,7 +4712,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4724,13 +4724,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4740,7 +4740,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4752,13 +4752,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4768,7 +4768,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4780,13 +4780,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4796,7 +4796,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4808,13 +4808,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4824,7 +4824,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index f60d622f5..c6f0357c8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -9386,13 +9386,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9402,7 +9402,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9414,13 +9414,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9430,7 +9430,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9442,13 +9442,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9458,7 +9458,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9470,13 +9470,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9486,7 +9486,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9498,13 +9498,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9514,7 +9514,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9526,13 +9526,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9542,7 +9542,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9554,17 +9554,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9575,7 +9575,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9587,17 +9587,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9608,7 +9608,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9620,17 +9620,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9641,7 +9641,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9653,17 +9653,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9674,7 +9674,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9686,17 +9686,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9707,7 +9707,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9719,17 +9719,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9740,7 +9740,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 34578e8af..1083e76d7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -9173,13 +9173,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9189,7 +9189,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9201,13 +9201,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9217,7 +9217,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9229,13 +9229,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9245,7 +9245,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9257,13 +9257,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9273,7 +9273,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9285,13 +9285,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9301,7 +9301,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9313,13 +9313,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9329,7 +9329,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9341,17 +9341,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9362,7 +9362,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9374,17 +9374,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9395,7 +9395,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9407,17 +9407,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9428,7 +9428,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9440,17 +9440,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9461,7 +9461,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9473,17 +9473,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9494,7 +9494,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9506,17 +9506,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9527,7 +9527,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index 2f6faa91b..b28922b90 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -3331,17 +3331,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3352,7 +3352,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3364,17 +3364,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3385,7 +3385,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3397,17 +3397,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3418,7 +3418,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3430,17 +3430,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3451,7 +3451,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3463,17 +3463,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3484,7 +3484,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3496,17 +3496,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -3517,7 +3517,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index c0e59a772..685ac35ed 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -3136,13 +3136,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3152,7 +3152,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3164,13 +3164,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3180,7 +3180,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3192,13 +3192,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3208,7 +3208,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3220,13 +3220,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3236,7 +3236,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3248,13 +3248,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3264,7 +3264,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3276,13 +3276,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3292,7 +3292,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 6ba2d9d3d..e4e381d12 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -6132,13 +6132,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6148,7 +6148,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6160,13 +6160,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6176,7 +6176,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6188,13 +6188,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6204,7 +6204,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6216,13 +6216,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6232,7 +6232,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6244,13 +6244,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6260,7 +6260,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6272,13 +6272,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6288,7 +6288,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6300,17 +6300,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6321,7 +6321,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6333,17 +6333,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6354,7 +6354,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6366,17 +6366,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6387,7 +6387,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6399,17 +6399,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6420,7 +6420,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6432,17 +6432,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6453,7 +6453,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6465,17 +6465,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6486,7 +6486,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 54dc3cd22..73d2ca10b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -6367,13 +6367,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6383,7 +6383,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6395,13 +6395,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6411,7 +6411,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6423,13 +6423,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6439,7 +6439,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6451,13 +6451,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6467,7 +6467,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6479,13 +6479,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6495,7 +6495,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6507,13 +6507,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6523,7 +6523,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6535,17 +6535,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6556,7 +6556,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6568,17 +6568,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6589,7 +6589,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6601,17 +6601,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6622,7 +6622,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6634,17 +6634,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6655,7 +6655,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6667,17 +6667,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6688,7 +6688,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6700,17 +6700,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -6721,7 +6721,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index ebbd91d40..0a8393786 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -4887,17 +4887,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4908,7 +4908,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4920,17 +4920,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4941,7 +4941,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4953,17 +4953,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -4974,7 +4974,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4986,17 +4986,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -5007,7 +5007,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5019,17 +5019,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -5040,7 +5040,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5052,17 +5052,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -5073,7 +5073,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 306de6b60..9a287bc67 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -4692,13 +4692,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4708,7 +4708,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4720,13 +4720,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4736,7 +4736,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4748,13 +4748,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4764,7 +4764,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4776,13 +4776,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4792,7 +4792,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4804,13 +4804,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4820,7 +4820,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4832,13 +4832,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4848,7 +4848,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 4e45de19e..6aa950d53 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -9410,13 +9410,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9426,7 +9426,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9438,13 +9438,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9454,7 +9454,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9466,13 +9466,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9482,7 +9482,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9494,13 +9494,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9510,7 +9510,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9522,13 +9522,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9538,7 +9538,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9550,13 +9550,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9566,7 +9566,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9578,17 +9578,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9599,7 +9599,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9611,17 +9611,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9632,7 +9632,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9644,17 +9644,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9665,7 +9665,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9677,17 +9677,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9698,7 +9698,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9710,17 +9710,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9731,7 +9731,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9743,17 +9743,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9764,7 +9764,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index c91b4b455..b3e8f643a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -9195,13 +9195,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamU32); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9211,7 +9211,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9223,13 +9223,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamF64); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9239,7 +9239,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9251,13 +9251,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamString); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9267,7 +9267,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9279,13 +9279,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamEnum); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9295,7 +9295,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9307,13 +9307,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamArray); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9323,7 +9323,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9335,13 +9335,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = _saveBuff.serializeFrom(m_ParamStruct); + _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9351,7 +9351,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9363,17 +9363,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9384,7 +9384,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9396,17 +9396,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9417,7 +9417,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9429,17 +9429,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9450,7 +9450,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9462,17 +9462,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9483,7 +9483,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9495,17 +9495,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9516,7 +9516,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9528,17 +9528,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } - Fw::ParamBuffer _saveBuff; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); + this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - _saveBuff + this->m___fprime_ac_paramBuffer ); } this->m_paramLock.unlock(); @@ -9549,7 +9549,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - _saveBuff + this->m___fprime_ac_paramBuffer ); // Return the command response return Fw::CmdResponse::OK; From 6a40b0fe34dc02d7e9207f82f694f012f13da954 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 17:13:34 -0700 Subject: [PATCH 33/42] Revise parameter code gen --- .../ComponentParameters.scala | 2 +- .../ActiveExternalParamsComponentAc.ref.hpp | 12 +++++----- .../base/ActiveParamsComponentAc.ref.hpp | 12 +++++----- .../base/ActiveSerialComponentAc.ref.hpp | 24 +++++++++---------- .../base/ActiveTestComponentAc.ref.hpp | 24 +++++++++---------- .../PassiveExternalParamsComponentAc.ref.hpp | 12 +++++----- .../base/PassiveParamsComponentAc.ref.hpp | 12 +++++----- .../base/PassiveSerialComponentAc.ref.hpp | 24 +++++++++---------- .../base/PassiveTestComponentAc.ref.hpp | 24 +++++++++---------- .../QueuedExternalParamsComponentAc.ref.hpp | 12 +++++----- .../base/QueuedParamsComponentAc.ref.hpp | 12 +++++----- .../base/QueuedSerialComponentAc.ref.hpp | 24 +++++++++---------- .../base/QueuedTestComponentAc.ref.hpp | 24 +++++++++---------- 13 files changed, 109 insertions(+), 109 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 8645bd1ae..aeea4713e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -347,7 +347,7 @@ case class ComponentParameters ( linesClassMember( lines( s"""| - |//! VALID if $paramName was successfully received + |//! The validity flag for $paramName |Fw::ParamValid $flagName = Fw::ParamValid::UNINIT; |""" ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp index 4cf82dbb4..401aa7a3d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp @@ -2157,22 +2157,22 @@ class ActiveExternalParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp index 810012555..9b6f3b6c5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp @@ -2145,22 +2145,22 @@ class ActiveParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index efcd60e74..463510c57 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -3464,40 +3464,40 @@ class ActiveSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index d5795c659..445ef355b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -3446,40 +3446,40 @@ namespace M { // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp index 82a563c91..d48dd9342 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp @@ -1763,22 +1763,22 @@ class PassiveExternalParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp index c793fec12..926d7bb6f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp @@ -1751,22 +1751,22 @@ class PassiveParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index 7d66ccefd..b98574d9f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -2680,40 +2680,40 @@ class PassiveSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index ca16e8791..e6e9acf1b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -2825,40 +2825,40 @@ class PassiveTestComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp index a2ba367ee..75f551925 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp @@ -2166,22 +2166,22 @@ class QueuedExternalParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp index 784694b0a..152588cd8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp @@ -2154,22 +2154,22 @@ class QueuedParamsComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index fb9336b22..cb9855b9e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -3473,40 +3473,40 @@ class QueuedSerialComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 26b1188eb..9cc4a3013 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -3453,40 +3453,40 @@ class QueuedTestComponentBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! VALID if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamI32Ext was successfully received + //! The validity flag for ParamI32Ext Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamF64Ext was successfully received + //! The validity flag for ParamF64Ext Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStringExt was successfully received + //! The validity flag for ParamStringExt Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamEnumExt was successfully received + //! The validity flag for ParamEnumExt Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamArrayExt was successfully received + //! The validity flag for ParamArrayExt Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! VALID if ParamStructExt was successfully received + //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; private: From e71805c6ea4b3c44a64b75a15ec233ca3cdae572 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 17:46:19 -0700 Subject: [PATCH 34/42] Revise param code gen for unit tests --- .../TestWriter/ComponentTesterBaseWriter.scala | 2 +- .../test-base/ActiveParamsTesterBase.ref.hpp | 12 ++++++------ .../test-base/ActiveSerialTesterBase.ref.hpp | 12 ++++++------ .../component/test-base/ActiveTestTesterBase.ref.hpp | 12 ++++++------ .../test-base/PassiveParamsTesterBase.ref.hpp | 12 ++++++------ .../test-base/PassiveSerialTesterBase.ref.hpp | 12 ++++++------ .../test-base/PassiveTestTesterBase.ref.hpp | 12 ++++++------ .../test-base/QueuedParamsTesterBase.ref.hpp | 12 ++++++------ .../test-base/QueuedSerialTesterBase.ref.hpp | 12 ++++++------ .../component/test-base/QueuedTestTesterBase.ref.hpp | 12 ++++++------ 10 files changed, 55 insertions(+), 55 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index 39c287374..16ad2b358 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -1610,7 +1610,7 @@ case class ComponentTesterBaseWriter( linesClassMember( lines( s"""| - |//! True if ${param.getName} was successfully received + |//! The validity flag for ${param.getName} |Fw::ParamValid ${paramValidityFlagName(param.getName)}; |""" ) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp index e38ad6d43..e8fb58464 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp @@ -1780,22 +1780,22 @@ class ActiveParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp index fd7f3b415..d0e450025 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp @@ -2700,22 +2700,22 @@ class ActiveSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp index 59f6dde1b..f1090d757 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp @@ -2620,22 +2620,22 @@ namespace M { // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp index 5c55f6b93..0c528aecb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp @@ -1561,22 +1561,22 @@ class PassiveParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp index 1205c95ea..d863b7374 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp @@ -2333,22 +2333,22 @@ class PassiveSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp index 342f185d6..04e4b00b5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp @@ -2367,22 +2367,22 @@ class PassiveTestTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp index 42617537e..5024e05fc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp @@ -1764,22 +1764,22 @@ class QueuedParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp index 959d3fb23..6f1b0a4da 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp @@ -2684,22 +2684,22 @@ class QueuedSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp index 451e7ff30..1eebd9cd0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp @@ -2602,22 +2602,22 @@ class QueuedTestTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamU32 was successfully received + //! The validity flag for ParamU32 Fw::ParamValid m_param_ParamU32_valid; - //! True if ParamF64 was successfully received + //! The validity flag for ParamF64 Fw::ParamValid m_param_ParamF64_valid; - //! True if ParamString was successfully received + //! The validity flag for ParamString Fw::ParamValid m_param_ParamString_valid; - //! True if ParamEnum was successfully received + //! The validity flag for ParamEnum Fw::ParamValid m_param_ParamEnum_valid; - //! True if ParamArray was successfully received + //! The validity flag for ParamArray Fw::ParamValid m_param_ParamArray_valid; - //! True if ParamStruct was successfully received + //! The validity flag for ParamStruct Fw::ParamValid m_param_ParamStruct_valid; private: From 6552ff9013e69634b5792d0b5466a890428998e3 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 30 Apr 2026 17:56:51 -0700 Subject: [PATCH 35/42] Revise param code gen for unit tests --- .../TestWriter/ComponentTesterBaseWriter.scala | 1 + .../component/test-base/ActiveExternalParamsTesterBase.ref.cpp | 1 + .../test/component/test-base/ActiveSerialTesterBase.ref.cpp | 1 + .../test/component/test-base/ActiveTestTesterBase.ref.cpp | 1 + .../component/test-base/PassiveExternalParamsTesterBase.ref.cpp | 1 + .../test/component/test-base/PassiveSerialTesterBase.ref.cpp | 1 + .../test/component/test-base/PassiveTestTesterBase.ref.cpp | 1 + .../component/test-base/QueuedExternalParamsTesterBase.ref.cpp | 1 + .../test/component/test-base/QueuedSerialTesterBase.ref.cpp | 1 + .../test/component/test-base/QueuedTestTesterBase.ref.cpp | 1 + 10 files changed, 10 insertions(+) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index 16ad2b358..11575f12c 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -1737,6 +1737,7 @@ case class ExternalParameterDelegate( lines( """|Fw::SerializeStatus stat; |(void) baseId; + |(void) prmStat; | |// Serialize the parameter based on ID |switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.cpp index 7627f863a..66854e20e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus ActiveExternalParamsTesterBase::ActiveExternalParamsComponen { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp index 45d49dec5..fb70e08f4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus ActiveSerialTesterBase::ActiveSerialComponentBaseParamExtern { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp index 08af8d0d5..cee765421 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp @@ -25,6 +25,7 @@ namespace M { { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.cpp index 40d0bc8a1..830074212 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus PassiveExternalParamsTesterBase::PassiveExternalParamsCompon { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp index 280099b83..2ced83083 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus PassiveSerialTesterBase::PassiveSerialComponentBaseParamExte { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp index 5494236f5..129870567 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus PassiveTestTesterBase::PassiveTestComponentBaseParamExternal { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.cpp index c443c7ad0..576d43517 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus QueuedExternalParamsTesterBase::QueuedExternalParamsComponen { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp index 8627180c2..6b118b037 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus QueuedSerialTesterBase::QueuedSerialComponentBaseParamExtern { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp index dc8a03af8..49839b90f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp @@ -23,6 +23,7 @@ Fw::SerializeStatus QueuedTestTesterBase::QueuedTestComponentBaseParamExternalDe { Fw::SerializeStatus stat; (void) baseId; + (void) prmStat; // Serialize the parameter based on ID switch(localId) From 9abac60bcd924dd963e10616118103051169c1e5 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Fri, 1 May 2026 10:23:51 -0700 Subject: [PATCH 36/42] Revise parameter code gen --- .../ComponentCppWriterUtils.scala | 13 ++++++++++++ .../ComponentParameters.scala | 13 ------------ .../ComponentTesterBaseWriter.scala | 21 +++---------------- .../test-base/ActiveParamsTesterBase.ref.cpp | 8 +------ .../test-base/ActiveParamsTesterBase.ref.hpp | 12 +++++------ .../test-base/ActiveSerialTesterBase.ref.cpp | 8 +------ .../test-base/ActiveSerialTesterBase.ref.hpp | 12 +++++------ .../test-base/ActiveTestTesterBase.ref.cpp | 8 +------ .../test-base/ActiveTestTesterBase.ref.hpp | 12 +++++------ .../test-base/PassiveParamsTesterBase.ref.cpp | 8 +------ .../test-base/PassiveParamsTesterBase.ref.hpp | 12 +++++------ .../test-base/PassiveSerialTesterBase.ref.cpp | 8 +------ .../test-base/PassiveSerialTesterBase.ref.hpp | 12 +++++------ .../test-base/PassiveTestTesterBase.ref.cpp | 8 +------ .../test-base/PassiveTestTesterBase.ref.hpp | 12 +++++------ .../test-base/QueuedParamsTesterBase.ref.cpp | 8 +------ .../test-base/QueuedParamsTesterBase.ref.hpp | 12 +++++------ .../test-base/QueuedSerialTesterBase.ref.cpp | 8 +------ .../test-base/QueuedSerialTesterBase.ref.hpp | 12 +++++------ .../test-base/QueuedTestTesterBase.ref.cpp | 8 +------ .../test-base/QueuedTestTesterBase.ref.hpp | 12 +++++------ 21 files changed, 79 insertions(+), 148 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala index aa8d3c77a..38933cdce 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala @@ -964,6 +964,19 @@ abstract class ComponentCppWriterUtils( CppDoc.Function.PureVirtual ) + def getValidityFlagForParam(param: Param) = { + val paramName = param.getName + val flagName = paramValidityFlagName(paramName) + linesClassMember( + lines( + s"""| + |//! The validity flag for $paramName + |Fw::ParamValid $flagName = Fw::ParamValid::UNINIT; + |""" + ) + ) + } + /** Writes the type of a state machine implementation */ def writeStateMachineImplType(smSymbol: Symbol.StateMachine) = StateMachine.getSymbolKind(smSymbol) match { diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index aeea4713e..e63905c7c 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -341,19 +341,6 @@ case class ComponentParameters ( sortedParams.map((_, param) => getSetterForParam(param)) ) - private def getValidityFlagForParam(param: Param) = { - val paramName = param.getName - val flagName = paramValidityFlagName(paramName) - linesClassMember( - lines( - s"""| - |//! The validity flag for $paramName - |Fw::ParamValid $flagName = Fw::ParamValid::UNINIT; - |""" - ) - ) - } - private def getValidityFlags = addAccessTagAndComment( "private", "Parameter validity flags", diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index 11575f12c..5b66d9faa 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -194,11 +194,7 @@ case class ComponentTesterBaseWriter( constructorClassMember( Some(s"Construct object $testerBaseClassName"), constructorParams, - "Fw::PassiveComponentBase(compName)" :: sortedParams.collect { - case (_, param) if !param.isExternal => - val flagName = paramValidityFlagName(param.getName) - s"$flagName(Fw::ParamValid::UNINIT)" - }, + List("Fw::PassiveComponentBase(compName)"), { lazy val portHistories = line("// Initialize port histories") :: typedOutputPorts.filter(hasPortParams).map(p => { @@ -1604,19 +1600,8 @@ case class ComponentTesterBaseWriter( addAccessTagAndComment( "private", "Parameter validity flags", - sortedParams.flatMap { case (_, param) => - guardedList (!param.isExternal) ( - List( - linesClassMember( - lines( - s"""| - |//! The validity flag for ${param.getName} - |Fw::ParamValid ${paramValidityFlagName(param.getName)}; - |""" - ) - ) - ) - ) + sortedParams.collect { + case (_, param) if !param.isExternal => getValidityFlagForParam(param) }, CppDoc.Lines.Hpp ), diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp index 42959e509..6f07906e5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp @@ -1189,13 +1189,7 @@ ActiveParamsTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp index e8fb58464..8a6da1974 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp @@ -1781,22 +1781,22 @@ class ActiveParamsTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp index fb70e08f4..45dde407a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp @@ -1592,13 +1592,7 @@ ActiveSerialTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp index d0e450025..d39da68cf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp @@ -2701,22 +2701,22 @@ class ActiveSerialTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp index cee765421..82aa81fab 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp @@ -1464,13 +1464,7 @@ namespace M { const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp index f1090d757..7e7bb1350 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp @@ -2621,22 +2621,22 @@ namespace M { // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp index 1bd8d968f..d7eb96775 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp @@ -991,13 +991,7 @@ PassiveParamsTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp index 0c528aecb..86c93df10 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp @@ -1562,22 +1562,22 @@ class PassiveParamsTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp index 2ced83083..db2131c4c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp @@ -1262,13 +1262,7 @@ PassiveSerialTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp index d863b7374..df6789c12 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp @@ -2334,22 +2334,22 @@ class PassiveSerialTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp index 129870567..1e75dee5e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp @@ -1264,13 +1264,7 @@ PassiveTestTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp index 04e4b00b5..e42253980 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp @@ -2368,22 +2368,22 @@ class PassiveTestTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp index 442d3c441..cb87c5f92 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp @@ -1189,13 +1189,7 @@ QueuedParamsTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp index 5024e05fc..d17701651 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp @@ -1765,22 +1765,22 @@ class QueuedParamsTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp index 6b118b037..e0783d008 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp @@ -1592,13 +1592,7 @@ QueuedSerialTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp index 6f1b0a4da..a411c41d3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp @@ -2685,22 +2685,22 @@ class QueuedSerialTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp index 49839b90f..d95d2e233 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp @@ -1462,13 +1462,7 @@ QueuedTestTesterBase :: const char* const compName, const U32 maxHistorySize ) : - Fw::PassiveComponentBase(compName), - m_param_ParamU32_valid(Fw::ParamValid::UNINIT), - m_param_ParamF64_valid(Fw::ParamValid::UNINIT), - m_param_ParamString_valid(Fw::ParamValid::UNINIT), - m_param_ParamEnum_valid(Fw::ParamValid::UNINIT), - m_param_ParamArray_valid(Fw::ParamValid::UNINIT), - m_param_ParamStruct_valid(Fw::ParamValid::UNINIT) + Fw::PassiveComponentBase(compName) { // Initialize port histories this->fromPortHistory_typedAliasOut = new History(maxHistorySize); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp index 1eebd9cd0..8bfd462b3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp @@ -2603,22 +2603,22 @@ class QueuedTestTesterBase : // ---------------------------------------------------------------------- //! The validity flag for ParamU32 - Fw::ParamValid m_param_ParamU32_valid; + Fw::ParamValid m_param_ParamU32_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamF64 - Fw::ParamValid m_param_ParamF64_valid; + Fw::ParamValid m_param_ParamF64_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamString - Fw::ParamValid m_param_ParamString_valid; + Fw::ParamValid m_param_ParamString_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamEnum - Fw::ParamValid m_param_ParamEnum_valid; + Fw::ParamValid m_param_ParamEnum_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamArray - Fw::ParamValid m_param_ParamArray_valid; + Fw::ParamValid m_param_ParamArray_valid = Fw::ParamValid::UNINIT; //! The validity flag for ParamStruct - Fw::ParamValid m_param_ParamStruct_valid; + Fw::ParamValid m_param_ParamStruct_valid = Fw::ParamValid::UNINIT; private: From b15775c310be2d23c52586e8565689b9f45151ec Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Fri, 1 May 2026 14:27:19 -0700 Subject: [PATCH 37/42] Revise param code gen for unit tests --- .../ComponentTesterBaseWriter.scala | 41 ++++++------------- .../ActiveExternalParamsTesterBase.ref.hpp | 24 +++++------ .../test-base/ActiveSerialTesterBase.ref.hpp | 24 +++++------ .../test-base/ActiveTestTesterBase.ref.hpp | 24 +++++------ .../PassiveExternalParamsTesterBase.ref.hpp | 24 +++++------ .../test-base/PassiveSerialTesterBase.ref.hpp | 24 +++++------ .../test-base/PassiveTestTesterBase.ref.hpp | 24 +++++------ .../QueuedExternalParamsTesterBase.ref.hpp | 24 +++++------ .../test-base/QueuedSerialTesterBase.ref.hpp | 24 +++++------ .../test-base/QueuedTestTesterBase.ref.hpp | 24 +++++------ 10 files changed, 121 insertions(+), 136 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index 5b66d9faa..e628833d5 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -1819,41 +1819,26 @@ case class ExternalParameterDelegate( addAccessTagAndComment( "public", "Parameter validity flags", - sortedParams.flatMap { case (_, param) => - guardedList (param.isExternal) ( - List( - linesClassMember( - lines( - s"""| - |//! True if ${param.getName} was successfully received - |Fw::ParamValid ${paramValidityFlagName(param.getName)}; - |""" - ) - ) - ) - ) + sortedParams.collect { + case (_, param) if param.isExternal => getValidityFlagForParam(param) }, CppDoc.Lines.Hpp ), addAccessTagAndComment( "public", "Parameter variables", - sortedParams.flatMap { case (_, param) => - guardedList (param.isExternal) { - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val paramVarName = paramVariableName(param.getName) - List( - linesClassMember( - List.concat( - addSeparatedPreComment( - s"Parameter ${param.getName}", - AnnotationCppWriter.asStringOpt(param.aNode) - ), - lines(s"$paramType $paramVarName;") - ) - ) + sortedParams.collect { case (_, param) if param.isExternal => + val paramType = writeParamType(param.paramType, "Fw::ParamString") + val paramVarName = paramVariableName(param.getName) + linesClassMember( + List.concat( + addSeparatedPreComment( + s"Parameter ${param.getName}", + AnnotationCppWriter.asStringOpt(param.aNode) + ), + lines(s"$paramType $paramVarName;") ) - } + ) }, CppDoc.Lines.Hpp ) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp index e31b94b07..6d9cf15f3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp @@ -231,23 +231,23 @@ class ActiveExternalParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp index d39da68cf..3f45cf1c1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp @@ -343,23 +343,23 @@ class ActiveSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp index 7e7bb1350..624cb76d4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp @@ -358,23 +358,23 @@ namespace M { // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp index 87435ee57..d0de33b25 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp @@ -231,23 +231,23 @@ class PassiveExternalParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp index df6789c12..335aed220 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp @@ -343,23 +343,23 @@ class PassiveSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp index e42253980..948d3eddb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp @@ -356,23 +356,23 @@ class PassiveTestTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp index be830e6e6..70956805d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp @@ -231,23 +231,23 @@ class QueuedExternalParamsTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp index a411c41d3..76dbfad40 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp @@ -343,23 +343,23 @@ class QueuedSerialTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp index 8bfd462b3..ede3a793d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp @@ -356,23 +356,23 @@ class QueuedTestTesterBase : // Parameter validity flags // ---------------------------------------------------------------------- - //! True if ParamI32Ext was successfully received - Fw::ParamValid m_param_ParamI32Ext_valid; + //! The validity flag for ParamI32Ext + Fw::ParamValid m_param_ParamI32Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamF64Ext was successfully received - Fw::ParamValid m_param_ParamF64Ext_valid; + //! The validity flag for ParamF64Ext + Fw::ParamValid m_param_ParamF64Ext_valid = Fw::ParamValid::UNINIT; - //! True if ParamStringExt was successfully received - Fw::ParamValid m_param_ParamStringExt_valid; + //! The validity flag for ParamStringExt + Fw::ParamValid m_param_ParamStringExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamEnumExt was successfully received - Fw::ParamValid m_param_ParamEnumExt_valid; + //! The validity flag for ParamEnumExt + Fw::ParamValid m_param_ParamEnumExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamArrayExt was successfully received - Fw::ParamValid m_param_ParamArrayExt_valid; + //! The validity flag for ParamArrayExt + Fw::ParamValid m_param_ParamArrayExt_valid = Fw::ParamValid::UNINIT; - //! True if ParamStructExt was successfully received - Fw::ParamValid m_param_ParamStructExt_valid; + //! The validity flag for ParamStructExt + Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; public: From 7bb0d324eead4752d4a094253ee0eb7e42ca168b Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Fri, 1 May 2026 14:41:04 -0700 Subject: [PATCH 38/42] Refactor parameter code gen --- .../ComponentCppWriterUtils.scala | 16 +++++++++ .../ComponentParameters.scala | 36 ++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala index 38933cdce..8104b4c20 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala @@ -951,6 +951,22 @@ abstract class ComponentCppWriterUtils( case PortInstance.Type.Serial => "void" } + def getParamVariableName(name: String) = + s"m_$name" + + def getParamVarForParam(param: Param) = + val paramType = writeParamType(param.paramType, "Fw::ParamString") + val paramVarName = getParamVariableName(param.getName) + linesClassMember( + List.concat( + addSeparatedPreComment( + s"Parameter ${param.getName}", + AnnotationCppWriter.asStringOpt(param.aNode) + ), + lines(s"$paramType $paramVarName;") + ) + ) + def getVirtualOverflowHook( name: String, msgType: MessageType, diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index e63905c7c..f119f3e2f 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -52,7 +52,7 @@ case class ComponentParameters ( private def deserializeParam(param: Param) = { val paramName = param.getName - val varName = paramVariableName(paramName) + val varName = getParamVariableName(paramName) val validityFlagName = paramValidityFlagName(paramName) if param.isExternal then @@ -201,7 +201,7 @@ case class ComponentParameters ( |}""" ) else - val variableName = paramVariableName(param.getName) + val variableName = getParamVariableName(param.getName) lines(s"_local = this->$variableName;") } @@ -264,29 +264,16 @@ case class ComponentParameters ( CppDoc.Function.Virtual ) - private def getParamVarForParam(param: Param) = - guardedList (!param.isExternal) { - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val paramVarName = paramVariableName(param.getName) - List( - linesClassMember( - List.concat( - addSeparatedPreComment( - s"Parameter ${param.getName}", - AnnotationCppWriter.asStringOpt(param.aNode) - ), - lines(s"$paramType $paramVarName;") - ) - ) - ) - } - private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", List.concat( + // Internal and external parameters need a parameter buffer for scratch memory guardedList(!sortedParams.isEmpty) (List(getParamBuffer)), - sortedParams.flatMap((_, param) => getParamVarForParam(param)) + // Only internal parameters need parameter value variables + sortedParams.collect { + case (_, param) if !param.isExternal => getParamVarForParam(param) + } ), CppDoc.Lines.Hpp ) @@ -351,12 +338,9 @@ case class ComponentParameters ( private def paramGetterName(name: String) = s"paramGet_$name" - private def paramVariableName(name: String) = - s"m_$name" - private def setDefaultValue(param: Param, value: Value) = { val paramName = param.getName - val varName = paramVariableName(paramName) + val varName = getParamVariableName(paramName) val cppValue = ValueCppWriter.write(s, value) if param.isExternal then @@ -498,7 +482,7 @@ case class ComponentParameters ( private def writeSaveFunctionBodyForParam(param: Param) = { val idConstantName = paramIdConstantName(param.getName) - val paramVarName = paramVariableName(param.getName) + val paramVarName = getParamVariableName(param.getName) val prmSetPortName = prmSetPort.get.getUnqualifiedName val prmSetIsConnected = outputPortIsConnectedName(prmSetPortName) val prmSetPortInvokerName = outputPortInvokerName(prmSetPort.get) @@ -578,7 +562,7 @@ case class ComponentParameters ( private def writeSetterBodyForInternalParam(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") - val varName = paramVariableName(param.getName) + val varName = getParamVariableName(param.getName) val validityFlagName = paramValidityFlagName(param.getName) val idConstantName = paramIdConstantName(param.getName) lines( From d27be4649207941a54cfb653217312cb105f50c5 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Fri, 1 May 2026 14:45:40 -0700 Subject: [PATCH 39/42] Revert "Refactor parameter code gen" This reverts commit 7bb0d324eead4752d4a094253ee0eb7e42ca168b. --- .../ComponentCppWriterUtils.scala | 16 --------- .../ComponentParameters.scala | 36 +++++++++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala index 8104b4c20..38933cdce 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala @@ -951,22 +951,6 @@ abstract class ComponentCppWriterUtils( case PortInstance.Type.Serial => "void" } - def getParamVariableName(name: String) = - s"m_$name" - - def getParamVarForParam(param: Param) = - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val paramVarName = getParamVariableName(param.getName) - linesClassMember( - List.concat( - addSeparatedPreComment( - s"Parameter ${param.getName}", - AnnotationCppWriter.asStringOpt(param.aNode) - ), - lines(s"$paramType $paramVarName;") - ) - ) - def getVirtualOverflowHook( name: String, msgType: MessageType, diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index f119f3e2f..e63905c7c 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -52,7 +52,7 @@ case class ComponentParameters ( private def deserializeParam(param: Param) = { val paramName = param.getName - val varName = getParamVariableName(paramName) + val varName = paramVariableName(paramName) val validityFlagName = paramValidityFlagName(paramName) if param.isExternal then @@ -201,7 +201,7 @@ case class ComponentParameters ( |}""" ) else - val variableName = getParamVariableName(param.getName) + val variableName = paramVariableName(param.getName) lines(s"_local = this->$variableName;") } @@ -264,16 +264,29 @@ case class ComponentParameters ( CppDoc.Function.Virtual ) + private def getParamVarForParam(param: Param) = + guardedList (!param.isExternal) { + val paramType = writeParamType(param.paramType, "Fw::ParamString") + val paramVarName = paramVariableName(param.getName) + List( + linesClassMember( + List.concat( + addSeparatedPreComment( + s"Parameter ${param.getName}", + AnnotationCppWriter.asStringOpt(param.aNode) + ), + lines(s"$paramType $paramVarName;") + ) + ) + ) + } + private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", List.concat( - // Internal and external parameters need a parameter buffer for scratch memory guardedList(!sortedParams.isEmpty) (List(getParamBuffer)), - // Only internal parameters need parameter value variables - sortedParams.collect { - case (_, param) if !param.isExternal => getParamVarForParam(param) - } + sortedParams.flatMap((_, param) => getParamVarForParam(param)) ), CppDoc.Lines.Hpp ) @@ -338,9 +351,12 @@ case class ComponentParameters ( private def paramGetterName(name: String) = s"paramGet_$name" + private def paramVariableName(name: String) = + s"m_$name" + private def setDefaultValue(param: Param, value: Value) = { val paramName = param.getName - val varName = getParamVariableName(paramName) + val varName = paramVariableName(paramName) val cppValue = ValueCppWriter.write(s, value) if param.isExternal then @@ -482,7 +498,7 @@ case class ComponentParameters ( private def writeSaveFunctionBodyForParam(param: Param) = { val idConstantName = paramIdConstantName(param.getName) - val paramVarName = getParamVariableName(param.getName) + val paramVarName = paramVariableName(param.getName) val prmSetPortName = prmSetPort.get.getUnqualifiedName val prmSetIsConnected = outputPortIsConnectedName(prmSetPortName) val prmSetPortInvokerName = outputPortInvokerName(prmSetPort.get) @@ -562,7 +578,7 @@ case class ComponentParameters ( private def writeSetterBodyForInternalParam(param: Param) = { val paramType = writeParamType(param.paramType, "Fw::ParamString") - val varName = getParamVariableName(param.getName) + val varName = paramVariableName(param.getName) val validityFlagName = paramValidityFlagName(param.getName) val idConstantName = paramIdConstantName(param.getName) lines( From 567703e27c57955c2c7ce5b9d69b2d83eb1397c1 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Fri, 1 May 2026 14:49:16 -0700 Subject: [PATCH 40/42] Refactor parameter code gen --- .../ComponentParameters.scala | 30 +++++++++---------- .../ComponentTesterBaseWriter.scala | 26 +++++++--------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index e63905c7c..8c05cbb6d 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -265,28 +265,28 @@ case class ComponentParameters ( ) private def getParamVarForParam(param: Param) = - guardedList (!param.isExternal) { - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val paramVarName = paramVariableName(param.getName) - List( - linesClassMember( - List.concat( - addSeparatedPreComment( - s"Parameter ${param.getName}", - AnnotationCppWriter.asStringOpt(param.aNode) - ), - lines(s"$paramType $paramVarName;") - ) - ) + val paramType = writeParamType(param.paramType, "Fw::ParamString") + val paramVarName = paramVariableName(param.getName) + linesClassMember( + List.concat( + addSeparatedPreComment( + s"Parameter ${param.getName}", + AnnotationCppWriter.asStringOpt(param.aNode) + ), + lines(s"$paramType $paramVarName;") ) - } + ) private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", List.concat( + // Internal and external parameters need a parameter buffer for scratch memory guardedList(!sortedParams.isEmpty) (List(getParamBuffer)), - sortedParams.flatMap((_, param) => getParamVarForParam(param)) + // Only internal paramenters need storage for parameter values + sortedParams.collect { + case (_, param) if !param.isExternal => getParamVarForParam(param) + } ), CppDoc.Lines.Hpp ) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index e628833d5..0653e5f62 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -1608,22 +1608,18 @@ case class ComponentTesterBaseWriter( addAccessTagAndComment( "private", "Parameter variables", - sortedParams.flatMap { case (_, param) => - guardedList (!param.isExternal) { - val paramType = writeParamType(param.paramType, "Fw::ParamString") - val paramVarName = paramVariableName(param.getName) - List( - linesClassMember( - List.concat( - addSeparatedPreComment( - s"Parameter ${param.getName}", - AnnotationCppWriter.asStringOpt(param.aNode) - ), - lines(s"$paramType $paramVarName;") - ) - ) + sortedParams.collect { case (_, param) if !param.isExternal => + val paramType = writeParamType(param.paramType, "Fw::ParamString") + val paramVarName = paramVariableName(param.getName) + linesClassMember( + List.concat( + addSeparatedPreComment( + s"Parameter ${param.getName}", + AnnotationCppWriter.asStringOpt(param.aNode) + ), + lines(s"$paramType $paramVarName;") ) - } + ) }, CppDoc.Lines.Hpp ), From d24bdef5594251f502d3aee2bfd00ac8c814bdb5 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 27 May 2026 20:40:54 -0700 Subject: [PATCH 41/42] Revise parameter code gen Move param buffer back to the stack --- .../ComponentParameters.scala | 58 ++-- .../ActiveExternalParamsComponentAc.ref.cpp | 145 +++++----- .../ActiveExternalParamsComponentAc.ref.hpp | 9 - .../base/ActiveParamsComponentAc.ref.cpp | 103 ++++---- .../base/ActiveParamsComponentAc.ref.hpp | 3 - .../base/ActiveSerialComponentAc.ref.cpp | 247 +++++++++--------- .../base/ActiveSerialComponentAc.ref.hpp | 3 - .../base/ActiveTestComponentAc.ref.cpp | 247 +++++++++--------- .../base/ActiveTestComponentAc.ref.hpp | 3 - .../PassiveExternalParamsComponentAc.ref.cpp | 145 +++++----- .../PassiveExternalParamsComponentAc.ref.hpp | 9 - .../base/PassiveParamsComponentAc.ref.cpp | 103 ++++---- .../base/PassiveParamsComponentAc.ref.hpp | 3 - .../base/PassiveSerialComponentAc.ref.cpp | 247 +++++++++--------- .../base/PassiveSerialComponentAc.ref.hpp | 3 - .../base/PassiveTestComponentAc.ref.cpp | 247 +++++++++--------- .../base/PassiveTestComponentAc.ref.hpp | 3 - .../QueuedExternalParamsComponentAc.ref.cpp | 145 +++++----- .../QueuedExternalParamsComponentAc.ref.hpp | 9 - .../base/QueuedParamsComponentAc.ref.cpp | 103 ++++---- .../base/QueuedParamsComponentAc.ref.hpp | 3 - .../base/QueuedSerialComponentAc.ref.cpp | 247 +++++++++--------- .../base/QueuedSerialComponentAc.ref.hpp | 3 - .../base/QueuedTestComponentAc.ref.cpp | 247 +++++++++--------- .../base/QueuedTestComponentAc.ref.hpp | 3 - 25 files changed, 1169 insertions(+), 1169 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index 8c05cbb6d..b68d98216 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -10,7 +10,7 @@ case class ComponentParameters ( aNode: Ast.Annotated[AstNode[Ast.DefComponent]] ) extends ComponentCppWriterUtils(s, aNode) { - val paramBufferName = "m___fprime_ac_paramBuffer" + val paramBufferName = "_paramBuffer" def getConstantMembers: List[CppDoc.Class.Member] = guardedList (hasParameters) (List(getParamIds)) @@ -63,11 +63,11 @@ case class ComponentParameters ( | _baseId, | $idConstantName, | this->$validityFlagName, - | this->$paramBufferName + | $paramBufferName |);""" ) else - lines(s"_stat = this->$paramBufferName.deserializeTo(this->$varName);") + lines(s"_stat = $paramBufferName.deserializeTo(this->$varName);") } private def getExternalParameterFunctions: List[CppDoc.Class.Member] = { @@ -155,15 +155,6 @@ case class ComponentParameters ( ) ) - private def getParamBuffer = - linesClassMember( - lines( - s"""| - |//! Scratch buffer for parameter management - |Fw::ParamBuffer $paramBufferName;""" - ) - ) - private def getParamDelegate = addAccessTagAndComment( "private", @@ -186,8 +177,7 @@ case class ComponentParameters ( then val idConstantName = paramIdConstantName(param.getName) lines( - s"""|$paramBufferName.resetSer(); - |FW_ASSERT(this->paramDelegatePtr != nullptr); + s"""|FW_ASSERT(this->paramDelegatePtr != nullptr); |Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( | static_cast(this->getIdBase()), | $idConstantName, @@ -218,7 +208,7 @@ case class ComponentParameters ( |this->$validityFlagName = this->$prmGetPortInvokerName( | 0, | _id, - | this->$paramBufferName + | $paramBufferName |);""" ) } @@ -280,14 +270,10 @@ case class ComponentParameters ( private def getParamVars = addAccessTagAndComment( "private", "Parameter variables", - List.concat( - // Internal and external parameters need a parameter buffer for scratch memory - guardedList(!sortedParams.isEmpty) (List(getParamBuffer)), - // Only internal paramenters need storage for parameter values - sortedParams.collect { - case (_, param) if !param.isExternal => getParamVarForParam(param) - } - ), + // Only internal paramenters need storage for parameter values + sortedParams.collect { + case (_, param) if !param.isExternal => getParamVarForParam(param) + }, CppDoc.Lines.Hpp ) @@ -365,8 +351,8 @@ case class ComponentParameters ( List.concat( lines( s"""|$cppType _val = $cppValue; - |this->$paramBufferName.resetSer(); - |_stat = this->$paramBufferName.serializeFrom(_val);""" + |$paramBufferName.resetSer(); + |_stat = $paramBufferName.serializeFrom(_val);""" ), deserializeParam(param), wrapInIf( @@ -391,7 +377,8 @@ case class ComponentParameters ( val validityFlagName = paramValidityFlagName(param.getName) List.concat( lines( - s"""|$paramType _local{}; + s"""|Fw::ParamBuffer $paramBufferName; + |$paramType _local{}; |this->m_paramLock.lock(); |valid = this->$validityFlagName;""" ), @@ -400,7 +387,7 @@ case class ComponentParameters ( getParamFromComponent(param) ), lines( - """|this->m_paramLock.unLock(); + """|this->m_paramLock.unlock(); |return _local;""" ) ) @@ -459,7 +446,7 @@ case class ComponentParameters ( }, lines( """| - |this->m_paramLock.unLock();""" + |this->m_paramLock.unlock();""" ) ) } @@ -474,6 +461,7 @@ case class ComponentParameters ( |FW_ASSERT(this->$prmGetIsConnected(0)); | |FwPrmIdType _id{}; + |Fw::ParamBuffer $paramBufferName; |""" ), sortedParams.flatMap((_, param) => writeLoadForParam(param)), @@ -507,11 +495,11 @@ case class ComponentParameters ( s"""|if (!this->$prmSetIsConnected(0)) { | return Fw::CmdResponse::EXECUTION_ERROR; |} + |Fw::ParamBuffer $paramBufferName; |const FwIdType idBase = this->getIdBase(); |Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; |// Serialize the parameter - |this->m_paramLock.lock(); - |this->$paramBufferName.resetSer();""" + |this->m_paramLock.lock();""" ), wrapInIf( checkValidityFlagValidOrDefault(param), @@ -521,11 +509,11 @@ case class ComponentParameters ( |_stat = this->paramDelegatePtr->serializeParam( | static_cast(idBase), | $idConstantName, - | this->$paramBufferName + | $paramBufferName |);""" ) else lines ( - s"_stat = this->$paramBufferName.serializeFrom($paramVarName);" + s"_stat = $paramBufferName.serializeFrom($paramVarName);" ) ), lines( @@ -537,7 +525,7 @@ case class ComponentParameters ( |this->$prmSetPortInvokerName( | 0, | static_cast(idBase + $idConstantName), - | this->$paramBufferName + | $paramBufferName |); |// Return the command response |return Fw::CmdResponse::OK;""" @@ -568,7 +556,7 @@ case class ComponentParameters ( | ${setValidityFlag(param, "INVALID")} | _response = Fw::CmdResponse::VALIDATION_ERROR; |} - |this->m_paramLock.unLock(); + |this->m_paramLock.unlock(); | |// Call notifier |this->parameterUpdated($idConstantName); @@ -592,7 +580,7 @@ case class ComponentParameters ( |this->m_paramLock.lock(); |this->$varName = _localVal; |this->$validityFlagName = Fw::ParamValid::VALID; - |this->m_paramLock.unLock(); + |this->m_paramLock.unlock(); | |// Call notifier |this->parameterUpdated($idConstantName); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index a3153d585..bb98dad7a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1671,6 +1671,7 @@ void ActiveExternalParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMI32EXT; @@ -1678,7 +1679,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1689,13 +1690,13 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -1703,7 +1704,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1714,13 +1715,13 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -1728,7 +1729,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1740,7 +1741,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1751,21 +1752,21 @@ void ActiveExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -1773,7 +1774,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1784,13 +1785,13 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -1798,7 +1799,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1810,7 +1811,7 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1821,21 +1822,21 @@ void ActiveExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -1843,7 +1844,7 @@ void ActiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1854,13 +1855,13 @@ void ActiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -3507,150 +3508,150 @@ void ActiveExternalParamsComponentBase :: I32 ActiveExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -4696,7 +4697,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -4726,7 +4727,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -4756,7 +4757,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -4786,7 +4787,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -4816,7 +4817,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -4846,7 +4847,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -4863,17 +4864,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4884,7 +4885,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4896,17 +4897,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4917,7 +4918,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4929,17 +4930,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4950,7 +4951,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4962,17 +4963,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4983,7 +4984,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4995,17 +4996,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -5016,7 +5017,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5028,17 +5029,17 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -5049,7 +5050,7 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp index 401aa7a3d..8c868758f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.hpp @@ -2175,15 +2175,6 @@ class ActiveExternalParamsComponentBase : //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; - private: - - // ---------------------------------------------------------------------- - // Parameter variables - // ---------------------------------------------------------------------- - - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 156a314b7..48835ac2d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -1671,6 +1671,7 @@ void ActiveParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -1678,20 +1679,20 @@ void ActiveParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -1699,20 +1700,20 @@ void ActiveParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -1720,14 +1721,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1739,7 +1740,7 @@ void ActiveParamsComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -1747,20 +1748,20 @@ void ActiveParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -1768,14 +1769,14 @@ void ActiveParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1787,7 +1788,7 @@ void ActiveParamsComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -1795,20 +1796,20 @@ void ActiveParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -3455,78 +3456,84 @@ void ActiveParamsComponentBase :: U32 ActiveParamsComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -4551,7 +4558,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -4571,7 +4578,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -4591,7 +4598,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -4611,7 +4618,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -4631,7 +4638,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -4651,7 +4658,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -4668,13 +4675,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4684,7 +4691,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4696,13 +4703,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4712,7 +4719,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4724,13 +4731,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4740,7 +4747,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4752,13 +4759,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4768,7 +4775,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4780,13 +4787,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4796,7 +4803,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4808,13 +4815,13 @@ Fw::CmdResponse ActiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4824,7 +4831,7 @@ Fw::CmdResponse ActiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp index 9b6f3b6c5..17d875b48 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp @@ -2169,9 +2169,6 @@ class ActiveParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index c6f0357c8..cf38b0a99 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2133,6 +2133,7 @@ void ActiveSerialComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -2140,20 +2141,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -2161,20 +2162,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -2182,14 +2183,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2201,7 +2202,7 @@ void ActiveSerialComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -2209,20 +2210,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -2230,14 +2231,14 @@ void ActiveSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2249,7 +2250,7 @@ void ActiveSerialComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -2257,20 +2258,20 @@ void ActiveSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -2278,7 +2279,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2289,13 +2290,13 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -2303,7 +2304,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2314,13 +2315,13 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -2328,7 +2329,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2340,7 +2341,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2351,21 +2352,21 @@ void ActiveSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -2373,7 +2374,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2384,13 +2385,13 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -2398,7 +2399,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2410,7 +2411,7 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2421,21 +2422,21 @@ void ActiveSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -2443,7 +2444,7 @@ void ActiveSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2454,13 +2455,13 @@ void ActiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -7132,228 +7133,234 @@ void ActiveSerialComponentBase :: U32 ActiveSerialComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 ActiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -9089,7 +9096,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -9109,7 +9116,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -9129,7 +9136,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -9149,7 +9156,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -9169,7 +9176,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -9189,7 +9196,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -9219,7 +9226,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -9249,7 +9256,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -9279,7 +9286,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -9309,7 +9316,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -9339,7 +9346,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -9369,7 +9376,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -9386,13 +9393,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9402,7 +9409,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9414,13 +9421,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9430,7 +9437,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9442,13 +9449,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9458,7 +9465,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9470,13 +9477,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9486,7 +9493,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9498,13 +9505,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9514,7 +9521,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9526,13 +9533,13 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9542,7 +9549,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9554,17 +9561,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9575,7 +9582,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9587,17 +9594,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9608,7 +9615,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9620,17 +9627,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9641,7 +9648,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9653,17 +9660,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9674,7 +9681,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9686,17 +9693,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9707,7 +9714,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9719,17 +9726,17 @@ Fw::CmdResponse ActiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9740,7 +9747,7 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index 463510c57..4aa13f83f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -3506,9 +3506,6 @@ class ActiveSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 1083e76d7..97d3df501 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2211,6 +2211,7 @@ namespace M { FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -2218,20 +2219,20 @@ namespace M { this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -2239,20 +2240,20 @@ namespace M { this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -2260,14 +2261,14 @@ namespace M { this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2279,7 +2280,7 @@ namespace M { this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -2287,20 +2288,20 @@ namespace M { this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -2308,14 +2309,14 @@ namespace M { this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2327,7 +2328,7 @@ namespace M { this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -2335,20 +2336,20 @@ namespace M { this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -2356,7 +2357,7 @@ namespace M { this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2367,13 +2368,13 @@ namespace M { _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -2381,7 +2382,7 @@ namespace M { this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2392,13 +2393,13 @@ namespace M { _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -2406,7 +2407,7 @@ namespace M { this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2418,7 +2419,7 @@ namespace M { _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2429,21 +2430,21 @@ namespace M { } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -2451,7 +2452,7 @@ namespace M { this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2462,13 +2463,13 @@ namespace M { _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -2476,7 +2477,7 @@ namespace M { this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2488,7 +2489,7 @@ namespace M { _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2499,21 +2500,21 @@ namespace M { } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -2521,7 +2522,7 @@ namespace M { this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2532,13 +2533,13 @@ namespace M { _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -6964,228 +6965,234 @@ namespace M { U32 ActiveTestComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 ActiveTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 ActiveTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString ActiveTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E ActiveTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A ActiveTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S ActiveTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -8876,7 +8883,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -8896,7 +8903,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -8916,7 +8923,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -8936,7 +8943,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -8956,7 +8963,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -8976,7 +8983,7 @@ namespace M { this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -9006,7 +9013,7 @@ namespace M { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -9036,7 +9043,7 @@ namespace M { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -9066,7 +9073,7 @@ namespace M { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -9096,7 +9103,7 @@ namespace M { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -9126,7 +9133,7 @@ namespace M { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -9156,7 +9163,7 @@ namespace M { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -9173,13 +9180,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9189,7 +9196,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9201,13 +9208,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9217,7 +9224,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9229,13 +9236,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9245,7 +9252,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9257,13 +9264,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9273,7 +9280,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9285,13 +9292,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9301,7 +9308,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9313,13 +9320,13 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9329,7 +9336,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9341,17 +9348,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9362,7 +9369,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9374,17 +9381,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9395,7 +9402,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9407,17 +9414,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9428,7 +9435,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9440,17 +9447,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9461,7 +9468,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9473,17 +9480,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9494,7 +9501,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9506,17 +9513,17 @@ namespace M { if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9527,7 +9534,7 @@ namespace M { this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index 445ef355b..00eee538f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -3488,9 +3488,6 @@ namespace M { // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index b28922b90..de0379e4b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1378,6 +1378,7 @@ void PassiveExternalParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMI32EXT; @@ -1385,7 +1386,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1396,13 +1397,13 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -1410,7 +1411,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1421,13 +1422,13 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -1435,7 +1436,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1447,7 +1448,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1458,21 +1459,21 @@ void PassiveExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -1480,7 +1481,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1491,13 +1492,13 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -1505,7 +1506,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1517,7 +1518,7 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1528,21 +1529,21 @@ void PassiveExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -1550,7 +1551,7 @@ void PassiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1561,13 +1562,13 @@ void PassiveExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -2545,150 +2546,150 @@ void PassiveExternalParamsComponentBase :: I32 PassiveExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -3164,7 +3165,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -3194,7 +3195,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -3224,7 +3225,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -3254,7 +3255,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -3284,7 +3285,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -3314,7 +3315,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -3331,17 +3332,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3352,7 +3353,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3364,17 +3365,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3385,7 +3386,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3397,17 +3398,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3418,7 +3419,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3430,17 +3431,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3451,7 +3452,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3463,17 +3464,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3484,7 +3485,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3496,17 +3497,17 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -3517,7 +3518,7 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp index d48dd9342..316a54127 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.hpp @@ -1781,15 +1781,6 @@ class PassiveExternalParamsComponentBase : //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; - private: - - // ---------------------------------------------------------------------- - // Parameter variables - // ---------------------------------------------------------------------- - - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index 685ac35ed..3ad881751 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -1378,6 +1378,7 @@ void PassiveParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -1385,20 +1386,20 @@ void PassiveParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -1406,20 +1407,20 @@ void PassiveParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -1427,14 +1428,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1446,7 +1447,7 @@ void PassiveParamsComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -1454,20 +1455,20 @@ void PassiveParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -1475,14 +1476,14 @@ void PassiveParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1494,7 +1495,7 @@ void PassiveParamsComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -1502,20 +1503,20 @@ void PassiveParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -2493,78 +2494,84 @@ void PassiveParamsComponentBase :: U32 PassiveParamsComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -3019,7 +3026,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -3039,7 +3046,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -3059,7 +3066,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -3079,7 +3086,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -3099,7 +3106,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -3119,7 +3126,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -3136,13 +3143,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3152,7 +3159,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3164,13 +3171,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3180,7 +3187,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3192,13 +3199,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3208,7 +3215,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3220,13 +3227,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3236,7 +3243,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3248,13 +3255,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3264,7 +3271,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -3276,13 +3283,13 @@ Fw::CmdResponse PassiveParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -3292,7 +3299,7 @@ Fw::CmdResponse PassiveParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp index 926d7bb6f..81b9336c6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp @@ -1775,9 +1775,6 @@ class PassiveParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index e4e381d12..7eb3ac9be 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1623,6 +1623,7 @@ void PassiveSerialComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -1630,20 +1631,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -1651,20 +1652,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -1672,14 +1673,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1691,7 +1692,7 @@ void PassiveSerialComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -1699,20 +1700,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -1720,14 +1721,14 @@ void PassiveSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1739,7 +1740,7 @@ void PassiveSerialComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -1747,20 +1748,20 @@ void PassiveSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -1768,7 +1769,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1779,13 +1780,13 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -1793,7 +1794,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1804,13 +1805,13 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -1818,7 +1819,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1830,7 +1831,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1841,21 +1842,21 @@ void PassiveSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -1863,7 +1864,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1874,13 +1875,13 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -1888,7 +1889,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1900,7 +1901,7 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1911,21 +1912,21 @@ void PassiveSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -1933,7 +1934,7 @@ void PassiveSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1944,13 +1945,13 @@ void PassiveSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -5030,228 +5031,234 @@ void PassiveSerialComponentBase :: U32 PassiveSerialComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 PassiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -5835,7 +5842,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -5855,7 +5862,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -5875,7 +5882,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -5895,7 +5902,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -5915,7 +5922,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -5935,7 +5942,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -5965,7 +5972,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -5995,7 +6002,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -6025,7 +6032,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -6055,7 +6062,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -6085,7 +6092,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -6115,7 +6122,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -6132,13 +6139,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6148,7 +6155,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6160,13 +6167,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6176,7 +6183,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6188,13 +6195,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6204,7 +6211,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6216,13 +6223,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6232,7 +6239,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6244,13 +6251,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6260,7 +6267,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6272,13 +6279,13 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6288,7 +6295,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6300,17 +6307,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6321,7 +6328,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6333,17 +6340,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6354,7 +6361,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6366,17 +6373,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6387,7 +6394,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6399,17 +6406,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6420,7 +6427,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6432,17 +6439,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6453,7 +6460,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6465,17 +6472,17 @@ Fw::CmdResponse PassiveSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6486,7 +6493,7 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index b98574d9f..d4831e619 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -2722,9 +2722,6 @@ class PassiveSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 73d2ca10b..9647f5f5a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -1855,6 +1855,7 @@ void PassiveTestComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -1862,20 +1863,20 @@ void PassiveTestComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -1883,20 +1884,20 @@ void PassiveTestComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -1904,14 +1905,14 @@ void PassiveTestComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1923,7 +1924,7 @@ void PassiveTestComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -1931,20 +1932,20 @@ void PassiveTestComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -1952,14 +1953,14 @@ void PassiveTestComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1971,7 +1972,7 @@ void PassiveTestComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -1979,20 +1980,20 @@ void PassiveTestComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -2000,7 +2001,7 @@ void PassiveTestComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2011,13 +2012,13 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -2025,7 +2026,7 @@ void PassiveTestComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2036,13 +2037,13 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -2050,7 +2051,7 @@ void PassiveTestComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2062,7 +2063,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2073,21 +2074,21 @@ void PassiveTestComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -2095,7 +2096,7 @@ void PassiveTestComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2106,13 +2107,13 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -2120,7 +2121,7 @@ void PassiveTestComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2132,7 +2133,7 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2143,21 +2144,21 @@ void PassiveTestComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -2165,7 +2166,7 @@ void PassiveTestComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2176,13 +2177,13 @@ void PassiveTestComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -5210,228 +5211,234 @@ void PassiveTestComponentBase :: U32 PassiveTestComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 PassiveTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 PassiveTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString PassiveTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E PassiveTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A PassiveTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S PassiveTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -6070,7 +6077,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -6090,7 +6097,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -6110,7 +6117,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -6130,7 +6137,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -6150,7 +6157,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -6170,7 +6177,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -6200,7 +6207,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -6230,7 +6237,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -6260,7 +6267,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -6290,7 +6297,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -6320,7 +6327,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -6350,7 +6357,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -6367,13 +6374,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6383,7 +6390,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6395,13 +6402,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6411,7 +6418,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6423,13 +6430,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6439,7 +6446,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6451,13 +6458,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6467,7 +6474,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6479,13 +6486,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6495,7 +6502,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6507,13 +6514,13 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -6523,7 +6530,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6535,17 +6542,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6556,7 +6563,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6568,17 +6575,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6589,7 +6596,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6601,17 +6608,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6622,7 +6629,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6634,17 +6641,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6655,7 +6662,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6667,17 +6674,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6688,7 +6695,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -6700,17 +6707,17 @@ Fw::CmdResponse PassiveTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -6721,7 +6728,7 @@ Fw::CmdResponse PassiveTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index e6e9acf1b..b3eb93f43 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -2867,9 +2867,6 @@ class PassiveTestComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 0a8393786..7e00b5f12 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1671,6 +1671,7 @@ void QueuedExternalParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMI32EXT; @@ -1678,7 +1679,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1689,13 +1690,13 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -1703,7 +1704,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1714,13 +1715,13 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -1728,7 +1729,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1740,7 +1741,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -1751,21 +1752,21 @@ void QueuedExternalParamsComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -1773,7 +1774,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1784,13 +1785,13 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -1798,7 +1799,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1810,7 +1811,7 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -1821,21 +1822,21 @@ void QueuedExternalParamsComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -1843,7 +1844,7 @@ void QueuedExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -1854,13 +1855,13 @@ void QueuedExternalParamsComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -3507,150 +3508,150 @@ void QueuedExternalParamsComponentBase :: I32 QueuedExternalParamsComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -4720,7 +4721,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -4750,7 +4751,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -4780,7 +4781,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -4810,7 +4811,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -4840,7 +4841,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -4870,7 +4871,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -4887,17 +4888,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4908,7 +4909,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4920,17 +4921,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4941,7 +4942,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4953,17 +4954,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -4974,7 +4975,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4986,17 +4987,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -5007,7 +5008,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5019,17 +5020,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -5040,7 +5041,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -5052,17 +5053,17 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -5073,7 +5074,7 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp index 75f551925..773890d52 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.hpp @@ -2184,15 +2184,6 @@ class QueuedExternalParamsComponentBase : //! The validity flag for ParamStructExt Fw::ParamValid m_param_ParamStructExt_valid = Fw::ParamValid::UNINIT; - private: - - // ---------------------------------------------------------------------- - // Parameter variables - // ---------------------------------------------------------------------- - - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - private: // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 9a287bc67..cd709ff02 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -1671,6 +1671,7 @@ void QueuedParamsComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -1678,20 +1679,20 @@ void QueuedParamsComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -1699,20 +1700,20 @@ void QueuedParamsComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -1720,14 +1721,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -1739,7 +1740,7 @@ void QueuedParamsComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -1747,20 +1748,20 @@ void QueuedParamsComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -1768,14 +1769,14 @@ void QueuedParamsComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -1787,7 +1788,7 @@ void QueuedParamsComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -1795,20 +1796,20 @@ void QueuedParamsComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -3455,78 +3456,84 @@ void QueuedParamsComponentBase :: U32 QueuedParamsComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -4575,7 +4582,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -4595,7 +4602,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -4615,7 +4622,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -4635,7 +4642,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -4655,7 +4662,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -4675,7 +4682,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -4692,13 +4699,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4708,7 +4715,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4720,13 +4727,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4736,7 +4743,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4748,13 +4755,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4764,7 +4771,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4776,13 +4783,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4792,7 +4799,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4804,13 +4811,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4820,7 +4827,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -4832,13 +4839,13 @@ Fw::CmdResponse QueuedParamsComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -4848,7 +4855,7 @@ Fw::CmdResponse QueuedParamsComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp index 152588cd8..7adff586a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp @@ -2178,9 +2178,6 @@ class QueuedParamsComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index 6aa950d53..e6bc3c565 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2133,6 +2133,7 @@ void QueuedSerialComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -2140,20 +2141,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -2161,20 +2162,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -2182,14 +2183,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2201,7 +2202,7 @@ void QueuedSerialComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -2209,20 +2210,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -2230,14 +2231,14 @@ void QueuedSerialComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2249,7 +2250,7 @@ void QueuedSerialComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -2257,20 +2258,20 @@ void QueuedSerialComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -2278,7 +2279,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2289,13 +2290,13 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -2303,7 +2304,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2314,13 +2315,13 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -2328,7 +2329,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2340,7 +2341,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2351,21 +2352,21 @@ void QueuedSerialComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -2373,7 +2374,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2384,13 +2385,13 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -2398,7 +2399,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2410,7 +2411,7 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2421,21 +2422,21 @@ void QueuedSerialComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -2443,7 +2444,7 @@ void QueuedSerialComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2454,13 +2455,13 @@ void QueuedSerialComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -7132,228 +7133,234 @@ void QueuedSerialComponentBase :: U32 QueuedSerialComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 QueuedSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -9113,7 +9120,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -9133,7 +9140,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -9153,7 +9160,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -9173,7 +9180,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -9193,7 +9200,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -9213,7 +9220,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -9243,7 +9250,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -9273,7 +9280,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -9303,7 +9310,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -9333,7 +9340,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -9363,7 +9370,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -9393,7 +9400,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -9410,13 +9417,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9426,7 +9433,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9438,13 +9445,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9454,7 +9461,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9466,13 +9473,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9482,7 +9489,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9494,13 +9501,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9510,7 +9517,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9522,13 +9529,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9538,7 +9545,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9550,13 +9557,13 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9566,7 +9573,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9578,17 +9585,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9599,7 +9606,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9611,17 +9618,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9632,7 +9639,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9644,17 +9651,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9665,7 +9672,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9677,17 +9684,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9698,7 +9705,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9710,17 +9717,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9731,7 +9738,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9743,17 +9750,17 @@ Fw::CmdResponse QueuedSerialComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9764,7 +9771,7 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index cb9855b9e..292a46a93 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -3515,9 +3515,6 @@ class QueuedSerialComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index b3e8f643a..7fbbe5c2a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2209,6 +2209,7 @@ void QueuedTestComponentBase :: FW_ASSERT(this->isConnected_prmGetOut_OutputPort(0)); FwPrmIdType _id{}; + Fw::ParamBuffer _paramBuffer; _id = _baseId + PARAMID_PARAMU32; @@ -2216,20 +2217,20 @@ void QueuedTestComponentBase :: this->m_param_ParamU32_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamU32_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamU32); + _stat = _paramBuffer.deserializeTo(this->m_ParamU32); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamU32_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64; @@ -2237,20 +2238,20 @@ void QueuedTestComponentBase :: this->m_param_ParamF64_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamF64_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamF64); + _stat = _paramBuffer.deserializeTo(this->m_ParamF64); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRING; @@ -2258,14 +2259,14 @@ void QueuedTestComponentBase :: this->m_param_ParamString_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamString_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamString); + _stat = _paramBuffer.deserializeTo(this->m_ParamString); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamString_valid = Fw::ParamValid::DEFAULT; } @@ -2277,7 +2278,7 @@ void QueuedTestComponentBase :: this->m_ParamString = Fw::String("default"); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUM; @@ -2285,20 +2286,20 @@ void QueuedTestComponentBase :: this->m_param_ParamEnum_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamEnum); + _stat = _paramBuffer.deserializeTo(this->m_ParamEnum); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnum_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAY; @@ -2306,14 +2307,14 @@ void QueuedTestComponentBase :: this->m_param_ParamArray_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter or use default value if (this->m_param_ParamArray_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamArray); + _stat = _paramBuffer.deserializeTo(this->m_ParamArray); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArray_valid = Fw::ParamValid::DEFAULT; } @@ -2325,7 +2326,7 @@ void QueuedTestComponentBase :: this->m_ParamArray = A({1, 2, 3}); } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCT; @@ -2333,20 +2334,20 @@ void QueuedTestComponentBase :: this->m_param_ParamStruct_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); // Deserialize parameter if (this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) { - _stat = this->m___fprime_ac_paramBuffer.deserializeTo(this->m_ParamStruct); + _stat = _paramBuffer.deserializeTo(this->m_ParamStruct); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStruct_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMI32EXT; @@ -2354,7 +2355,7 @@ void QueuedTestComponentBase :: this->m_param_ParamI32Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2365,13 +2366,13 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMI32EXT, this->m_param_ParamI32Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMF64EXT; @@ -2379,7 +2380,7 @@ void QueuedTestComponentBase :: this->m_param_ParamF64Ext_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2390,13 +2391,13 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMF64EXT, this->m_param_ParamF64Ext_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRINGEXT; @@ -2404,7 +2405,7 @@ void QueuedTestComponentBase :: this->m_param_ParamStringExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2416,7 +2417,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::DEFAULT; @@ -2427,21 +2428,21 @@ void QueuedTestComponentBase :: } if (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT) { Fw::String _val = Fw::String("external default"); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMSTRINGEXT, this->m_param_ParamStringExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMENUMEXT; @@ -2449,7 +2450,7 @@ void QueuedTestComponentBase :: this->m_param_ParamEnumExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2460,13 +2461,13 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMENUMEXT, this->m_param_ParamEnumExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMARRAYEXT; @@ -2474,7 +2475,7 @@ void QueuedTestComponentBase :: this->m_param_ParamArrayExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2486,7 +2487,7 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::DEFAULT; @@ -2497,21 +2498,21 @@ void QueuedTestComponentBase :: } if (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT) { A _val = A({1, 2, 3}); - this->m___fprime_ac_paramBuffer.resetSer(); - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(_val); + _paramBuffer.resetSer(); + _stat = _paramBuffer.serializeFrom(_val); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, PARAMID_PARAMARRAYEXT, this->m_param_ParamArrayExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); _id = _baseId + PARAMID_PARAMSTRUCTEXT; @@ -2519,7 +2520,7 @@ void QueuedTestComponentBase :: this->m_param_ParamStructExt_valid = this->prmGetOut_out( 0, _id, - this->m___fprime_ac_paramBuffer + _paramBuffer ); this->m_paramLock.lock(); @@ -2530,13 +2531,13 @@ void QueuedTestComponentBase :: _baseId, PARAMID_PARAMSTRUCTEXT, this->m_param_ParamStructExt_valid, - this->m___fprime_ac_paramBuffer + _paramBuffer ); if (_stat != Fw::FW_SERIALIZE_OK) { this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parametersLoaded(); @@ -6962,228 +6963,234 @@ void QueuedTestComponentBase :: U32 QueuedTestComponentBase :: paramGet_ParamU32(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; U32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamU32_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamU32; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamF64; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamString_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamString; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnum_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamEnum; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArray_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamArray; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStruct_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { _local = this->m_ParamStruct; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } I32 QueuedTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; I32 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamI32Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMI32EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } F64 QueuedTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; F64 _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamF64Ext_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMF64EXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } Fw::ParamString QueuedTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; Fw::ParamString _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStringExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRINGEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } E QueuedTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; E _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamEnumExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMENUMEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } A QueuedTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; A _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamArrayExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMARRAYEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } S QueuedTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { + Fw::ParamBuffer _paramBuffer; S _local{}; this->m_paramLock.lock(); valid = this->m_param_ParamStructExt_valid; if ((valid == Fw::ParamValid::VALID) || (valid == Fw::ParamValid::DEFAULT)) { - m___fprime_ac_paramBuffer.resetSer(); FW_ASSERT(this->paramDelegatePtr != nullptr); Fw::SerializeStatus _stat = this->paramDelegatePtr->serializeParam( static_cast(this->getIdBase()), PARAMID_PARAMSTRUCTEXT, - m___fprime_ac_paramBuffer + _paramBuffer ); if(_stat == Fw::FW_SERIALIZE_OK) { - _stat = m___fprime_ac_paramBuffer.deserializeTo(_local); + _stat = _paramBuffer.deserializeTo(_local); FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); } else { valid = Fw::ParamValid::INVALID; } } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); return _local; } @@ -8898,7 +8905,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamU32 = _localVal; this->m_param_ParamU32_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMU32); @@ -8918,7 +8925,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamF64 = _localVal; this->m_param_ParamF64_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64); @@ -8938,7 +8945,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamString = _localVal; this->m_param_ParamString_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRING); @@ -8958,7 +8965,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamEnum = _localVal; this->m_param_ParamEnum_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUM); @@ -8978,7 +8985,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamArray = _localVal; this->m_param_ParamArray_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAY); @@ -8998,7 +9005,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.lock(); this->m_ParamStruct = _localVal; this->m_param_ParamStruct_valid = Fw::ParamValid::VALID; - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCT); @@ -9028,7 +9035,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamI32Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMI32EXT); @@ -9058,7 +9065,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamF64Ext_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMF64EXT); @@ -9088,7 +9095,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamStringExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRINGEXT); @@ -9118,7 +9125,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamEnumExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMENUMEXT); @@ -9148,7 +9155,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamArrayExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMARRAYEXT); @@ -9178,7 +9185,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_param_ParamStructExt_valid = Fw::ParamValid::INVALID; _response = Fw::CmdResponse::VALIDATION_ERROR; } - this->m_paramLock.unLock(); + this->m_paramLock.unlock(); // Call notifier this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); @@ -9195,13 +9202,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamU32_valid == Fw::ParamValid::VALID) || (this->m_param_ParamU32_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamU32); + _stat = _paramBuffer.serializeFrom(m_ParamU32); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9211,7 +9218,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMU32), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9223,13 +9230,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamF64); + _stat = _paramBuffer.serializeFrom(m_ParamF64); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9239,7 +9246,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9251,13 +9258,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamString_valid == Fw::ParamValid::VALID) || (this->m_param_ParamString_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamString); + _stat = _paramBuffer.serializeFrom(m_ParamString); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9267,7 +9274,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRING), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9279,13 +9286,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnum_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnum_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamEnum); + _stat = _paramBuffer.serializeFrom(m_ParamEnum); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9295,7 +9302,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUM), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9307,13 +9314,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArray_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArray_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamArray); + _stat = _paramBuffer.serializeFrom(m_ParamArray); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9323,7 +9330,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAY), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9335,13 +9342,13 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStruct_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStruct_valid == Fw::ParamValid::DEFAULT)) { - _stat = this->m___fprime_ac_paramBuffer.serializeFrom(m_ParamStruct); + _stat = _paramBuffer.serializeFrom(m_ParamStruct); } this->m_paramLock.unlock(); if (_stat != Fw::FW_SERIALIZE_OK) { @@ -9351,7 +9358,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9363,17 +9370,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamI32Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamI32Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMI32EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9384,7 +9391,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMI32EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9396,17 +9403,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamF64Ext_valid == Fw::ParamValid::VALID) || (this->m_param_ParamF64Ext_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMF64EXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9417,7 +9424,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMF64EXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9429,17 +9436,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStringExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStringExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRINGEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9450,7 +9457,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRINGEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9462,17 +9469,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamEnumExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamEnumExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMENUMEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9483,7 +9490,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMENUMEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9495,17 +9502,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamArrayExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamArrayExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMARRAYEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9516,7 +9523,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMARRAYEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; @@ -9528,17 +9535,17 @@ Fw::CmdResponse QueuedTestComponentBase :: if (!this->isConnected_prmSetOut_OutputPort(0)) { return Fw::CmdResponse::EXECUTION_ERROR; } + Fw::ParamBuffer _paramBuffer; const FwIdType idBase = this->getIdBase(); Fw::SerializeStatus _stat = Fw::FW_SERIALIZE_FORMAT_ERROR; // Serialize the parameter this->m_paramLock.lock(); - this->m___fprime_ac_paramBuffer.resetSer(); if ((this->m_param_ParamStructExt_valid == Fw::ParamValid::VALID) || (this->m_param_ParamStructExt_valid == Fw::ParamValid::DEFAULT)) { FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->serializeParam( static_cast(idBase), PARAMID_PARAMSTRUCTEXT, - this->m___fprime_ac_paramBuffer + _paramBuffer ); } this->m_paramLock.unlock(); @@ -9549,7 +9556,7 @@ Fw::CmdResponse QueuedTestComponentBase :: this->prmSetOut_out( 0, static_cast(idBase + PARAMID_PARAMSTRUCTEXT), - this->m___fprime_ac_paramBuffer + _paramBuffer ); // Return the command response return Fw::CmdResponse::OK; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index 9cc4a3013..fca8b98fd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -3495,9 +3495,6 @@ class QueuedTestComponentBase : // Parameter variables // ---------------------------------------------------------------------- - //! Scratch buffer for parameter management - Fw::ParamBuffer m___fprime_ac_paramBuffer; - //! Parameter ParamU32 //! //! A parameter with U32 data From 970e7aed802b7a64a7a5332c7c72efc8a21189c7 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Wed, 27 May 2026 21:13:48 -0700 Subject: [PATCH 42/42] Revise parameter code gen --- .../ComponentParameters.scala | 7 +++-- .../ActiveExternalParamsComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/ActiveSerialComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/ActiveTestComponentAc.ref.cpp | 26 ++++++++++++++----- .../PassiveExternalParamsComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/PassiveSerialComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/PassiveTestComponentAc.ref.cpp | 26 ++++++++++++++----- .../QueuedExternalParamsComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/QueuedSerialComponentAc.ref.cpp | 26 ++++++++++++++----- .../base/QueuedTestComponentAc.ref.cpp | 26 ++++++++++++++----- 10 files changed, 185 insertions(+), 56 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala index b68d98216..33f339079 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -352,7 +352,8 @@ case class ComponentParameters ( lines( s"""|$cppType _val = $cppValue; |$paramBufferName.resetSer(); - |_stat = $paramBufferName.serializeFrom(_val);""" + |_stat = $paramBufferName.serializeFrom(_val); + |FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat));""" ), deserializeParam(param), wrapInIf( @@ -559,7 +560,9 @@ case class ComponentParameters ( |this->m_paramLock.unlock(); | |// Call notifier - |this->parameterUpdated($idConstantName); + |if (_response == Fw::CmdResponse::OK) { + | this->parameterUpdated($idConstantName); + |} |return _response;""" ) } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp index bb98dad7a..0aaec168f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalParamsComponentAc.ref.cpp @@ -1754,6 +1754,7 @@ void ActiveExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -1824,6 +1825,7 @@ void ActiveExternalParamsComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -4700,7 +4702,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -4730,7 +4734,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -4760,7 +4766,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -4790,7 +4798,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -4820,7 +4830,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -4850,7 +4862,9 @@ Fw::CmdResponse ActiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index cf38b0a99..2cda418d2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -2354,6 +2354,7 @@ void ActiveSerialComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -2424,6 +2425,7 @@ void ActiveSerialComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -9229,7 +9231,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -9259,7 +9263,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -9289,7 +9295,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -9319,7 +9327,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -9349,7 +9359,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -9379,7 +9391,9 @@ Fw::CmdResponse ActiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 97d3df501..1e14b1d94 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -2432,6 +2432,7 @@ namespace M { Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -2502,6 +2503,7 @@ namespace M { A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -9016,7 +9018,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -9046,7 +9050,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -9076,7 +9082,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -9106,7 +9114,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -9136,7 +9146,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -9166,7 +9178,9 @@ namespace M { this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp index de0379e4b..bf480ea72 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveExternalParamsComponentAc.ref.cpp @@ -1461,6 +1461,7 @@ void PassiveExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -1531,6 +1532,7 @@ void PassiveExternalParamsComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -3168,7 +3170,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -3198,7 +3202,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -3228,7 +3234,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -3258,7 +3266,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -3288,7 +3298,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -3318,7 +3330,9 @@ Fw::CmdResponse PassiveExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 7eb3ac9be..a537233c4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -1844,6 +1844,7 @@ void PassiveSerialComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -1914,6 +1915,7 @@ void PassiveSerialComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -5975,7 +5977,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -6005,7 +6009,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -6035,7 +6041,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -6065,7 +6073,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -6095,7 +6105,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -6125,7 +6137,9 @@ Fw::CmdResponse PassiveSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 9647f5f5a..9e6b67904 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -2076,6 +2076,7 @@ void PassiveTestComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -2146,6 +2147,7 @@ void PassiveTestComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -6210,7 +6212,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -6240,7 +6244,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -6270,7 +6276,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -6300,7 +6308,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -6330,7 +6340,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -6360,7 +6372,9 @@ Fw::CmdResponse PassiveTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp index 7e00b5f12..ae159a9ff 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedExternalParamsComponentAc.ref.cpp @@ -1754,6 +1754,7 @@ void QueuedExternalParamsComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -1824,6 +1825,7 @@ void QueuedExternalParamsComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -4724,7 +4726,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -4754,7 +4758,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -4784,7 +4790,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -4814,7 +4822,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -4844,7 +4854,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -4874,7 +4886,9 @@ Fw::CmdResponse QueuedExternalParamsComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index e6bc3c565..f43aa6254 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -2354,6 +2354,7 @@ void QueuedSerialComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -2424,6 +2425,7 @@ void QueuedSerialComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -9253,7 +9255,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -9283,7 +9287,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -9313,7 +9319,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -9343,7 +9351,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -9373,7 +9383,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -9403,7 +9415,9 @@ Fw::CmdResponse QueuedSerialComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 7fbbe5c2a..309e596c6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -2430,6 +2430,7 @@ void QueuedTestComponentBase :: Fw::String _val = Fw::String("external default"); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -2500,6 +2501,7 @@ void QueuedTestComponentBase :: A _val = A({1, 2, 3}); _paramBuffer.resetSer(); _stat = _paramBuffer.serializeFrom(_val); + FW_ASSERT(_stat == Fw::FW_SERIALIZE_OK, static_cast(_stat)); FW_ASSERT(this->paramDelegatePtr != nullptr); _stat = this->paramDelegatePtr->deserializeParam( _baseId, @@ -9038,7 +9040,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMI32EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMI32EXT); + } return _response; } @@ -9068,7 +9072,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMF64EXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMF64EXT); + } return _response; } @@ -9098,7 +9104,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRINGEXT); + } return _response; } @@ -9128,7 +9136,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMENUMEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMENUMEXT); + } return _response; } @@ -9158,7 +9168,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMARRAYEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMARRAYEXT); + } return _response; } @@ -9188,7 +9200,9 @@ Fw::CmdResponse QueuedTestComponentBase :: this->m_paramLock.unlock(); // Call notifier - this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + if (_response == Fw::CmdResponse::OK) { + this->parameterUpdated(PARAMID_PARAMSTRUCTEXT); + } return _response; }