From 828539fe0b3fae292167cdeab224e7da0a900708 Mon Sep 17 00:00:00 2001 From: jawest Date: Wed, 28 Jan 2026 12:16:51 -0800 Subject: [PATCH 1/4] Get default string size from analysis, remove default string size arg from fpp-to-dict and fpp-to-cpp, regenerate tests --- .../scala/analysis/Semantics/ImpliedUse.scala | 3 +- .../codegen/CppWriter/CppWriterState.scala | 11 +- .../codegen/CppWriter/CppWriterUtils.scala | 4 +- .../DictionaryJsonEncoder.scala | 3 +- .../DictionaryJsonEncoderState.scala | 17 +-- .../struct/StringArraySerializableAc.ref.hpp | 4 +- .../test/struct/StringSerializableAc.ref.hpp | 4 +- .../tools/fpp-to-cpp/test/struct/string.fpp | 2 + .../top/BasicDpTopologyDictionary.ref.json | 28 ++++- .../test/top/BasicTopologyDictionary.ref.json | 32 +++++- .../DictionaryDefsTopologyDictionary.ref.json | 100 +++++++++++------- .../top/FirstTopTopologyDictionary.ref.json | 26 ++++- ...alifiedCompInstTopologyDictionary.ref.json | 26 ++++- .../top/SecondTopTopologyDictionary.ref.json | 26 ++++- ...alifiedCompInstTopologyDictionary.ref.json | 26 ++++- ...missingFwFixedLengthStringSizeConstant.fpp | 29 +++++ ...ingFwFixedLengthStringSizeConstant.ref.txt | 7 ++ .../test/top/missingFwOpcodeType.fpp | 1 + .../test/top/missingFwOpcodeType.ref.txt | 2 +- .../test/top/missingUserDataSizeConstant.fpp | 1 + .../top/missingUserDataSizeConstant.ref.txt | 2 +- compiler/tools/fpp-to-dict/test/top/tests.sh | 1 + .../tools/fpp/src/main/scala/fpp-to-cpp.scala | 7 -- .../fpp/src/main/scala/fpp-to-dict.scala | 8 +- 24 files changed, 283 insertions(+), 87 deletions(-) create mode 100644 compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.fpp create mode 100644 compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.ref.txt diff --git a/compiler/lib/src/main/scala/analysis/Semantics/ImpliedUse.scala b/compiler/lib/src/main/scala/analysis/Semantics/ImpliedUse.scala index ea505fde1..9dc672fba 100644 --- a/compiler/lib/src/main/scala/analysis/Semantics/ImpliedUse.scala +++ b/compiler/lib/src/main/scala/analysis/Semantics/ImpliedUse.scala @@ -77,7 +77,8 @@ object ImpliedUse { * Each name is a list of identifiers */ def getTopologyConstants(a: Analysis) = if (a.dictionaryGeneration) then List( - List("Fw", "DpCfg", "CONTAINER_USER_DATA_SIZE") + List("Fw", "DpCfg", "CONTAINER_USER_DATA_SIZE"), + List("FW_FIXED_LENGTH_STRING_SIZE") ) else Nil diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala index 4d4ebcedf..39232dcb3 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala @@ -14,8 +14,6 @@ case class CppWriterState( guardPrefix: Option[String] = None, /** The list of include path prefixes */ pathPrefixes: List[String] = Nil, - /** The default string size */ - defaultStringSize: Int = CppWriterState.defaultDefaultStringSize, /** The name of the tool using the CppWriter */ toolName: Option[String] = None, /** The map from strings to locations */ @@ -216,6 +214,15 @@ case class CppWriterState( case _ => false } + def getFwDefaultStringSize: BigInt = { + a.frameworkDefinitions.constants.fwFixedLengthStringSize match { + case Some(s: Symbol.Constant) => a.valueMap(s.getNodeId) match { + case Value.Integer(value) => value + case _ => throw InternalError("expected integer value") + } + case None => CppWriterState.defaultDefaultStringSize + } + } } object CppWriterState { diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala index 58fd75f20..20cbfdebe 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala @@ -294,12 +294,12 @@ trait CppWriterUtils extends LineUtils { val _ @ Value.Integer(value) = s.a.valueMap(node.id).convertToType(Type.Integer).get value } - ).getOrElse(BigInt(s.defaultStringSize)) + ).getOrElse(s.getFwDefaultStringSize) /** Write the size of a string type */ def writeStringSize(s: CppWriterState, t: Type.String): String = t.size.map(node => ValueCppWriter.write(s, s.a.valueMap(node.id))). - getOrElse(s.defaultStringSize.toString) + getOrElse(s.getFwDefaultStringSize.toString) /** Write a C++ expression for static serialized size */ def writeStaticSerializedSizeExpr(s: CppWriterState, t: Type, typeName: String): String = diff --git a/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoder.scala b/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoder.scala index 8870332e8..9b91c2aa7 100644 --- a/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoder.scala +++ b/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoder.scala @@ -132,9 +132,10 @@ case class DictionaryJsonEncoder( "name" -> "string".asJson, "kind" -> "string".asJson ) + val fwDefaultStringSize = dictionaryState.getFwDefaultStringSize size match { case Some(s) => Json.obj("size" -> valueAsJson(dictionaryState.a.valueMap(s.id))).deepMerge(jsonObj) - case None => Json.obj("size" -> dictionaryState.defaultStringSize.asJson).deepMerge(jsonObj) + case None => Json.obj("size" -> fwDefaultStringSize.asJson).deepMerge(jsonObj) } } case Type.Array(node, _, _, _) => { diff --git a/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoderState.scala b/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoderState.scala index 125a95ff1..2d5a44908 100644 --- a/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoderState.scala +++ b/compiler/lib/src/main/scala/codegen/DictionaryJsonWriter/DictionaryJsonEncoderState.scala @@ -10,8 +10,6 @@ case class DictionaryJsonEncoderState( a: Analysis, /** The output directory */ dir: String = ".", - /** The default string size */ - defaultStringSize: Int = DictionaryJsonEncoderState.defaultDefaultStringSize, /** The default bool size */ boolSize: Int = DictionaryJsonEncoderState.boolSize, /** The Dictionary metadata */ @@ -29,17 +27,24 @@ case class DictionaryJsonEncoderState( } } + def getFwDefaultStringSize: BigInt = { + a.frameworkDefinitions.constants.fwFixedLengthStringSize match { + case Some(s: Symbol.Constant) => a.valueMap(s.getNodeId) match { + case Value.Integer(value) => value + case _ => throw InternalError("expected integer value") + } + case None => throw InternalError("FW_FIXED_LENGTH_STRING_SIZE constant not defined") + } + } + } case object DictionaryJsonEncoderState { - /** The default string size */ - val defaultDefaultStringSize = 80 - /** The default bool size */ val boolSize = 8 /** Gets the generated JSON file name for a topology definition */ def getTopologyFileName(baseName: String): String = s"${baseName}TopologyDictionary.json" -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp index 2e20b37c9..e5fc47180 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp @@ -34,7 +34,7 @@ class StringArray : enum { //! The size of the serial representation SERIALIZED_SIZE = - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(60) + Fw::StringBase::STATIC_SERIALIZED_SIZE(40) * 16 }; @@ -175,7 +175,7 @@ class StringArray : // Member variables // ---------------------------------------------------------------------- - char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(60)]; Fw::ExternalString m_s1; char m___fprime_ac_s2_buffer[16][Fw::StringBase::BUFFER_SIZE(40)]; Fw::ExternalString m_s2[16]; diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp index 775bc8f3b..5c449f4a9 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp @@ -25,7 +25,7 @@ class String : enum { //! The size of the serial representation SERIALIZED_SIZE = - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(60) + Fw::StringBase::STATIC_SERIALIZED_SIZE(40) }; @@ -160,7 +160,7 @@ class String : // Member variables // ---------------------------------------------------------------------- - char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(60)]; Fw::ExternalString m_s1; char m___fprime_ac_s2_buffer[Fw::StringBase::BUFFER_SIZE(40)]; Fw::ExternalString m_s2; diff --git a/compiler/tools/fpp-to-cpp/test/struct/string.fpp b/compiler/tools/fpp-to-cpp/test/struct/string.fpp index ffeb297d5..30901faa4 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/string.fpp +++ b/compiler/tools/fpp-to-cpp/test/struct/string.fpp @@ -1,3 +1,5 @@ +constant FW_FIXED_LENGTH_STRING_SIZE = 60 + struct String { s1: string s2: string size 40 diff --git a/compiler/tools/fpp-to-dict/test/top/BasicDpTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/BasicDpTopologyDictionary.ref.json index ecaee69e3..0db4571bd 100644 --- a/compiler/tools/fpp-to-dict/test/top/BasicDpTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/BasicDpTopologyDictionary.ref.json @@ -313,6 +313,29 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, + { + "kind" : "constant", + "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 32, + "annotation" : "The container user data size" + }, { "kind" : "constant", "qualifiedName" : "FW_SERIALIZE_TRUE_VALUE", @@ -337,15 +360,14 @@ }, { "kind" : "constant", - "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", + "qualifiedName" : "STRING_SIZE", "type" : { "name" : "U64", "kind" : "integer", "size" : 64, "signed" : false }, - "value" : 32, - "annotation" : "The container user data size" + "value" : 256 } ], "commands" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/BasicTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/BasicTopologyDictionary.ref.json index 3fdcfcdd9..8ba9dd19a 100644 --- a/compiler/tools/fpp-to-dict/test/top/BasicTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/BasicTopologyDictionary.ref.json @@ -249,14 +249,26 @@ "constants" : [ { "kind" : "constant", - "qualifiedName" : "FW_SERIALIZE_FALSE_VALUE", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", "type" : { "name" : "U64", "kind" : "integer", "size" : 64, "signed" : false }, - "value" : 0 + "value" : 256 + }, + { + "kind" : "constant", + "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 32, + "annotation" : "The container user data size" }, { "kind" : "constant", @@ -271,15 +283,25 @@ }, { "kind" : "constant", - "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", + "qualifiedName" : "FW_SERIALIZE_FALSE_VALUE", "type" : { "name" : "U64", "kind" : "integer", "size" : 64, "signed" : false }, - "value" : 32, - "annotation" : "The container user data size" + "value" : 0 + }, + { + "kind" : "constant", + "qualifiedName" : "STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 } ], "commands" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/DictionaryDefsTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/DictionaryDefsTopologyDictionary.ref.json index 82d2d9c49..1d1613fb2 100644 --- a/compiler/tools/fpp-to-dict/test/top/DictionaryDefsTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/DictionaryDefsTopologyDictionary.ref.json @@ -86,45 +86,6 @@ "signed" : false } }, - { - "kind" : "struct", - "qualifiedName" : "S", - "members" : { - "X" : { - "type" : { - "name" : "string", - "kind" : "string", - "size" : 80 - }, - "index" : 0 - }, - "Y" : { - "type" : { - "name" : "A2", - "kind" : "qualifiedIdentifier" - }, - "index" : 1 - }, - "Z" : { - "type" : { - "name" : "S2", - "kind" : "qualifiedIdentifier" - }, - "index" : 2 - } - }, - "default" : { - "X" : "", - "Y" : [ - 0, - 0, - 0 - ], - "Z" : { - "X" : 0 - } - } - }, { "kind" : "alias", "qualifiedName" : "FwEventIdType", @@ -345,6 +306,45 @@ "signed" : false } }, + { + "kind" : "struct", + "qualifiedName" : "S", + "members" : { + "X" : { + "type" : { + "name" : "string", + "kind" : "string", + "size" : 256 + }, + "index" : 0 + }, + "Y" : { + "type" : { + "name" : "A2", + "kind" : "qualifiedIdentifier" + }, + "index" : 1 + }, + "Z" : { + "type" : { + "name" : "S2", + "kind" : "qualifiedIdentifier" + }, + "index" : 2 + } + }, + "default" : { + "X" : "", + "Y" : [ + 0, + 0, + 0 + ], + "Z" : { + "X" : 0 + } + } + }, { "kind" : "alias", "qualifiedName" : "FwSizeType", @@ -408,6 +408,17 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", @@ -431,6 +442,17 @@ }, "value" : 255 }, + { + "kind" : "constant", + "qualifiedName" : "STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "P.C", diff --git a/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json index 7af198df9..c7bd3d684 100644 --- a/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/FirstTopTopologyDictionary.ref.json @@ -111,7 +111,7 @@ "elementType" : { "name" : "string", "kind" : "string", - "size" : 80 + "size" : 256 }, "default" : [ "A", @@ -594,6 +594,17 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", @@ -627,6 +638,17 @@ "signed" : false }, "value" : 0 + }, + { + "kind" : "constant", + "qualifiedName" : "STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 } ], "commands" : [ @@ -851,7 +873,7 @@ "type" : { "name" : "string", "kind" : "string", - "size" : 80 + "size" : 256 }, "ref" : false }, diff --git a/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json index 0447cd19e..07a3dbc48 100644 --- a/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/QualifiedCompInstTopologyDictionary.ref.json @@ -274,6 +274,17 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", @@ -286,6 +297,17 @@ "value" : 32, "annotation" : "The container user data size" }, + { + "kind" : "constant", + "qualifiedName" : "FW_SERIALIZE_TRUE_VALUE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 255 + }, { "kind" : "constant", "qualifiedName" : "FW_SERIALIZE_FALSE_VALUE", @@ -299,14 +321,14 @@ }, { "kind" : "constant", - "qualifiedName" : "FW_SERIALIZE_TRUE_VALUE", + "qualifiedName" : "STRING_SIZE", "type" : { "name" : "U64", "kind" : "integer", "size" : 64, "signed" : false }, - "value" : 255 + "value" : 256 } ], "commands" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json index c4c44f708..53e26b244 100644 --- a/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/SecondTopTopologyDictionary.ref.json @@ -111,7 +111,7 @@ "elementType" : { "name" : "string", "kind" : "string", - "size" : 80 + "size" : 256 }, "default" : [ "A", @@ -594,6 +594,17 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", @@ -627,6 +638,17 @@ "signed" : false }, "value" : 0 + }, + { + "kind" : "constant", + "qualifiedName" : "STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 } ], "commands" : [ @@ -851,7 +873,7 @@ "type" : { "name" : "string", "kind" : "string", - "size" : 80 + "size" : 256 }, "ref" : false }, diff --git a/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json b/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json index e67108777..e1bc186f0 100644 --- a/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json +++ b/compiler/tools/fpp-to-dict/test/top/UnqualifiedCompInstTopologyDictionary.ref.json @@ -274,6 +274,17 @@ } ], "constants" : [ + { + "kind" : "constant", + "qualifiedName" : "FW_FIXED_LENGTH_STRING_SIZE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 256 + }, { "kind" : "constant", "qualifiedName" : "Fw.DpCfg.CONTAINER_USER_DATA_SIZE", @@ -286,6 +297,17 @@ "value" : 32, "annotation" : "The container user data size" }, + { + "kind" : "constant", + "qualifiedName" : "FW_SERIALIZE_TRUE_VALUE", + "type" : { + "name" : "U64", + "kind" : "integer", + "size" : 64, + "signed" : false + }, + "value" : 255 + }, { "kind" : "constant", "qualifiedName" : "FW_SERIALIZE_FALSE_VALUE", @@ -299,14 +321,14 @@ }, { "kind" : "constant", - "qualifiedName" : "FW_SERIALIZE_TRUE_VALUE", + "qualifiedName" : "STRING_SIZE", "type" : { "name" : "U64", "kind" : "integer", "size" : 64, "signed" : false }, - "value" : 255 + "value" : 256 } ], "commands" : [ diff --git a/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.fpp b/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.fpp new file mode 100644 index 000000000..8b286586a --- /dev/null +++ b/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.fpp @@ -0,0 +1,29 @@ +type FwChanIdType = U32 +type FwDpIdType = U32 +type FwDpPriorityType = U32 +type FwEventIdType = U32 +type FwOpcodeType = U32 +type FwPacketDescriptorType = U32 +type FwTlmPacketizeIdType = U16 +type FwSizeType = U32 +type FwSizeStoreType = U16 +type FwTimeBaseStoreType = U16 +type FwTimeContextStoreType = U8 + +module Fw { + enum DpState { + UNTRANSMITTED + } + + module DpCfg { + enum ProcType { + UNTRANSMITTED + } + + constant CONTAINER_USER_DATA_SIZE = 1 + } +} + +topology T { + +} diff --git a/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.ref.txt b/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.ref.txt new file mode 100644 index 000000000..92fc56867 --- /dev/null +++ b/compiler/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.ref.txt @@ -0,0 +1,7 @@ +fpp-to-dict +[ local path prefix ]/tools/fpp-to-dict/test/top/missingFwFixedLengthStringSizeConstant.fpp:27.1 +topology T { +^ +error: symbol FW_FIXED_LENGTH_STRING_SIZE is not defined +note: looking for a constant here +note: when constructing a dictionary, the constant FW_FIXED_LENGTH_STRING_SIZE must be defined diff --git a/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp b/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp index c8763ee74..05a999b28 100644 --- a/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp +++ b/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp @@ -8,6 +8,7 @@ type FwSizeType = U32 type FwSizeStoreType = U16 type FwTimeBaseStoreType = U16 type FwTimeContextStoreType = U8 +constant FW_FIXED_LENGTH_STRING_SIZE = 256 module Fw { enum DpState { diff --git a/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.ref.txt b/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.ref.txt index d55ad9957..0fa836cd5 100644 --- a/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.ref.txt +++ b/compiler/tools/fpp-to-dict/test/top/missingFwOpcodeType.ref.txt @@ -1,5 +1,5 @@ fpp-to-dict -[ local path prefix ]/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp:26.1 +[ local path prefix ]/tools/fpp-to-dict/test/top/missingFwOpcodeType.fpp:27.1 topology T { ^ error: symbol FwOpcodeType is not defined diff --git a/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp b/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp index 58ce4e0a2..2e2b9284f 100644 --- a/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp +++ b/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp @@ -9,6 +9,7 @@ type FwSizeType = U32 type FwSizeStoreType = U16 type FwTimeBaseStoreType = U16 type FwTimeContextStoreType = U8 +constant FW_FIXED_LENGTH_STRING_SIZE = 256 module Fw { enum DpState { diff --git a/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.ref.txt b/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.ref.txt index 42e97a1eb..e02e7ddbd 100644 --- a/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.ref.txt +++ b/compiler/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.ref.txt @@ -1,5 +1,5 @@ fpp-to-dict -[ local path prefix ]/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp:25.1 +[ local path prefix ]/tools/fpp-to-dict/test/top/missingUserDataSizeConstant.fpp:26.1 topology T { ^ error: symbol CONTAINER_USER_DATA_SIZE is not defined diff --git a/compiler/tools/fpp-to-dict/test/top/tests.sh b/compiler/tools/fpp-to-dict/test/top/tests.sh index ad520ef6b..d9baae306 100644 --- a/compiler/tools/fpp-to-dict/test/top/tests.sh +++ b/compiler/tools/fpp-to-dict/test/top/tests.sh @@ -4,6 +4,7 @@ basic dataProducts duplicate missingFwOpcodeType +missingFwFixedLengthStringSizeConstant missingUserDataSizeConstant invalidUserDataSizeConstant unqualifiedComponentInstances diff --git a/compiler/tools/fpp/src/main/scala/fpp-to-cpp.scala b/compiler/tools/fpp/src/main/scala/fpp-to-cpp.scala index 5af74fd38..49ac4bb67 100644 --- a/compiler/tools/fpp/src/main/scala/fpp-to-cpp.scala +++ b/compiler/tools/fpp/src/main/scala/fpp-to-cpp.scala @@ -18,7 +18,6 @@ object FPPToCpp { guardPrefix: Option[String] = None, names: Option[String] = None, pathPrefixes: List[String] = Nil, - defaultStringSize: Int = CppWriterState.defaultDefaultStringSize, template: Boolean = false, unitTest: Boolean = false, ) @@ -97,7 +96,6 @@ object FPPToCpp { dir, options.guardPrefix, options.pathPrefixes, - options.defaultStringSize, Some(name) ) mode match { @@ -157,11 +155,6 @@ object FPPToCpp { .valueName(",...") .action((p, c) => c.copy(pathPrefixes = p.toList)) .text("prefixes to delete from generated file paths"), - opt[Int]('s', "size") - .valueName("") - .validate(s => if (s > 0) success else failure("size must be greater than zero")) - .action((s, c) => c.copy(defaultStringSize = s)) - .text("default string size"), opt[Unit]('t', "template") .action((_, c) => c.copy(template = true)) .text("emit template code"), diff --git a/compiler/tools/fpp/src/main/scala/fpp-to-dict.scala b/compiler/tools/fpp/src/main/scala/fpp-to-dict.scala index 088581369..8ff5fda58 100644 --- a/compiler/tools/fpp/src/main/scala/fpp-to-dict.scala +++ b/compiler/tools/fpp/src/main/scala/fpp-to-dict.scala @@ -14,7 +14,6 @@ object FPPToDict { files: List[File] = Nil, imports: List[File] = Nil, dir: Option[String] = None, - defaultStringSize: Int = DictionaryJsonEncoderState.defaultDefaultStringSize, frameworkVersion: String = "", projectVersion: String = "", libraryVersions: List[String] = Nil, @@ -50,7 +49,7 @@ object FPPToDict { case None => "." } ComputeDictionaryFiles.visitList( - DictionaryJsonEncoderState(a=a, dir=dir, defaultStringSize=options.defaultStringSize, metadata=metadata), + DictionaryJsonEncoderState(a=a, dir=dir, metadata=metadata), tulFiles, ComputeDictionaryFiles.transUnit ) @@ -85,11 +84,6 @@ object FPPToDict { .valueName("") .action((d, c) => c.copy(dir = Some(d))) .text("output directory"), - opt[Int]('s', "size") - .valueName("") - .validate(s => if (s > 0) success else failure("size must be greater than zero")) - .action((s, c) => c.copy(defaultStringSize = s)) - .text("default string size"), opt[String]('f', "frameworkVersion") .valueName("") .action((f, c) => c.copy(frameworkVersion = f)) From 1548baff634b66e419d0bf14c4a399ffd5ecbfbd Mon Sep 17 00:00:00 2001 From: jawest Date: Wed, 28 Jan 2026 12:41:23 -0800 Subject: [PATCH 2/4] Update user guide --- docs/fpp-spec.html | 2 +- docs/fpp-users-guide.html | 55 +++++-------------- docs/index.html | 2 +- .../Analyzing-and-Translating-Models.adoc | 42 +++++--------- 4 files changed, 31 insertions(+), 70 deletions(-) diff --git a/docs/fpp-spec.html b/docs/fpp-spec.html index 2bc7ed7e8..445cd54aa 100644 --- a/docs/fpp-spec.html +++ b/docs/fpp-spec.html @@ -12152,7 +12152,7 @@

22.4. Translation Tools

diff --git a/docs/fpp-users-guide.html b/docs/fpp-users-guide.html index fc5f9c61b..643471bcd 100644 --- a/docs/fpp-users-guide.html +++ b/docs/fpp-users-guide.html @@ -14299,23 +14299,16 @@

-
-
fpp-to-cpp -s 40 ...
-
+

FPP allows string types with no specified size. When generating code we need to provide a default size to use when FPP doesn’t specify the size. -If you don’t specify the -s option, then the tool uses -an automatic default of 80.

-
- - +If the FW_FIXED_LENGTH_STRING_SIZE +framework constant +is not defined in the model, then the tool uses an +automatic default of 80.

@@ -14830,34 +14823,16 @@

16.5. G

F Prime configuration: -When you run fpp-to-dict on an FPP model, the model must define the following -types:

-
-
-
    -
  • -

    FwChanIdType

    -
    • -
  • -

    FwEventIdType

    -
    • -
  • -

    FwOpcodeType

    -
    • -
  • -

    FwPacketDescriptorType

    -
    • -
  • -

    FwTlmPacketizeIdType

    -
    • -
+When you run fpp-to-dict on an FPP model, the model must define the +framework definitions specified in the +F Prime +dictionary specification.

-

These types are required by the F Prime GDS, so they are included in the -dictionary. -Each of these types must be an alias of an integer type. -Typically you specify these types as part of F Prime configuration, -in the file config/FpConfig.fpp. +

These types and constants are required by the F Prime GDS, so they are +included in the dictionary. +Typically you specify these types and constants as part of F Prime configuration, +in the file default/config/FpConfig.fpp or default/config/FpConstants.fpp. See the F Prime documentation for details.

@@ -14869,7 +14844,7 @@

16.5. G
  • -

    The -d and -s options work in the same way as for +

    The -d option works in the same way as for fpp-to-cpp.

  • @@ -16378,7 +16353,7 @@

    17.4. S

diff --git a/docs/index.html b/docs/index.html index 41ba698fb..d66d1ca04 100644 --- a/docs/index.html +++ b/docs/index.html @@ -464,7 +464,7 @@

F Prime Prime (FPP)

diff --git a/docs/users-guide/Analyzing-and-Translating-Models.adoc b/docs/users-guide/Analyzing-and-Translating-Models.adoc index 047049fd9..6a202d2b9 100644 --- a/docs/users-guide/Analyzing-and-Translating-Models.adoc +++ b/docs/users-guide/Analyzing-and-Translating-Models.adoc @@ -508,18 +508,13 @@ to the directory `cpp` (which must already exist). to _file_. This is useful for collecting autocoder build dependencies. -* `-s` _size_ : Specify a default string size. -For example, -+ ----- -fpp-to-cpp -s 40 ... ----- -+ FPP allows string types with no specified size. When generating code we need to provide a default size to use when FPP doesn't specify the size. -If you don't specify the `-s` option, then the tool uses -an automatic default of 80. +If the `FW_FIXED_LENGTH_STRING_SIZE` +<> +is not defined in the model, then the tool uses an +automatic default of 80. ==== Types, Ports, State Machines, and Components @@ -915,24 +910,15 @@ That way the subtopologies are part of the model, but no dictionaries are generated for them. *F Prime configuration:* -When you run `fpp-to-dict` on an FPP model, the model must define the following -types: - -* `FwChanIdType` - -* `FwEventIdType` - -* `FwOpcodeType` - -* `FwPacketDescriptorType` - -* `FwTlmPacketizeIdType` - -These types are required by the F Prime GDS, so they are included in the -dictionary. -Each of these types must be an alias of an integer type. -Typically you specify these types as part of F Prime configuration, -in the file `config/FpConfig.fpp`. +When you run `fpp-to-dict` on an FPP model, the model must define the +framework definitions specified in the +https://fprime.jpl.nasa.gov/latest/docs/reference/fpp-json-dict/[F Prime +dictionary specification]. + +These types and constants are required by the F Prime GDS, so they are +included in the dictionary. +Typically you specify these types and constants as part of F Prime configuration, +in the file `default/config/FpConfig.fpp` or `default/config/FpConstants.fpp`. See the https://fprime.jpl.nasa.gov/devel/docs/user-manual/framework/configuring-fprime/[F Prime documentation] for details. @@ -940,7 +926,7 @@ Prime documentation] for details. *Options:* `fpp-to-dict` provides the following options: -* The `-d` and `-s` options work in the same way as for +* The `-d` option works in the same way as for <>. From 326512f934773dfb312cc175afdd1156d010a48d Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 29 Jan 2026 11:26:13 -0800 Subject: [PATCH 3/4] Revise C++ code gen --- .../ComponentInternalStateMachines.scala | 16 +++++++++---- .../codegen/CppWriter/ConstantCppWriter.scala | 2 +- .../codegen/CppWriter/CppWriterState.scala | 11 --------- .../codegen/CppWriter/CppWriterUtils.scala | 8 +++---- .../test/alias/BasicSerializableAc.ref.hpp | 4 ++-- .../test/array/S1SerializableAc.ref.hpp | 4 ++-- .../test/array/String1ArrayAc.ref.hpp | 2 +- .../test/array/String2ArrayAc.ref.hpp | 2 +- .../ActiveAsyncProductsComponentAc.ref.cpp | 20 ++++++++-------- .../ActiveAsyncProductsComponentAc.ref.hpp | 4 ++-- .../base/ActiveCommandsComponentAc.ref.cpp | 16 ++++++------- .../base/ActiveEventsComponentAc.ref.cpp | 18 +++++++------- .../ActiveExternalParamsComponentAc.ref.cpp | 16 ++++++------- .../base/ActiveGetProductsComponentAc.ref.cpp | 20 ++++++++-------- .../base/ActiveGetProductsComponentAc.ref.hpp | 4 ++-- .../ActiveGuardedProductsComponentAc.ref.cpp | 20 ++++++++-------- .../ActiveGuardedProductsComponentAc.ref.hpp | 4 ++-- .../base/ActiveOverflowComponentAc.ref.cpp | 16 ++++++------- .../base/ActiveParamsComponentAc.ref.cpp | 16 ++++++------- .../base/ActiveSerialComponentAc.ref.cpp | 20 ++++++++-------- .../ActiveSyncProductsComponentAc.ref.cpp | 20 ++++++++-------- .../ActiveSyncProductsComponentAc.ref.hpp | 4 ++-- .../base/ActiveTelemetryComponentAc.ref.cpp | 18 +++++++------- .../base/ActiveTestComponentAc.ref.cpp | 24 +++++++++---------- .../base/ActiveTestComponentAc.ref.hpp | 4 ++-- .../base/PassiveEventsComponentAc.ref.cpp | 2 +- .../PassiveGetProductsComponentAc.ref.cpp | 4 ++-- .../PassiveGetProductsComponentAc.ref.hpp | 4 ++-- .../PassiveGuardedProductsComponentAc.ref.cpp | 4 ++-- .../PassiveGuardedProductsComponentAc.ref.hpp | 4 ++-- .../base/PassiveSerialComponentAc.ref.cpp | 4 ++-- .../PassiveSyncProductsComponentAc.ref.cpp | 4 ++-- .../PassiveSyncProductsComponentAc.ref.hpp | 4 ++-- .../base/PassiveTelemetryComponentAc.ref.cpp | 2 +- .../base/PassiveTestComponentAc.ref.cpp | 8 +++---- .../base/PassiveTestComponentAc.ref.hpp | 4 ++-- .../QueuedAsyncProductsComponentAc.ref.cpp | 20 ++++++++-------- .../QueuedAsyncProductsComponentAc.ref.hpp | 4 ++-- .../base/QueuedCommandsComponentAc.ref.cpp | 16 ++++++------- .../base/QueuedEventsComponentAc.ref.cpp | 18 +++++++------- .../QueuedExternalParamsComponentAc.ref.cpp | 16 ++++++------- .../base/QueuedGetProductsComponentAc.ref.cpp | 20 ++++++++-------- .../base/QueuedGetProductsComponentAc.ref.hpp | 4 ++-- .../QueuedGuardedProductsComponentAc.ref.cpp | 20 ++++++++-------- .../QueuedGuardedProductsComponentAc.ref.hpp | 4 ++-- .../base/QueuedOverflowComponentAc.ref.cpp | 16 ++++++------- .../base/QueuedParamsComponentAc.ref.cpp | 16 ++++++------- .../base/QueuedSerialComponentAc.ref.cpp | 20 ++++++++-------- .../QueuedSyncProductsComponentAc.ref.cpp | 20 ++++++++-------- .../QueuedSyncProductsComponentAc.ref.hpp | 4 ++-- .../base/QueuedTelemetryComponentAc.ref.cpp | 18 +++++++------- .../base/QueuedTestComponentAc.ref.cpp | 24 +++++++++---------- .../base/QueuedTestComponentAc.ref.hpp | 4 ++-- .../component/base/SSerializableAc.ref.hpp | 4 ++-- .../base/SmStateActiveComponentAc.ref.cpp | 10 ++++---- .../base/SmStateQueuedComponentAc.ref.cpp | 10 ++++---- .../test/component/base/TypedPortAc.ref.cpp | 2 +- .../test/component/base/TypedPortAc.ref.hpp | 2 +- .../component/base/TypedReturnPortAc.ref.hpp | 2 +- .../ActiveAsyncProductsTesterBase.ref.hpp | 4 ++-- .../ActiveCommandsTesterBase.ref.hpp | 4 ++-- .../test-base/ActiveEventsTesterBase.ref.hpp | 4 ++-- .../ActiveExternalParamsTesterBase.ref.hpp | 4 ++-- .../ActiveGetProductsTesterBase.ref.hpp | 4 ++-- .../ActiveGuardedProductsTesterBase.ref.hpp | 4 ++-- .../test-base/ActiveParamsTesterBase.ref.hpp | 4 ++-- .../test-base/ActiveSerialTesterBase.ref.hpp | 4 ++-- .../ActiveSyncProductsTesterBase.ref.hpp | 4 ++-- .../ActiveTelemetryTesterBase.ref.hpp | 4 ++-- .../test-base/ActiveTestTesterBase.ref.hpp | 4 ++-- .../PassiveCommandsTesterBase.ref.hpp | 4 ++-- .../test-base/PassiveEventsTesterBase.ref.hpp | 4 ++-- .../PassiveExternalParamsTesterBase.ref.hpp | 4 ++-- .../PassiveGetProductsTesterBase.ref.hpp | 4 ++-- .../PassiveGuardedProductsTesterBase.ref.hpp | 4 ++-- .../test-base/PassiveParamsTesterBase.ref.hpp | 4 ++-- .../test-base/PassiveSerialTesterBase.ref.hpp | 4 ++-- .../PassiveSyncProductsTesterBase.ref.hpp | 4 ++-- .../PassiveTelemetryTesterBase.ref.hpp | 4 ++-- .../test-base/PassiveTestTesterBase.ref.hpp | 4 ++-- .../QueuedAsyncProductsTesterBase.ref.hpp | 4 ++-- .../QueuedCommandsTesterBase.ref.hpp | 4 ++-- .../test-base/QueuedEventsTesterBase.ref.hpp | 4 ++-- .../QueuedExternalParamsTesterBase.ref.hpp | 4 ++-- .../QueuedGetProductsTesterBase.ref.hpp | 4 ++-- .../QueuedGuardedProductsTesterBase.ref.hpp | 4 ++-- .../test-base/QueuedParamsTesterBase.ref.hpp | 4 ++-- .../test-base/QueuedSerialTesterBase.ref.hpp | 4 ++-- .../QueuedSyncProductsTesterBase.ref.hpp | 4 ++-- .../QueuedTelemetryTesterBase.ref.hpp | 4 ++-- .../test-base/QueuedTestTesterBase.ref.hpp | 4 ++-- .../FppConstantsAc_constants.ref.hpp | 16 ++++++------- ...FppConstantsAc_constants_guard_dir.ref.hpp | 16 ++++++------- ...ConstantsAc_constants_guard_prefix.ref.hpp | 16 ++++++------- .../output_dir/FppConstantsAc.ref.hpp | 16 ++++++------- .../test/fprime/config/FpConstants.fpp | 10 ++++---- .../fpp-to-cpp/test/port/StringPortAc.ref.cpp | 4 ++-- .../fpp-to-cpp/test/port/StringPortAc.ref.hpp | 4 ++-- .../struct/PrimitiveSerializableAc.ref.hpp | 4 ++-- .../struct/StringArraySerializableAc.ref.hpp | 4 ++-- .../test/struct/StringSerializableAc.ref.hpp | 4 ++-- .../top/OneInstance_P1TlmPacketsAc.ref.cpp | 2 +- .../top/OneInstance_P2TlmPacketsAc.ref.cpp | 2 +- .../top/OneInstance_P3TlmPacketsAc.ref.cpp | 2 +- .../top/TwoInstances_P1TlmPacketsAc.ref.cpp | 4 ++-- 105 files changed, 419 insertions(+), 424 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala index 689a2519e..6bc479736 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala @@ -627,8 +627,13 @@ case class ComponentInternalStateMachines( ) /** The signal types and the signal string size */ - private val signalTypesAndStringSize: (Set[Type], BigInt) = - internalSmSymbols.foldLeft ((Set(), BigInt(0))) { + private val signalTypesAndStringSize: (Set[Type], String) = { + def max(s1: String, s2: String) = (s1, s2) match { + case ("0", _) => s2 + case (_, "0") => s1 + case _ => if s1 == s2 then s1 else s"FW_MAX($s1, $s2)" + } + internalSmSymbols.foldLeft ((Set(), "0")) { case ((ts, maxStringSize), sym) => { val signals = s.a.stateMachineMap(sym).signals signals.foldLeft ((ts, maxStringSize)) { @@ -638,7 +643,7 @@ case class ComponentInternalStateMachines( s.a.typeMap(tn.id).getUnderlyingType match { case t: Type.String => ( ts + Type.String(None), - maxStringSize.max(getStringSize(s, t)) + max(maxStringSize, getStringSize(s, t)) ) case t => (ts + t, maxStringSize) } @@ -647,11 +652,12 @@ case class ComponentInternalStateMachines( } } } + } private val signalTypes: List[Type] = signalTypesAndStringSize._1.toList.sortBy(writeSignalTypeName) - private val signalStringSize: BigInt = signalTypesAndStringSize._2 + private val signalStringSize: String = signalTypesAndStringSize._2 private val hasSignalTypes: Boolean = !signalTypes.isEmpty @@ -692,7 +698,7 @@ case class ComponentInternalStateMachines( private def writeSignalTypeSize(t: Type): String = t.getUnderlyingType match { case _: Type.String => - s"Fw::StringBase::STATIC_SERIALIZED_SIZE(${signalStringSize.toString})" + s"Fw::StringBase::STATIC_SERIALIZED_SIZE($signalStringSize)" case _ => writeStaticSerializedSizeExpr(s, t, TypeCppWriter.getName(s, t)) } diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala index 30d111f82..73cf54d66 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala @@ -129,7 +129,7 @@ object ConstantCppWriter extends CppWriterUtils { val hppLines = { val defLine = line(s"$name = $value") List( - line(s"enum FppConstant_$name {"), + line(s"enum {"), indentIn(defLine), line("};") ) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala index 39232dcb3..5654c1c1f 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala @@ -214,21 +214,10 @@ case class CppWriterState( case _ => false } - def getFwDefaultStringSize: BigInt = { - a.frameworkDefinitions.constants.fwFixedLengthStringSize match { - case Some(s: Symbol.Constant) => a.valueMap(s.getNodeId) match { - case Value.Integer(value) => value - case _ => throw InternalError("expected integer value") - } - case None => CppWriterState.defaultDefaultStringSize - } - } } object CppWriterState { - /** The default default string size */ - val defaultDefaultStringSize = 80 /** Construct a header string */ def headerString(s: String): String = { diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala index 20cbfdebe..aeffb5f9b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala @@ -288,18 +288,18 @@ trait CppWriterUtils extends LineUtils { def getBufferName(name: String) = s"__fprime_ac_${name}_buffer" /** Gets the size of a string type */ - def getStringSize(s: CppWriterState, t: Type.String): BigInt = + def getStringSize(s: CppWriterState, t: Type.String): String = t.size.map( node => { val _ @ Value.Integer(value) = s.a.valueMap(node.id).convertToType(Type.Integer).get - value + value.toString } - ).getOrElse(s.getFwDefaultStringSize) + ).getOrElse("FW_FIXED_LENGTH_STRING_SIZE") /** Write the size of a string type */ def writeStringSize(s: CppWriterState, t: Type.String): String = t.size.map(node => ValueCppWriter.write(s, s.a.valueMap(node.id))). - getOrElse(s.getFwDefaultStringSize.toString) + getOrElse("FW_FIXED_LENGTH_STRING_SIZE") /** Write a C++ expression for static serialized size */ def writeStaticSerializedSizeExpr(s: CppWriterState, t: Type, typeName: String): String = diff --git a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp index c42aea343..3c9d8e10e 100644 --- a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp @@ -31,7 +31,7 @@ class Basic : SERIALIZED_SIZE = sizeof(TU32) + sizeof(TF32) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + Fw::StringBase::STATIC_SERIALIZED_SIZE(2) }; @@ -190,7 +190,7 @@ class Basic : TU32 m_A; TF32 m_B; - char m___fprime_ac_C_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_C_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_C; char m___fprime_ac_D_buffer[Fw::StringBase::BUFFER_SIZE(2)]; Fw::ExternalString m_D; diff --git a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp index fac115005..8dcb93fe8 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp @@ -38,7 +38,7 @@ namespace M { sizeof(U64) + sizeof(U8) + sizeof(U8) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) }; public: @@ -287,7 +287,7 @@ namespace M { U64 m_mU64; U8 m_mU8; bool m_mBool; - char m___fprime_ac_mString_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_mString_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_mString; }; diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp index b347f6f6d..920a729b4 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp @@ -38,7 +38,7 @@ class String1 : //! The size of the array SIZE = 3, //! The string size of each element - ELEMENT_STRING_SIZE = 80, + ELEMENT_STRING_SIZE = FW_FIXED_LENGTH_STRING_SIZE, //! The buffer size of each element ELEMENT_BUFFER_SIZE = Fw::StringBase::BUFFER_SIZE(ELEMENT_STRING_SIZE), //! The serialized size of each element diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp index 082c6a3da..892755166 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp @@ -38,7 +38,7 @@ class String2 : //! The size of the array SIZE = 2, //! The string size of each element - ELEMENT_STRING_SIZE = 80, + ELEMENT_STRING_SIZE = FW_FIXED_LENGTH_STRING_SIZE, //! The buffer size of each element ELEMENT_BUFFER_SIZE = Fw::StringBase::BUFFER_SIZE(ELEMENT_STRING_SIZE), //! The serialized size of each element diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp index 3c3f45fd7..b86c14c9d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp @@ -157,7 +157,7 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -191,7 +191,7 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2596,7 +2596,7 @@ void ActiveAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2703,7 +2703,7 @@ void ActiveAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2810,7 +2810,7 @@ void ActiveAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2917,7 +2917,7 @@ void ActiveAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3722,7 +3722,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3795,7 +3795,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3868,7 +3868,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3941,7 +3941,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp index 51711e88a..cc4ae2066 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class ActiveAsyncProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveAsyncProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp index 44af48189..c4116777e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp @@ -2227,7 +2227,7 @@ void ActiveCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2334,7 +2334,7 @@ void ActiveCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2441,7 +2441,7 @@ void ActiveCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2548,7 +2548,7 @@ void ActiveCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4237,7 +4237,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4310,7 +4310,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4383,7 +4383,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4456,7 +4456,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp index 26c63b5ab..00488b7c4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp @@ -2149,7 +2149,7 @@ void ActiveEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2256,7 +2256,7 @@ void ActiveEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2363,7 +2363,7 @@ void ActiveEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2470,7 +2470,7 @@ void ActiveEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3181,7 +3181,7 @@ void ActiveEventsComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3899,7 +3899,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3972,7 +3972,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4045,7 +4045,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4118,7 +4118,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 ffdff8bdf..b32a7cc42 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 @@ -2379,7 +2379,7 @@ void ActiveExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2486,7 +2486,7 @@ void ActiveExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2593,7 +2593,7 @@ void ActiveExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2700,7 +2700,7 @@ void ActiveExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3556,7 +3556,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3629,7 +3629,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3702,7 +3702,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3775,7 +3775,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp index 4a621a575..64ddfc87b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2468,7 +2468,7 @@ void ActiveGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2575,7 +2575,7 @@ void ActiveGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2682,7 +2682,7 @@ void ActiveGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2789,7 +2789,7 @@ void ActiveGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3541,7 +3541,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3614,7 +3614,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3687,7 +3687,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3760,7 +3760,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp index 4c7fbfbc5..4f300d802 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp @@ -121,10 +121,10 @@ class ActiveGetProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveGetProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp index 28eed0705..0021156af 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2552,7 +2552,7 @@ void ActiveGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2659,7 +2659,7 @@ void ActiveGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2766,7 +2766,7 @@ void ActiveGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2873,7 +2873,7 @@ void ActiveGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3623,7 +3623,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3696,7 +3696,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3769,7 +3769,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3842,7 +3842,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp index b507bc445..ad72fb670 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class ActiveGuardedProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveGuardedProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp index 1b64705b9..71308cdeb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp @@ -1032,7 +1032,7 @@ void ActiveOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1139,7 +1139,7 @@ void ActiveOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1246,7 +1246,7 @@ void ActiveOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1358,7 +1358,7 @@ void ActiveOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1922,7 +1922,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -1995,7 +1995,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -2068,7 +2068,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -2141,7 +2141,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 be18cff87..50633c199 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 @@ -2383,7 +2383,7 @@ void ActiveParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2490,7 +2490,7 @@ void ActiveParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2597,7 +2597,7 @@ void ActiveParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2704,7 +2704,7 @@ void ActiveParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3477,7 +3477,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3550,7 +3550,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3623,7 +3623,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3696,7 +3696,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 6ea61b9f2..0941fe751 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 @@ -2979,7 +2979,7 @@ void ActiveSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3086,7 +3086,7 @@ void ActiveSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3193,7 +3193,7 @@ void ActiveSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3300,7 +3300,7 @@ void ActiveSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -5612,7 +5612,7 @@ void ActiveSerialComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -6227,7 +6227,7 @@ void ActiveSerialComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -7014,7 +7014,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7087,7 +7087,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7160,7 +7160,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7233,7 +7233,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp index c2d0be090..8d5800091 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2546,7 +2546,7 @@ void ActiveSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2653,7 +2653,7 @@ void ActiveSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2760,7 +2760,7 @@ void ActiveSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2867,7 +2867,7 @@ void ActiveSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3617,7 +3617,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3690,7 +3690,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3763,7 +3763,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3836,7 +3836,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp index 246f8c9d0..608418974 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class ActiveSyncProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + ActiveSyncProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp index 6b4e05fa2..be59294ef 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp @@ -2144,7 +2144,7 @@ void ActiveTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2251,7 +2251,7 @@ void ActiveTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2358,7 +2358,7 @@ void ActiveTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2465,7 +2465,7 @@ void ActiveTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3034,7 +3034,7 @@ void ActiveTelemetryComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -3582,7 +3582,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3655,7 +3655,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3728,7 +3728,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3801,7 +3801,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 184954e48..dcc9ddd79 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 @@ -193,7 +193,7 @@ namespace M { { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -227,7 +227,7 @@ namespace M { Fw::SerializeStatus ActiveTestComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -3153,7 +3153,7 @@ namespace M { ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3260,7 +3260,7 @@ namespace M { ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3367,7 +3367,7 @@ namespace M { ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3474,7 +3474,7 @@ namespace M { ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -5518,7 +5518,7 @@ namespace M { ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -6133,7 +6133,7 @@ namespace M { } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -6982,7 +6982,7 @@ namespace M { ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7055,7 +7055,7 @@ namespace M { ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7128,7 +7128,7 @@ namespace M { ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7201,7 +7201,7 @@ namespace M { ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 5e19e6706..63c7266b8 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 @@ -235,10 +235,10 @@ namespace M { static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + M::ActiveTest_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp index d41082e71..2b91d1fb0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp @@ -2231,7 +2231,7 @@ void PassiveEventsComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp index dd47b7dc1..350a5e5e1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp @@ -97,7 +97,7 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -131,7 +131,7 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp index 297e84878..18185fae1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp @@ -115,10 +115,10 @@ class PassiveGetProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveGetProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp index 8091f2699..8f6b49fdb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp @@ -97,7 +97,7 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -131,7 +131,7 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp index c2725089f..f67fb5fe9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp @@ -117,10 +117,10 @@ class PassiveGuardedProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveGuardedProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } 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 b43594dc2..5913b3bfe 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 @@ -3580,7 +3580,7 @@ void PassiveSerialComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4195,7 +4195,7 @@ void PassiveSerialComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp index 511273f5b..80dbb1690 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp @@ -97,7 +97,7 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -131,7 +131,7 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp index 791e8edbb..95eab45ce 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp @@ -117,10 +117,10 @@ class PassiveSyncProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveSyncProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp index 24c4d3b36..76d768860 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp @@ -2084,7 +2084,7 @@ void PassiveTelemetryComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) 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 3cce61c46..7e7d8768e 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 @@ -97,7 +97,7 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -131,7 +131,7 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -3826,7 +3826,7 @@ void PassiveTestComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4441,7 +4441,7 @@ void PassiveTestComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) 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 9c9d7d266..b8a6aa064 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 @@ -221,10 +221,10 @@ class PassiveTestComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + PassiveTest_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp index 6727fce2e..cc4189c8c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp @@ -157,7 +157,7 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -191,7 +191,7 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2596,7 +2596,7 @@ void QueuedAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2703,7 +2703,7 @@ void QueuedAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2810,7 +2810,7 @@ void QueuedAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2917,7 +2917,7 @@ void QueuedAsyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3722,7 +3722,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3795,7 +3795,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3868,7 +3868,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3941,7 +3941,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp index 980cd82ce..4e12cc814 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class QueuedAsyncProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedAsyncProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp index dc0d0aa47..d074c367c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp @@ -2227,7 +2227,7 @@ void QueuedCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2334,7 +2334,7 @@ void QueuedCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2441,7 +2441,7 @@ void QueuedCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2548,7 +2548,7 @@ void QueuedCommandsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4242,7 +4242,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4315,7 +4315,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4388,7 +4388,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4461,7 +4461,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp index a36fa0f84..68b52a529 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp @@ -2149,7 +2149,7 @@ void QueuedEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2256,7 +2256,7 @@ void QueuedEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2363,7 +2363,7 @@ void QueuedEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2470,7 +2470,7 @@ void QueuedEventsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3181,7 +3181,7 @@ void QueuedEventsComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3904,7 +3904,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3977,7 +3977,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4050,7 +4050,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -4123,7 +4123,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 99769f073..922951dde 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 @@ -2379,7 +2379,7 @@ void QueuedExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2486,7 +2486,7 @@ void QueuedExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2593,7 +2593,7 @@ void QueuedExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2700,7 +2700,7 @@ void QueuedExternalParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3561,7 +3561,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3634,7 +3634,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3707,7 +3707,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3780,7 +3780,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedExternalParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp index 52f34e799..2a60d9df6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2468,7 +2468,7 @@ void QueuedGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2575,7 +2575,7 @@ void QueuedGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2682,7 +2682,7 @@ void QueuedGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2789,7 +2789,7 @@ void QueuedGetProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3541,7 +3541,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3614,7 +3614,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3687,7 +3687,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3760,7 +3760,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp index 59f6d8786..5c4e1cb35 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp @@ -121,10 +121,10 @@ class QueuedGetProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedGetProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp index f59cd331c..00842f2d9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2552,7 +2552,7 @@ void QueuedGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2659,7 +2659,7 @@ void QueuedGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2766,7 +2766,7 @@ void QueuedGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2873,7 +2873,7 @@ void QueuedGuardedProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3623,7 +3623,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3696,7 +3696,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3769,7 +3769,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3842,7 +3842,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp index fd4cd55bd..7f303842e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class QueuedGuardedProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedGuardedProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp index 9c1c94dd8..100a45533 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp @@ -1032,7 +1032,7 @@ void QueuedOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1139,7 +1139,7 @@ void QueuedOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1246,7 +1246,7 @@ void QueuedOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1358,7 +1358,7 @@ void QueuedOverflowComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -1927,7 +1927,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -2000,7 +2000,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -2073,7 +2073,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -2146,7 +2146,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedOverflowComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 a24cd28b0..61dbc1095 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 @@ -2383,7 +2383,7 @@ void QueuedParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2490,7 +2490,7 @@ void QueuedParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2597,7 +2597,7 @@ void QueuedParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2704,7 +2704,7 @@ void QueuedParamsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3482,7 +3482,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3555,7 +3555,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3628,7 +3628,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3701,7 +3701,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 e958c9bd4..909272916 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 @@ -2979,7 +2979,7 @@ void QueuedSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3086,7 +3086,7 @@ void QueuedSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3193,7 +3193,7 @@ void QueuedSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3300,7 +3300,7 @@ void QueuedSerialComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -5612,7 +5612,7 @@ void QueuedSerialComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -6227,7 +6227,7 @@ void QueuedSerialComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -7019,7 +7019,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7092,7 +7092,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7165,7 +7165,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7238,7 +7238,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp index 98d01a205..1eca921a7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp @@ -155,7 +155,7 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -189,7 +189,7 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -2546,7 +2546,7 @@ void QueuedSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2653,7 +2653,7 @@ void QueuedSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2760,7 +2760,7 @@ void QueuedSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2867,7 +2867,7 @@ void QueuedSyncProductsComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3617,7 +3617,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3690,7 +3690,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3763,7 +3763,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3836,7 +3836,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp index b4fb808b8..f75838fed 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp @@ -123,10 +123,10 @@ class QueuedSyncProductsComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedSyncProducts_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp index bbfbe38f7..7e4a261a2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp @@ -2144,7 +2144,7 @@ void QueuedTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2251,7 +2251,7 @@ void QueuedTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2358,7 +2358,7 @@ void QueuedTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -2465,7 +2465,7 @@ void QueuedTelemetryComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3034,7 +3034,7 @@ void QueuedTelemetryComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -3587,7 +3587,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3660,7 +3660,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3733,7 +3733,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -3806,7 +3806,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 1205df60e..052e575a1 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 @@ -191,7 +191,7 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: { FW_ASSERT(array != nullptr); // Compute the size delta - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; FwSizeType sizeDelta = sizeof(FwDpIdType) + sizeof(FwSizeStoreType); @@ -225,7 +225,7 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: serializeRecord_StringRecord(const Fw::StringBase& elt) { - const FwSizeType stringSize = 80; + const FwSizeType stringSize = FW_FIXED_LENGTH_STRING_SIZE; const FwSizeType sizeDelta = sizeof(FwDpIdType) + elt.serializedTruncatedSize(stringSize); @@ -3151,7 +3151,7 @@ void QueuedTestComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3258,7 +3258,7 @@ void QueuedTestComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3365,7 +3365,7 @@ void QueuedTestComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3472,7 +3472,7 @@ void QueuedTestComponentBase :: ); // Serialize argument str1 - _status = str1.serializeTo(msg, 80); + _status = str1.serializeTo(msg, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -5516,7 +5516,7 @@ void QueuedTestComponentBase :: ); #endif - _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, 80)); + _status = str1.serializeTo(_logBuff, FW_MIN(FW_LOG_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -6131,7 +6131,7 @@ void QueuedTestComponentBase :: } Fw::TlmBuffer _tlmBuff; - Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, 80)); + Fw::SerializeStatus _stat = arg.serializeTo(_tlmBuff, FW_MIN(FW_TLM_STRING_MAX_SIZE, FW_FIXED_LENGTH_STRING_SIZE)); FW_ASSERT( _stat == Fw::FW_SERIALIZE_OK, static_cast(_stat) @@ -6985,7 +6985,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7058,7 +7058,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7131,7 +7131,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( @@ -7204,7 +7204,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: ); // Deserialize argument str1 - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _deserStatus = _msg.deserializeTo(str1); FW_ASSERT( 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 5fd64b1b8..4950d45c6 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 @@ -233,10 +233,10 @@ class QueuedTestComponentBase : static constexpr FwSizeType SIZE_OF_DataRecord_RECORD = sizeof(FwDpIdType) + QueuedTest_Data::SERIALIZED_SIZE; static constexpr FwSizeType SIZE_OF_StringArrayRecord_RECORD(FwSizeType arraySize) { - return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); } static constexpr FwSizeType SIZE_OF_StringRecord_RECORD = - sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + sizeof(FwDpIdType) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); static constexpr FwSizeType SIZE_OF_U32ArrayRecord_RECORD(FwSizeType arraySize) { return sizeof(FwDpIdType) + sizeof(FwSizeStoreType) + arraySize * sizeof(U32); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp index 1bdaf2a68..876962c96 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp @@ -27,7 +27,7 @@ class S : //! The size of the serial representation SERIALIZED_SIZE = sizeof(U32) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) }; public: @@ -156,7 +156,7 @@ class S : // ---------------------------------------------------------------------- U32 m_x; - char m___fprime_ac_y_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_y_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_y; }; diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.cpp index c8cffe5b7..dee3e1e81 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.cpp @@ -25,7 +25,7 @@ namespace FppTest { BYTE size_of_FppTest_SmHarness_TestEnum[FppTest::SmHarness::TestEnum::SERIALIZED_SIZE]; BYTE size_of_FppTest_SmHarness_TestStruct[FppTest::SmHarness::TestStruct::SERIALIZED_SIZE]; BYTE size_of_U32[sizeof(U32)]; - BYTE size_of_string[Fw::StringBase::STATIC_SERIALIZED_SIZE(80)]; + BYTE size_of_string[Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; }; // The serialized size @@ -1247,7 +1247,7 @@ namespace FppTest { // Serialize the message type, port number, state ID, and signal this->sendSignalStart(SmId::smStateBasicGuardString, static_cast(FppTest_SmState_BasicGuardString::Signal::s), buffer); // Serialize the signal data - const Fw::SerializeStatus status = value.serializeTo(buffer, 80); + const Fw::SerializeStatus status = value.serializeTo(buffer, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); // Send the message and handle overflow this->smStateBasicGuardString_sendSignalFinish(buffer); @@ -1345,7 +1345,7 @@ namespace FppTest { // Serialize the message type, port number, state ID, and signal this->sendSignalStart(SmId::smStateBasicString, static_cast(FppTest_SmState_BasicString::Signal::s), buffer); // Serialize the signal data - const Fw::SerializeStatus status = value.serializeTo(buffer, 80); + const Fw::SerializeStatus status = value.serializeTo(buffer, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); // Send the message and handle overflow this->smStateBasicString_sendSignalFinish(buffer); @@ -2212,7 +2212,7 @@ namespace FppTest { switch (signal) { case FppTest_SmState_BasicGuardString::Signal::s: { // Deserialize the data - char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString value(__fprime_ac_value_buffer, sizeof __fprime_ac_value_buffer); const Fw::SerializeStatus status = buffer.deserializeTo(value); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); @@ -2405,7 +2405,7 @@ namespace FppTest { switch (signal) { case FppTest_SmState_BasicString::Signal::s: { // Deserialize the data - char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString value(__fprime_ac_value_buffer, sizeof __fprime_ac_value_buffer); const Fw::SerializeStatus status = buffer.deserializeTo(value); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.cpp index 4433d479c..387ce971c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.cpp @@ -25,7 +25,7 @@ namespace FppTest { BYTE size_of_FppTest_SmHarness_TestEnum[FppTest::SmHarness::TestEnum::SERIALIZED_SIZE]; BYTE size_of_FppTest_SmHarness_TestStruct[FppTest::SmHarness::TestStruct::SERIALIZED_SIZE]; BYTE size_of_U32[sizeof(U32)]; - BYTE size_of_string[Fw::StringBase::STATIC_SERIALIZED_SIZE(80)]; + BYTE size_of_string[Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; }; // The serialized size @@ -1311,7 +1311,7 @@ namespace FppTest { // Serialize the message type, port number, state ID, and signal this->sendSignalStart(SmId::smStateBasicGuardString, static_cast(FppTest_SmState_BasicGuardString::Signal::s), buffer); // Serialize the signal data - const Fw::SerializeStatus status = value.serializeTo(buffer, 80); + const Fw::SerializeStatus status = value.serializeTo(buffer, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); // Send the message and handle overflow this->smStateBasicGuardString_sendSignalFinish(buffer); @@ -1409,7 +1409,7 @@ namespace FppTest { // Serialize the message type, port number, state ID, and signal this->sendSignalStart(SmId::smStateBasicString, static_cast(FppTest_SmState_BasicString::Signal::s), buffer); // Serialize the signal data - const Fw::SerializeStatus status = value.serializeTo(buffer, 80); + const Fw::SerializeStatus status = value.serializeTo(buffer, FW_FIXED_LENGTH_STRING_SIZE); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); // Send the message and handle overflow this->smStateBasicString_sendSignalFinish(buffer); @@ -2319,7 +2319,7 @@ namespace FppTest { switch (signal) { case FppTest_SmState_BasicGuardString::Signal::s: { // Deserialize the data - char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString value(__fprime_ac_value_buffer, sizeof __fprime_ac_value_buffer); const Fw::SerializeStatus status = buffer.deserializeTo(value); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); @@ -2512,7 +2512,7 @@ namespace FppTest { switch (signal) { case FppTest_SmState_BasicString::Signal::s: { // Deserialize the data - char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_value_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString value(__fprime_ac_value_buffer, sizeof __fprime_ac_value_buffer); const Fw::SerializeStatus status = buffer.deserializeTo(value); FW_ASSERT(status == Fw::FW_SERIALIZE_OK, static_cast(status)); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp index e84f537fa..349d8fbbd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp @@ -125,7 +125,7 @@ namespace Ports { return _status; } - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1(__fprime_ac_str1_buffer, sizeof __fprime_ac_str1_buffer); _status = _buffer.deserializeTo(str1); if (_status != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp index 2909120ab..71e343116 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp @@ -40,7 +40,7 @@ namespace Ports { sizeof(U32) + sizeof(F32) + sizeof(U8) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + E::SERIALIZED_SIZE + A::SERIALIZED_SIZE + S::SERIALIZED_SIZE diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp index 02e539e84..f8855db22 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp @@ -39,7 +39,7 @@ namespace Ports { sizeof(U32) + sizeof(F32) + sizeof(U8) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + E::SERIALIZED_SIZE + A::SERIALIZED_SIZE + S::SERIALIZED_SIZE diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp index aea7e8012..432289397 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveAsyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveAsyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp index 08ed57944..1615918bf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class ActiveCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class ActiveCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp index fc7c0d849..5485e7e4a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class ActiveEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class ActiveEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp index cf6e9d85c..504821323 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveExternalParamsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp index 12a0f873a..0c0b92c8c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp index fbf6fe7c8..1d4b538e0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp index 3649c185e..a72a4e39b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class ActiveParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class ActiveParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp index 676481bdf..4b792a29f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp index 6fdb664e4..3c0210a8b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class ActiveSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class ActiveSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp index 17f9fba80..b537d6f8e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp @@ -184,7 +184,7 @@ class ActiveTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class ActiveTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp index 6b53d131e..50b114460 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp @@ -188,7 +188,7 @@ namespace M { U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -209,7 +209,7 @@ namespace M { U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp index 3ead498e0..7aff4b5e3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class PassiveCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class PassiveCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp index f58f34b7a..c61f0c076 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class PassiveEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class PassiveEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp index e6d338120..07f01b770 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveExternalParamsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class PassiveExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class PassiveExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp index 956c0bed7..30e2bfefe 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class PassiveGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class PassiveGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp index 3c41d77cf..0344ba2cd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class PassiveGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class PassiveGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp index 019f7ff90..47b0ee832 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class PassiveParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class PassiveParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp index 4b87505b8..f3a2e28f3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp @@ -185,7 +185,7 @@ class PassiveSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class PassiveSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp index 71c2b3816..c4cf0e02c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class PassiveSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class PassiveSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp index 8f07de744..470fa17ee 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp @@ -184,7 +184,7 @@ class PassiveTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class PassiveTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp index b2240c6eb..d515bb1b6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp @@ -186,7 +186,7 @@ class PassiveTestTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -207,7 +207,7 @@ class PassiveTestTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp index 65c8b9ae7..ba63554f4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedAsyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedAsyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp index 74dfea65c..2baae4b98 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class QueuedCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class QueuedCommandsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp index 7f46331ae..d79c0b93e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class QueuedEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class QueuedEventsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp index 74c786a67..f20fccbad 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedExternalParamsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedExternalParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp index c5321067f..a282c1e5e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedGetProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp index b040e00b5..122dc0301 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedGuardedProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp index cdb391bce..d61e29205 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp @@ -184,7 +184,7 @@ class QueuedParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class QueuedParamsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp index ce348e5f1..5d7ff84a8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedSerialTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp index 2bc13d88a..cb66fa344 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp @@ -185,7 +185,7 @@ class QueuedSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -206,7 +206,7 @@ class QueuedSyncProductsTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp index 9b9da83ef..8bccc719e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp @@ -184,7 +184,7 @@ class QueuedTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -205,7 +205,7 @@ class QueuedTelemetryTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp index 91829d028..18e0fd394 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp @@ -186,7 +186,7 @@ class QueuedTestTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str1; E e; A a; @@ -207,7 +207,7 @@ class QueuedTestTesterBase : U32 u32; F32 f32; bool b; - char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str2_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str2; E e; A a; diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp index e7f9f803a..4679c1a5b 100644 --- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp @@ -10,7 +10,7 @@ #include "Fw/Types/BasicTypes.hpp" //! Constant a -enum FppConstant_a { +enum { a = 0 }; @@ -24,14 +24,14 @@ extern const bool c; extern const char *const d; //! Constant e -enum FppConstant_e { +enum { e = 3 }; namespace M { //! Constant a - enum FppConstant_a { + enum { a = 0 }; @@ -45,14 +45,14 @@ namespace M { extern const char *const d; //! Constant e - enum FppConstant_e { + enum { e = 3 }; } //! Constant a -enum FppConstant_C_a { +enum { C_a = 0 }; @@ -66,12 +66,12 @@ extern const bool C_c; extern const char *const C_d; //! Constant e -enum FppConstant_C_e { +enum { C_e = 3 }; //! Constant g -enum FppConstant_C_g { +enum { C_g = 1 }; @@ -82,7 +82,7 @@ extern const F64 C_j; extern const F64 C_k; //! Constant a -enum FppConstant_SM_a { +enum { SM_a = 0 }; diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp index 0b5052f10..29c55ebd0 100644 --- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp @@ -10,7 +10,7 @@ #include "Fw/Types/BasicTypes.hpp" //! Constant a -enum FppConstant_a { +enum { a = 0 }; @@ -24,14 +24,14 @@ extern const bool c; extern const char *const d; //! Constant e -enum FppConstant_e { +enum { e = 3 }; namespace M { //! Constant a - enum FppConstant_a { + enum { a = 0 }; @@ -45,14 +45,14 @@ namespace M { extern const char *const d; //! Constant e - enum FppConstant_e { + enum { e = 3 }; } //! Constant a -enum FppConstant_C_a { +enum { C_a = 0 }; @@ -66,12 +66,12 @@ extern const bool C_c; extern const char *const C_d; //! Constant e -enum FppConstant_C_e { +enum { C_e = 3 }; //! Constant g -enum FppConstant_C_g { +enum { C_g = 1 }; @@ -82,7 +82,7 @@ extern const F64 C_j; extern const F64 C_k; //! Constant a -enum FppConstant_SM_a { +enum { SM_a = 0 }; diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp index 7fb69d69b..5e3077a42 100644 --- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp @@ -10,7 +10,7 @@ #include "Fw/Types/BasicTypes.hpp" //! Constant a -enum FppConstant_a { +enum { a = 0 }; @@ -24,14 +24,14 @@ extern const bool c; extern const char *const d; //! Constant e -enum FppConstant_e { +enum { e = 3 }; namespace M { //! Constant a - enum FppConstant_a { + enum { a = 0 }; @@ -45,14 +45,14 @@ namespace M { extern const char *const d; //! Constant e - enum FppConstant_e { + enum { e = 3 }; } //! Constant a -enum FppConstant_C_a { +enum { C_a = 0 }; @@ -66,12 +66,12 @@ extern const bool C_c; extern const char *const C_d; //! Constant e -enum FppConstant_C_e { +enum { C_e = 3 }; //! Constant g -enum FppConstant_C_g { +enum { C_g = 1 }; @@ -82,7 +82,7 @@ extern const F64 C_j; extern const F64 C_k; //! Constant a -enum FppConstant_SM_a { +enum { SM_a = 0 }; diff --git a/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp index e7f9f803a..4679c1a5b 100644 --- a/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp @@ -10,7 +10,7 @@ #include "Fw/Types/BasicTypes.hpp" //! Constant a -enum FppConstant_a { +enum { a = 0 }; @@ -24,14 +24,14 @@ extern const bool c; extern const char *const d; //! Constant e -enum FppConstant_e { +enum { e = 3 }; namespace M { //! Constant a - enum FppConstant_a { + enum { a = 0 }; @@ -45,14 +45,14 @@ namespace M { extern const char *const d; //! Constant e - enum FppConstant_e { + enum { e = 3 }; } //! Constant a -enum FppConstant_C_a { +enum { C_a = 0 }; @@ -66,12 +66,12 @@ extern const bool C_c; extern const char *const C_d; //! Constant e -enum FppConstant_C_e { +enum { C_e = 3 }; //! Constant g -enum FppConstant_C_g { +enum { C_g = 1 }; @@ -82,7 +82,7 @@ extern const F64 C_j; extern const F64 C_k; //! Constant a -enum FppConstant_SM_a { +enum { SM_a = 0 }; diff --git a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConstants.fpp b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConstants.fpp index d304aec77..ab2b243d4 100644 --- a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConstants.fpp +++ b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConstants.fpp @@ -33,7 +33,7 @@ constant FW_LOG_BUFFER_MAX_SIZE = FW_COM_BUFFER_MAX_SIZE - SIZE_OF_FwEventIdType @ Specifies the maximum size of a string in a log event @ Note: This constant truncates file names in assertion failure event reports -constant FW_LOG_STRING_MAX_SIZE = 200 +constant FW_LOG_STRING_MAX_SIZE = 80 @ Specifies the size of the buffer that contains the serialized telemetry value constant FW_TLM_BUFFER_MAX_SIZE = FW_COM_BUFFER_MAX_SIZE - SIZE_OF_FwChanIdType - SIZE_OF_FwPacketDescriptorType @@ -54,14 +54,14 @@ constant FW_PARAM_STRING_MAX_SIZE = 40 constant FW_FILE_BUFFER_MAX_SIZE = FW_COM_BUFFER_MAX_SIZE @ Specifies the maximum size of a string in an interface call -constant FW_INTERNAL_INTERFACE_STRING_MAX_SIZE = 256 +constant FW_INTERNAL_INTERFACE_STRING_MAX_SIZE = 80 @ Defines the size of the text log string buffer. Should be large enough for format string and arguments -constant FW_LOG_TEXT_BUFFER_SIZE = 256 +constant FW_LOG_TEXT_BUFFER_SIZE = 80 @ Configuration for Fw::String @ Note: FPrimeBasicTypes.hpp needs to be updated to sync enum -constant FW_FIXED_LENGTH_STRING_SIZE = 256 +constant FW_FIXED_LENGTH_STRING_SIZE = 80 # --------------------------------------------------------------------- # Other constants @@ -83,4 +83,4 @@ constant FW_CONTEXT_DONT_CARE = 0xFF constant FW_SERIALIZE_TRUE_VALUE = 0xFF @ Value encoded during serialization for boolean false -constant FW_SERIALIZE_FALSE_VALUE = 0x00 \ No newline at end of file +constant FW_SERIALIZE_FALSE_VALUE = 0x00 diff --git a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp index 02555fbda..4f11f493d 100644 --- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp @@ -102,14 +102,14 @@ Fw::SerializeStatus InputStringPort :: FW_ASSERT(this->m_comp != nullptr); FW_ASSERT(this->m_func != nullptr); - char __fprime_ac_str80_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str80_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str80(__fprime_ac_str80_buffer, sizeof __fprime_ac_str80_buffer); _status = _buffer.deserializeTo(str80); if (_status != Fw::FW_SERIALIZE_OK) { return _status; } - char __fprime_ac_str80Ref_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char __fprime_ac_str80Ref_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString str80Ref(__fprime_ac_str80Ref_buffer, sizeof __fprime_ac_str80Ref_buffer); _status = _buffer.deserializeTo(str80Ref); if (_status != Fw::FW_SERIALIZE_OK) { diff --git a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp index 2bb830289..5bb690504 100644 --- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp @@ -32,8 +32,8 @@ class InputStringPort : enum { //! The size of the serial representations of the port arguments SERIALIZED_SIZE = - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + Fw::StringBase::STATIC_SERIALIZED_SIZE(100) + Fw::StringBase::STATIC_SERIALIZED_SIZE(100) }; diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp index 911abb520..7539276f2 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp @@ -47,7 +47,7 @@ class Primitive : sizeof(U64) + sizeof(U8) + sizeof(U8) + - Fw::StringBase::STATIC_SERIALIZED_SIZE(80) + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) }; public: @@ -318,7 +318,7 @@ class Primitive : U64 m_mU64; U8 m_mU8; bool m_m_bool; - char m___fprime_ac_m_string_buffer[Fw::StringBase::BUFFER_SIZE(80)]; + char m___fprime_ac_m_string_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_m_string; }; diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp index e5fc47180..507972383 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp @@ -34,7 +34,7 @@ class StringArray : enum { //! The size of the serial representation SERIALIZED_SIZE = - Fw::StringBase::STATIC_SERIALIZED_SIZE(60) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + Fw::StringBase::STATIC_SERIALIZED_SIZE(40) * 16 }; @@ -175,7 +175,7 @@ class StringArray : // Member variables // ---------------------------------------------------------------------- - char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(60)]; + char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_s1; char m___fprime_ac_s2_buffer[16][Fw::StringBase::BUFFER_SIZE(40)]; Fw::ExternalString m_s2[16]; diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp index 5c449f4a9..9be8fcf2f 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp @@ -25,7 +25,7 @@ class String : enum { //! The size of the serial representation SERIALIZED_SIZE = - Fw::StringBase::STATIC_SERIALIZED_SIZE(60) + + Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE) + Fw::StringBase::STATIC_SERIALIZED_SIZE(40) }; @@ -160,7 +160,7 @@ class String : // Member variables // ---------------------------------------------------------------------- - char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(60)]; + char m___fprime_ac_s1_buffer[Fw::StringBase::BUFFER_SIZE(FW_FIXED_LENGTH_STRING_SIZE)]; Fw::ExternalString m_s1; char m___fprime_ac_s2_buffer[Fw::StringBase::BUFFER_SIZE(40)]; Fw::ExternalString m_s2; diff --git a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P1TlmPacketsAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P1TlmPacketsAc.ref.cpp index e7434448e..cb8ca50ab 100644 --- a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P1TlmPacketsAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P1TlmPacketsAc.ref.cpp @@ -63,7 +63,7 @@ namespace M { struct ChannelSizes { //! The serialized size of channel M.c1.T1 - static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); //! The serialized size of channel M.c1.T2 static constexpr FwSizeType M_c1_T2 = sizeof(U32); diff --git a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P2TlmPacketsAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P2TlmPacketsAc.ref.cpp index 2eff2c1c1..a218e30f2 100644 --- a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P2TlmPacketsAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P2TlmPacketsAc.ref.cpp @@ -63,7 +63,7 @@ namespace M { struct ChannelSizes { //! The serialized size of channel M.c1.T1 - static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); //! The serialized size of channel M.c1.T2 static constexpr FwSizeType M_c1_T2 = sizeof(U32); diff --git a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P3TlmPacketsAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P3TlmPacketsAc.ref.cpp index 1b1a91887..55ddadc42 100644 --- a/compiler/tools/fpp-to-cpp/test/top/OneInstance_P3TlmPacketsAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/top/OneInstance_P3TlmPacketsAc.ref.cpp @@ -46,7 +46,7 @@ namespace M { struct ChannelSizes { //! The serialized size of channel M.c1.T1 - static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); //! The serialized size of channel M.c1.T2 static constexpr FwSizeType M_c1_T2 = sizeof(U32); diff --git a/compiler/tools/fpp-to-cpp/test/top/TwoInstances_P1TlmPacketsAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/TwoInstances_P1TlmPacketsAc.ref.cpp index 4e8a5ec2b..b5bfcbff0 100644 --- a/compiler/tools/fpp-to-cpp/test/top/TwoInstances_P1TlmPacketsAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/top/TwoInstances_P1TlmPacketsAc.ref.cpp @@ -81,10 +81,10 @@ namespace N { struct ChannelSizes { //! The serialized size of channel M.c2.T1 - static constexpr FwSizeType M_c2_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType M_c2_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); //! The serialized size of channel M.c1.T1 - static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(80); + static constexpr FwSizeType M_c1_T1 = Fw::StringBase::STATIC_SERIALIZED_SIZE(FW_FIXED_LENGTH_STRING_SIZE); //! The serialized size of channel M.c1.T2 static constexpr FwSizeType M_c1_T2 = sizeof(U32); From 503fbd4a9cbb58122ff50eb618c93d05405d73f7 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 29 Jan 2026 11:28:11 -0800 Subject: [PATCH 4/4] Refactor C++ code gen --- .../ComponentInternalStateMachines.scala | 2 +- .../main/scala/codegen/CppWriter/CppWriterUtils.scala | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala index 6bc479736..d52127a07 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalStateMachines.scala @@ -643,7 +643,7 @@ case class ComponentInternalStateMachines( s.a.typeMap(tn.id).getUnderlyingType match { case t: Type.String => ( ts + Type.String(None), - max(maxStringSize, getStringSize(s, t)) + max(maxStringSize, writeStringSize(s, t)) ) case t => (ts + t, maxStringSize) } diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala index aeffb5f9b..13f623909 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala @@ -287,15 +287,6 @@ trait CppWriterUtils extends LineUtils { /** Get a buffer name */ def getBufferName(name: String) = s"__fprime_ac_${name}_buffer" - /** Gets the size of a string type */ - def getStringSize(s: CppWriterState, t: Type.String): String = - t.size.map( - node => { - val _ @ Value.Integer(value) = s.a.valueMap(node.id).convertToType(Type.Integer).get - value.toString - } - ).getOrElse("FW_FIXED_LENGTH_STRING_SIZE") - /** Write the size of a string type */ def writeStringSize(s: CppWriterState, t: Type.String): String = t.size.map(node => ValueCppWriter.write(s, s.a.valueMap(node.id))).