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 530b1d85c..733c2921d 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentParameters.scala @@ -118,11 +118,31 @@ case class ComponentParameters ( writeGetterFunctionBody(param) ) + private def getGetterFunctionNoValidForParam(param: Param) = + functionClassMember( + Some( + addSeparatedString( + s"Get parameter ${param.getName}\n\n\\return The parameter value", + AnnotationCppWriter.asStringOpt(param.aNode) + ) + ), + paramGetterName(param.getName), + Nil, + CppDoc.Type(writeParamType(param.paramType, "Fw::ParamString")), + lines( + s"""|Fw::ParamValid _valid{}; + |return this->${paramGetterName(param.getName)}(_valid);""" + ) + ) + private def getGetterFunctions: List[CppDoc.Class.Member] = addAccessTagAndComment( "protected", "Parameter get functions", - sortedParams.map((_, param) => getGetterFunctionForParam(param)) + sortedParams.flatMap((_, param) => List( + getGetterFunctionForParam(param), + getGetterFunctionNoValidForParam(param) + )) ) private def getHookFunctions: List[CppDoc.Class.Member] = { @@ -243,9 +263,9 @@ case class ComponentParameters ( Some( s"""|\\brief Called for each parameter when parameters are loaded | - |By default this notifies the component via parameterUpdated when - |the parameter loaded successfully (valid or default). You may - |override it, for example to distinguish load from update. + |By default this notifies the component via parameterUpdated for + |every parameter, regardless of validity. You may override it, for + |example to suppress notification for invalid parameters. |""" ), "parameterLoaded", @@ -262,10 +282,7 @@ case class ComponentParameters ( ) ), CppDoc.Type("void"), - wrapInIf( - "FW_PARAM_OK(valid)", - lines("this->parameterUpdated(id);") - ), + lines("this->parameterUpdated(id);"), CppDoc.Function.Virtual ) 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 c8913e2b3..822638565 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 @@ -3508,9 +3508,7 @@ void ActiveExternalParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -3542,6 +3540,13 @@ I32 ActiveExternalParamsComponentBase :: return _local; } +I32 ActiveExternalParamsComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 ActiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -3567,6 +3572,13 @@ F64 ActiveExternalParamsComponentBase :: return _local; } +F64 ActiveExternalParamsComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString ActiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -3592,6 +3604,13 @@ Fw::ParamString ActiveExternalParamsComponentBase :: return _local; } +Fw::ParamString ActiveExternalParamsComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E ActiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -3617,6 +3636,13 @@ E ActiveExternalParamsComponentBase :: return _local; } +E ActiveExternalParamsComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A ActiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -3642,6 +3668,13 @@ A ActiveExternalParamsComponentBase :: return _local; } +A ActiveExternalParamsComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S ActiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -3667,6 +3700,13 @@ S ActiveExternalParamsComponentBase :: return _local; } +S ActiveExternalParamsComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 30a465ad9..001cd2d4e 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 @@ -1551,9 +1551,9 @@ class ActiveExternalParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1575,6 +1575,14 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -1584,6 +1592,13 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -1593,6 +1608,13 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -1602,6 +1624,13 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -1611,6 +1640,13 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -1620,6 +1656,13 @@ class ActiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 0bad39040..56ff5bac7 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 @@ -3415,9 +3415,7 @@ void ActiveParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -3437,6 +3435,13 @@ U32 ActiveParamsComponentBase :: return _local; } +U32 ActiveParamsComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 ActiveParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -3450,6 +3455,13 @@ F64 ActiveParamsComponentBase :: return _local; } +F64 ActiveParamsComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString ActiveParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -3463,6 +3475,13 @@ Fw::ParamString ActiveParamsComponentBase :: return _local; } +Fw::ParamString ActiveParamsComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E ActiveParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -3476,6 +3495,13 @@ E ActiveParamsComponentBase :: return _local; } +E ActiveParamsComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A ActiveParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -3489,6 +3515,13 @@ A ActiveParamsComponentBase :: return _local; } +A ActiveParamsComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S ActiveParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -3502,6 +3535,13 @@ S ActiveParamsComponentBase :: return _local; } +S ActiveParamsComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + // ---------------------------------------------------------------------- // Time // ---------------------------------------------------------------------- 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 33f13fc3f..cc8493c3f 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 @@ -1550,9 +1550,9 @@ class ActiveParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1574,6 +1574,14 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -1583,6 +1591,13 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -1592,6 +1607,13 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -1601,6 +1623,13 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -1610,6 +1639,13 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -1619,6 +1655,13 @@ class ActiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + protected: // ---------------------------------------------------------------------- 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 f6c6df72b..04ac888fd 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 @@ -7100,9 +7100,7 @@ void ActiveSerialComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -7122,6 +7120,13 @@ U32 ActiveSerialComponentBase :: return _local; } +U32 ActiveSerialComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 ActiveSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -7135,6 +7140,13 @@ F64 ActiveSerialComponentBase :: return _local; } +F64 ActiveSerialComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString ActiveSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -7148,6 +7160,13 @@ Fw::ParamString ActiveSerialComponentBase :: return _local; } +Fw::ParamString ActiveSerialComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E ActiveSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -7161,6 +7180,13 @@ E ActiveSerialComponentBase :: return _local; } +E ActiveSerialComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A ActiveSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -7174,6 +7200,13 @@ A ActiveSerialComponentBase :: return _local; } +A ActiveSerialComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S ActiveSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -7187,6 +7220,13 @@ S ActiveSerialComponentBase :: return _local; } +S ActiveSerialComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + I32 ActiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -7212,6 +7252,13 @@ I32 ActiveSerialComponentBase :: return _local; } +I32 ActiveSerialComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 ActiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -7237,6 +7284,13 @@ F64 ActiveSerialComponentBase :: return _local; } +F64 ActiveSerialComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString ActiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -7262,6 +7316,13 @@ Fw::ParamString ActiveSerialComponentBase :: return _local; } +Fw::ParamString ActiveSerialComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E ActiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -7287,6 +7348,13 @@ E ActiveSerialComponentBase :: return _local; } +E ActiveSerialComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A ActiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -7312,6 +7380,13 @@ A ActiveSerialComponentBase :: return _local; } +A ActiveSerialComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S ActiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -7337,6 +7412,13 @@ S ActiveSerialComponentBase :: return _local; } +S ActiveSerialComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 0a3e28e2e..cdc4a1237 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 @@ -2557,9 +2557,9 @@ class ActiveSerialComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -2581,6 +2581,14 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -2590,6 +2598,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -2599,6 +2614,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -2608,6 +2630,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -2617,6 +2646,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -2626,6 +2662,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -2636,6 +2679,14 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -2645,6 +2696,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2654,6 +2712,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2663,6 +2728,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2672,6 +2744,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2681,6 +2760,13 @@ class ActiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 1f6e969b4..3fa3644ae 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 @@ -6932,9 +6932,7 @@ namespace M { Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -6954,6 +6952,13 @@ namespace M { return _local; } + U32 ActiveTestComponentBase :: + paramGet_ParamU32() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); + } + F64 ActiveTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -6967,6 +6972,13 @@ namespace M { return _local; } + F64 ActiveTestComponentBase :: + paramGet_ParamF64() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); + } + Fw::ParamString ActiveTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -6980,6 +6992,13 @@ namespace M { return _local; } + Fw::ParamString ActiveTestComponentBase :: + paramGet_ParamString() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); + } + E ActiveTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -6993,6 +7012,13 @@ namespace M { return _local; } + E ActiveTestComponentBase :: + paramGet_ParamEnum() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); + } + A ActiveTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -7006,6 +7032,13 @@ namespace M { return _local; } + A ActiveTestComponentBase :: + paramGet_ParamArray() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); + } + S ActiveTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -7019,6 +7052,13 @@ namespace M { return _local; } + S ActiveTestComponentBase :: + paramGet_ParamStruct() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); + } + I32 ActiveTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -7044,6 +7084,13 @@ namespace M { return _local; } + I32 ActiveTestComponentBase :: + paramGet_ParamI32Ext() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); + } + F64 ActiveTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -7069,6 +7116,13 @@ namespace M { return _local; } + F64 ActiveTestComponentBase :: + paramGet_ParamF64Ext() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); + } + Fw::ParamString ActiveTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -7094,6 +7148,13 @@ namespace M { return _local; } + Fw::ParamString ActiveTestComponentBase :: + paramGet_ParamStringExt() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); + } + E ActiveTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -7119,6 +7180,13 @@ namespace M { return _local; } + E ActiveTestComponentBase :: + paramGet_ParamEnumExt() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); + } + A ActiveTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -7144,6 +7212,13 @@ namespace M { return _local; } + A ActiveTestComponentBase :: + paramGet_ParamArrayExt() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); + } + S ActiveTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -7169,6 +7244,13 @@ namespace M { return _local; } + S ActiveTestComponentBase :: + paramGet_ParamStructExt() + { + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); + } + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 f054b703d..0a3f2fb12 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 @@ -2497,9 +2497,9 @@ namespace M { //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -2521,6 +2521,14 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -2530,6 +2538,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -2539,6 +2554,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -2548,6 +2570,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -2557,6 +2586,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -2566,6 +2602,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -2576,6 +2619,14 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -2585,6 +2636,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2594,6 +2652,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2603,6 +2668,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2612,6 +2684,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2621,6 +2700,13 @@ namespace M { Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 55973b619..abdcf7fdd 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 @@ -2554,9 +2554,7 @@ void PassiveExternalParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -2588,6 +2586,13 @@ I32 PassiveExternalParamsComponentBase :: return _local; } +I32 PassiveExternalParamsComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 PassiveExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -2613,6 +2618,13 @@ F64 PassiveExternalParamsComponentBase :: return _local; } +F64 PassiveExternalParamsComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString PassiveExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -2638,6 +2650,13 @@ Fw::ParamString PassiveExternalParamsComponentBase :: return _local; } +Fw::ParamString PassiveExternalParamsComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E PassiveExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -2663,6 +2682,13 @@ E PassiveExternalParamsComponentBase :: return _local; } +E PassiveExternalParamsComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A PassiveExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -2688,6 +2714,13 @@ A PassiveExternalParamsComponentBase :: return _local; } +A PassiveExternalParamsComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S PassiveExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -2713,6 +2746,13 @@ S PassiveExternalParamsComponentBase :: return _local; } +S PassiveExternalParamsComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 c53421586..a84bae5c0 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 @@ -1255,9 +1255,9 @@ class PassiveExternalParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1279,6 +1279,14 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -1288,6 +1296,13 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -1297,6 +1312,13 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -1306,6 +1328,13 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -1315,6 +1344,13 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -1324,6 +1360,13 @@ class PassiveExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 168eacc35..8060c7bca 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 @@ -2461,9 +2461,7 @@ void PassiveParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -2483,6 +2481,13 @@ U32 PassiveParamsComponentBase :: return _local; } +U32 PassiveParamsComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 PassiveParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -2496,6 +2501,13 @@ F64 PassiveParamsComponentBase :: return _local; } +F64 PassiveParamsComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString PassiveParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -2509,6 +2521,13 @@ Fw::ParamString PassiveParamsComponentBase :: return _local; } +Fw::ParamString PassiveParamsComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E PassiveParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -2522,6 +2541,13 @@ E PassiveParamsComponentBase :: return _local; } +E PassiveParamsComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A PassiveParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -2535,6 +2561,13 @@ A PassiveParamsComponentBase :: return _local; } +A PassiveParamsComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S PassiveParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -2548,6 +2581,13 @@ S PassiveParamsComponentBase :: return _local; } +S PassiveParamsComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + // ---------------------------------------------------------------------- // Time // ---------------------------------------------------------------------- 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 7cc5958dc..663153ffd 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 @@ -1254,9 +1254,9 @@ class PassiveParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1278,6 +1278,14 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -1287,6 +1295,13 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -1296,6 +1311,13 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -1305,6 +1327,13 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -1314,6 +1343,13 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -1323,6 +1359,13 @@ class PassiveParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + protected: // ---------------------------------------------------------------------- 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 54d774d58..2dcea69c8 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 @@ -5006,9 +5006,7 @@ void PassiveSerialComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -5028,6 +5026,13 @@ U32 PassiveSerialComponentBase :: return _local; } +U32 PassiveSerialComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 PassiveSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -5041,6 +5046,13 @@ F64 PassiveSerialComponentBase :: return _local; } +F64 PassiveSerialComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString PassiveSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -5054,6 +5066,13 @@ Fw::ParamString PassiveSerialComponentBase :: return _local; } +Fw::ParamString PassiveSerialComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E PassiveSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -5067,6 +5086,13 @@ E PassiveSerialComponentBase :: return _local; } +E PassiveSerialComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A PassiveSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -5080,6 +5106,13 @@ A PassiveSerialComponentBase :: return _local; } +A PassiveSerialComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S PassiveSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -5093,6 +5126,13 @@ S PassiveSerialComponentBase :: return _local; } +S PassiveSerialComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + I32 PassiveSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -5118,6 +5158,13 @@ I32 PassiveSerialComponentBase :: return _local; } +I32 PassiveSerialComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 PassiveSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -5143,6 +5190,13 @@ F64 PassiveSerialComponentBase :: return _local; } +F64 PassiveSerialComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString PassiveSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -5168,6 +5222,13 @@ Fw::ParamString PassiveSerialComponentBase :: return _local; } +Fw::ParamString PassiveSerialComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E PassiveSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -5193,6 +5254,13 @@ E PassiveSerialComponentBase :: return _local; } +E PassiveSerialComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A PassiveSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -5218,6 +5286,13 @@ A PassiveSerialComponentBase :: return _local; } +A PassiveSerialComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S PassiveSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -5243,6 +5318,13 @@ S PassiveSerialComponentBase :: return _local; } +S PassiveSerialComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 8b66825ab..1dbeab494 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 @@ -1911,9 +1911,9 @@ class PassiveSerialComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1935,6 +1935,14 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -1944,6 +1952,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -1953,6 +1968,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -1962,6 +1984,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -1971,6 +2000,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -1980,6 +2016,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -1990,6 +2033,14 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -1999,6 +2050,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2008,6 +2066,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2017,6 +2082,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2026,6 +2098,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2035,6 +2114,13 @@ class PassiveSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 c8054fb8a..343427e2a 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 @@ -5186,9 +5186,7 @@ void PassiveTestComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -5208,6 +5206,13 @@ U32 PassiveTestComponentBase :: return _local; } +U32 PassiveTestComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 PassiveTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -5221,6 +5226,13 @@ F64 PassiveTestComponentBase :: return _local; } +F64 PassiveTestComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString PassiveTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -5234,6 +5246,13 @@ Fw::ParamString PassiveTestComponentBase :: return _local; } +Fw::ParamString PassiveTestComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E PassiveTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -5247,6 +5266,13 @@ E PassiveTestComponentBase :: return _local; } +E PassiveTestComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A PassiveTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -5260,6 +5286,13 @@ A PassiveTestComponentBase :: return _local; } +A PassiveTestComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S PassiveTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -5273,6 +5306,13 @@ S PassiveTestComponentBase :: return _local; } +S PassiveTestComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + I32 PassiveTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -5298,6 +5338,13 @@ I32 PassiveTestComponentBase :: return _local; } +I32 PassiveTestComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 PassiveTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -5323,6 +5370,13 @@ F64 PassiveTestComponentBase :: return _local; } +F64 PassiveTestComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString PassiveTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -5348,6 +5402,13 @@ Fw::ParamString PassiveTestComponentBase :: return _local; } +Fw::ParamString PassiveTestComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E PassiveTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -5373,6 +5434,13 @@ E PassiveTestComponentBase :: return _local; } +E PassiveTestComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A PassiveTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -5398,6 +5466,13 @@ A PassiveTestComponentBase :: return _local; } +A PassiveTestComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S PassiveTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -5423,6 +5498,13 @@ S PassiveTestComponentBase :: return _local; } +S PassiveTestComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 88a0816a3..507da159b 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 @@ -1974,9 +1974,9 @@ class PassiveTestComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1998,6 +1998,14 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -2007,6 +2015,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -2016,6 +2031,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -2025,6 +2047,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -2034,6 +2063,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -2043,6 +2079,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -2053,6 +2096,14 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -2062,6 +2113,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2071,6 +2129,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2080,6 +2145,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2089,6 +2161,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2098,6 +2177,13 @@ class PassiveTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 b60f6122f..b0a4f24df 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 @@ -3508,9 +3508,7 @@ void QueuedExternalParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -3542,6 +3540,13 @@ I32 QueuedExternalParamsComponentBase :: return _local; } +I32 QueuedExternalParamsComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 QueuedExternalParamsComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -3567,6 +3572,13 @@ F64 QueuedExternalParamsComponentBase :: return _local; } +F64 QueuedExternalParamsComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString QueuedExternalParamsComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -3592,6 +3604,13 @@ Fw::ParamString QueuedExternalParamsComponentBase :: return _local; } +Fw::ParamString QueuedExternalParamsComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E QueuedExternalParamsComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -3617,6 +3636,13 @@ E QueuedExternalParamsComponentBase :: return _local; } +E QueuedExternalParamsComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A QueuedExternalParamsComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -3642,6 +3668,13 @@ A QueuedExternalParamsComponentBase :: return _local; } +A QueuedExternalParamsComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S QueuedExternalParamsComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -3667,6 +3700,13 @@ S QueuedExternalParamsComponentBase :: return _local; } +S QueuedExternalParamsComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 887af58ff..d1b1fb8d6 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 @@ -1551,9 +1551,9 @@ class QueuedExternalParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1575,6 +1575,14 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -1584,6 +1592,13 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -1593,6 +1608,13 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -1602,6 +1624,13 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -1611,6 +1640,13 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -1620,6 +1656,13 @@ class QueuedExternalParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 30432184b..dd19b5e60 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 @@ -3415,9 +3415,7 @@ void QueuedParamsComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -3437,6 +3435,13 @@ U32 QueuedParamsComponentBase :: return _local; } +U32 QueuedParamsComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 QueuedParamsComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -3450,6 +3455,13 @@ F64 QueuedParamsComponentBase :: return _local; } +F64 QueuedParamsComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString QueuedParamsComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -3463,6 +3475,13 @@ Fw::ParamString QueuedParamsComponentBase :: return _local; } +Fw::ParamString QueuedParamsComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E QueuedParamsComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -3476,6 +3495,13 @@ E QueuedParamsComponentBase :: return _local; } +E QueuedParamsComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A QueuedParamsComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -3489,6 +3515,13 @@ A QueuedParamsComponentBase :: return _local; } +A QueuedParamsComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S QueuedParamsComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -3502,6 +3535,13 @@ S QueuedParamsComponentBase :: return _local; } +S QueuedParamsComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + // ---------------------------------------------------------------------- // Time // ---------------------------------------------------------------------- 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 a6bb1950c..ea12e446e 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 @@ -1550,9 +1550,9 @@ class QueuedParamsComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -1574,6 +1574,14 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -1583,6 +1591,13 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -1592,6 +1607,13 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -1601,6 +1623,13 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -1610,6 +1639,13 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -1619,6 +1655,13 @@ class QueuedParamsComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + protected: // ---------------------------------------------------------------------- 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 e5d151421..6ffb12876 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 @@ -7100,9 +7100,7 @@ void QueuedSerialComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -7122,6 +7120,13 @@ U32 QueuedSerialComponentBase :: return _local; } +U32 QueuedSerialComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 QueuedSerialComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -7135,6 +7140,13 @@ F64 QueuedSerialComponentBase :: return _local; } +F64 QueuedSerialComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString QueuedSerialComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -7148,6 +7160,13 @@ Fw::ParamString QueuedSerialComponentBase :: return _local; } +Fw::ParamString QueuedSerialComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E QueuedSerialComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -7161,6 +7180,13 @@ E QueuedSerialComponentBase :: return _local; } +E QueuedSerialComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A QueuedSerialComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -7174,6 +7200,13 @@ A QueuedSerialComponentBase :: return _local; } +A QueuedSerialComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S QueuedSerialComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -7187,6 +7220,13 @@ S QueuedSerialComponentBase :: return _local; } +S QueuedSerialComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + I32 QueuedSerialComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -7212,6 +7252,13 @@ I32 QueuedSerialComponentBase :: return _local; } +I32 QueuedSerialComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 QueuedSerialComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -7237,6 +7284,13 @@ F64 QueuedSerialComponentBase :: return _local; } +F64 QueuedSerialComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString QueuedSerialComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -7262,6 +7316,13 @@ Fw::ParamString QueuedSerialComponentBase :: return _local; } +Fw::ParamString QueuedSerialComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E QueuedSerialComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -7287,6 +7348,13 @@ E QueuedSerialComponentBase :: return _local; } +E QueuedSerialComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A QueuedSerialComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -7312,6 +7380,13 @@ A QueuedSerialComponentBase :: return _local; } +A QueuedSerialComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S QueuedSerialComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -7337,6 +7412,13 @@ S QueuedSerialComponentBase :: return _local; } +S QueuedSerialComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 5910798c8..79eb2a1a9 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 @@ -2557,9 +2557,9 @@ class QueuedSerialComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -2581,6 +2581,14 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -2590,6 +2598,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -2599,6 +2614,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -2608,6 +2630,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -2617,6 +2646,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -2626,6 +2662,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -2636,6 +2679,14 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -2645,6 +2696,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2654,6 +2712,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2663,6 +2728,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2672,6 +2744,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2681,6 +2760,13 @@ class QueuedSerialComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ---------------------------------------------------------------------- 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 066a4b567..c80a2672d 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 @@ -6930,9 +6930,7 @@ void QueuedTestComponentBase :: Fw::ParamValid valid ) { - if (FW_PARAM_OK(valid)) { - this->parameterUpdated(id); - } + this->parameterUpdated(id); } // ---------------------------------------------------------------------- @@ -6952,6 +6950,13 @@ U32 QueuedTestComponentBase :: return _local; } +U32 QueuedTestComponentBase :: + paramGet_ParamU32() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamU32(_valid); +} + F64 QueuedTestComponentBase :: paramGet_ParamF64(Fw::ParamValid& valid) { @@ -6965,6 +6970,13 @@ F64 QueuedTestComponentBase :: return _local; } +F64 QueuedTestComponentBase :: + paramGet_ParamF64() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64(_valid); +} + Fw::ParamString QueuedTestComponentBase :: paramGet_ParamString(Fw::ParamValid& valid) { @@ -6978,6 +6990,13 @@ Fw::ParamString QueuedTestComponentBase :: return _local; } +Fw::ParamString QueuedTestComponentBase :: + paramGet_ParamString() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamString(_valid); +} + E QueuedTestComponentBase :: paramGet_ParamEnum(Fw::ParamValid& valid) { @@ -6991,6 +7010,13 @@ E QueuedTestComponentBase :: return _local; } +E QueuedTestComponentBase :: + paramGet_ParamEnum() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnum(_valid); +} + A QueuedTestComponentBase :: paramGet_ParamArray(Fw::ParamValid& valid) { @@ -7004,6 +7030,13 @@ A QueuedTestComponentBase :: return _local; } +A QueuedTestComponentBase :: + paramGet_ParamArray() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArray(_valid); +} + S QueuedTestComponentBase :: paramGet_ParamStruct(Fw::ParamValid& valid) { @@ -7017,6 +7050,13 @@ S QueuedTestComponentBase :: return _local; } +S QueuedTestComponentBase :: + paramGet_ParamStruct() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStruct(_valid); +} + I32 QueuedTestComponentBase :: paramGet_ParamI32Ext(Fw::ParamValid& valid) { @@ -7042,6 +7082,13 @@ I32 QueuedTestComponentBase :: return _local; } +I32 QueuedTestComponentBase :: + paramGet_ParamI32Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamI32Ext(_valid); +} + F64 QueuedTestComponentBase :: paramGet_ParamF64Ext(Fw::ParamValid& valid) { @@ -7067,6 +7114,13 @@ F64 QueuedTestComponentBase :: return _local; } +F64 QueuedTestComponentBase :: + paramGet_ParamF64Ext() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamF64Ext(_valid); +} + Fw::ParamString QueuedTestComponentBase :: paramGet_ParamStringExt(Fw::ParamValid& valid) { @@ -7092,6 +7146,13 @@ Fw::ParamString QueuedTestComponentBase :: return _local; } +Fw::ParamString QueuedTestComponentBase :: + paramGet_ParamStringExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStringExt(_valid); +} + E QueuedTestComponentBase :: paramGet_ParamEnumExt(Fw::ParamValid& valid) { @@ -7117,6 +7178,13 @@ E QueuedTestComponentBase :: return _local; } +E QueuedTestComponentBase :: + paramGet_ParamEnumExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamEnumExt(_valid); +} + A QueuedTestComponentBase :: paramGet_ParamArrayExt(Fw::ParamValid& valid) { @@ -7142,6 +7210,13 @@ A QueuedTestComponentBase :: return _local; } +A QueuedTestComponentBase :: + paramGet_ParamArrayExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamArrayExt(_valid); +} + S QueuedTestComponentBase :: paramGet_ParamStructExt(Fw::ParamValid& valid) { @@ -7167,6 +7242,13 @@ S QueuedTestComponentBase :: return _local; } +S QueuedTestComponentBase :: + paramGet_ParamStructExt() +{ + Fw::ParamValid _valid{}; + return this->paramGet_ParamStructExt(_valid); +} + // ---------------------------------------------------------------------- // External parameter delegate initialization // ---------------------------------------------------------------------- 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 0d477b930..bf4fc8370 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 @@ -2495,9 +2495,9 @@ class QueuedTestComponentBase : //! \brief Called for each parameter when parameters are loaded //! - //! By default this notifies the component via parameterUpdated when - //! the parameter loaded successfully (valid or default). You may - //! override it, for example to distinguish load from update. + //! By default this notifies the component via parameterUpdated for + //! every parameter, regardless of validity. You may override it, for + //! example to suppress notification for invalid parameters. virtual void parameterLoaded( FwPrmIdType id, //!< The parameter ID Fw::ParamValid valid //!< The parameter validity status @@ -2519,6 +2519,14 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamU32 + //! + //! \return The parameter value + //! + //! A parameter with U32 data + //! Second line of annotation + U32 paramGet_ParamU32(); + //! Get parameter ParamF64 //! //! \return The parameter value @@ -2528,6 +2536,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64 + //! + //! \return The parameter value + //! + //! A parameter with F64 data + F64 paramGet_ParamF64(); + //! Get parameter ParamString //! //! \return The parameter value @@ -2537,6 +2552,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamString + //! + //! \return The parameter value + //! + //! A parameter with string data and default value + Fw::ParamString paramGet_ParamString(); + //! Get parameter ParamEnum //! //! \return The parameter value @@ -2546,6 +2568,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnum + //! + //! \return The parameter value + //! + //! A parameter with enum data + E paramGet_ParamEnum(); + //! Get parameter ParamArray //! //! \return The parameter value @@ -2555,6 +2584,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArray + //! + //! \return The parameter value + //! + //! A parameter with array data, default value, and save opcode + A paramGet_ParamArray(); + //! Get parameter ParamStruct //! //! \return The parameter value @@ -2564,6 +2600,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStruct + //! + //! \return The parameter value + //! + //! A parameter with struct data and set/save opcodes + S paramGet_ParamStruct(); + //! Get parameter ParamI32Ext //! //! \return The parameter value @@ -2574,6 +2617,14 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamI32Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with I32 data + //! Second line of annotation + I32 paramGet_ParamI32Ext(); + //! Get parameter ParamF64Ext //! //! \return The parameter value @@ -2583,6 +2634,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamF64Ext + //! + //! \return The parameter value + //! + //! An externally stored parameter with F64 data + F64 paramGet_ParamF64Ext(); + //! Get parameter ParamStringExt //! //! \return The parameter value @@ -2592,6 +2650,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStringExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with string data and default value + Fw::ParamString paramGet_ParamStringExt(); + //! Get parameter ParamEnumExt //! //! \return The parameter value @@ -2601,6 +2666,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamEnumExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with enum data + E paramGet_ParamEnumExt(); + //! Get parameter ParamArrayExt //! //! \return The parameter value @@ -2610,6 +2682,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamArrayExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with array data, default value, and save opcode + A paramGet_ParamArrayExt(); + //! Get parameter ParamStructExt //! //! \return The parameter value @@ -2619,6 +2698,13 @@ class QueuedTestComponentBase : Fw::ParamValid& valid //!< Whether the parameter is valid ); + //! Get parameter ParamStructExt + //! + //! \return The parameter value + //! + //! An externally stored parameter with struct data and set/save opcodes + S paramGet_ParamStructExt(); + protected: // ----------------------------------------------------------------------