nasa/fprime
1
0
Fork 0
mirror of https://github.com/nasa/fprime.git synced 2025-12-10 00:44:37 -06:00
Code Issues Packages Projects Releases 34 Wiki Activity

Update FPP to v3.0.0a3 (#3393)

Browse Source 
* Revise String.hpp

Remove explicit keyword

* Revise FppTest

Update FPP version
Re-enable commented-out ports

* Revise ActiveTest

* Revise FppTest for components

* Revise FppTest tests for components

* Revise FppTest for components

* Revise FppTest

* Revise FppTest

* Revise FppTest

* Fix warnings on fprime dev machine

* Update fpp version

* Remove external keyword from constructors
This commit is contained in:
Rob Bocchino 2025-03-26 14:07:42 -07:00 committed by GitHub
parent 5287d2f584
commit abeb39bdb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 392 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FppTest/component/active/ActiveTest.cpp
View File

@ -82,6 +82,22 @@
);
}
Fw::String ActiveTest ::stringReturnGuarded_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
Fw::String ActiveTest ::stringReturnSync_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
void ActiveTest ::
structArgsAsync_handler(
const FwIndexType portNum,
@ -91,6 +107,7 @@
{
this->structArgsOut_out(portNum, s, sRef);
}
void ActiveTest ::
stringArgsAsync_handler(
const FwIndexType portNum,
@ -149,16 +166,6 @@
return this->arrayReturnOut_out(portNum, a, aRef);
}
void ActiveTest ::
cmdOut_handler(
FwIndexType portNum,
FwOpcodeType opCode,
U32 cmdSeq,
Fw::CmdArgBuffer& args
)
{
}
void ActiveTest ::
enumArgsGuarded_handler(
const FwIndexType portNum,

130
FppTest/component/active/ActiveTest.hpp
View File

@ -40,103 +40,95 @@ class ActiveTest :
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayArgsGuarded
void arrayArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayArgsSync
void arrayArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnGuarded
FormalParamArray arrayReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnSync
FormalParamArray arrayReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
//! Handler implementation for cmdOut
void cmdOut_handler(
FwIndexType portNum, //!< The port number
FwOpcodeType opCode, //!< Command Op Code
U32 cmdSeq, //!< Command Sequence
Fw::CmdArgBuffer& args //!< Buffer containing arguments
);
) override;
//! Handler implementation for enumArgsAsync
void enumArgsAsync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumArgsGuarded
void enumArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumArgsSync
void enumArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnGuarded
FormalParamEnum enumReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnSync
FormalParamEnum enumReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for noArgsAsync
void noArgsAsync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsGuarded
void noArgsGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnGuarded
bool noArgsReturnGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnSync
bool noArgsReturnSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsSync
void noArgsSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for primitiveArgsAsync
void primitiveArgsAsync_handler(
@ -147,7 +139,7 @@ class ActiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveArgsGuarded
void primitiveArgsGuarded_handler(
@ -158,7 +150,7 @@ class ActiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveArgsSync
void primitiveArgsSync_handler(
@ -169,7 +161,7 @@ class ActiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnGuarded
U32 primitiveReturnGuarded_handler(
@ -180,7 +172,7 @@ class ActiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnSync
U32 primitiveReturnSync_handler(
@ -191,7 +183,7 @@ class ActiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for stringArgsAsync
void stringArgsAsync_handler(
@ -200,7 +192,7 @@ class ActiveTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringArgsGuarded
void stringArgsGuarded_handler(
@ -209,7 +201,7 @@ class ActiveTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringArgsSync
void stringArgsSync_handler(
@ -218,49 +210,63 @@ class ActiveTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for structArgsAsync
void structArgsAsync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structArgsGuarded
void structArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for stringReturnGuarded
Fw::String stringReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for stringReturnSync
Fw::String stringReturnSync_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for structArgsSync
void structArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnGuarded
FormalParamStruct structReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnSync
FormalParamStruct structReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for enumArgsOverflow
void enumArgsHook_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
PRIVATE:
@ -272,37 +278,37 @@ class ActiveTest :
void serialAsync_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncAssert
void serialAsyncAssert_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncBlockPriority
void serialAsyncBlockPriority_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncDropPriority
void serialAsyncDropPriority_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialGuarded
void serialGuarded_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialSync
void serialSync_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
PRIVATE:
@ -314,7 +320,7 @@ class ActiveTest :
void CMD_NO_ARGS_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq //!< The command sequence number
);
) override;
//! Handler implementation for command CMD_PRIMITIVE
void CMD_PRIMITIVE_cmdHandler(
@ -326,7 +332,7 @@ class ActiveTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for command CMD_STRINGS
void CMD_STRINGS_cmdHandler(
@ -334,34 +340,34 @@ class ActiveTest :
U32 cmdSeq, //!< The command sequence number
const Fw::CmdStringArg& str1, //!< A string
const Fw::CmdStringArg& str2 //!< Another string
);
) override;
//! Handler implementation for command CMD_ENUM
void CMD_ENUM_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamEnum en //!< An enum
);
) override;
//! Handler implementation for command CMD_ARRAY
void CMD_ARRAY_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamArray arr //!< An array
);
) override;
//! Handler implementation for command CMD_STRUCT
void CMD_STRUCT_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamStruct str //!< A struct
);
) override;
//! Handler implementation for command CMD_ASYNC_NO_ARGS
void CMD_ASYNC_NO_ARGS_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq //!< The command sequence number
);
) override;
//! Handler implementation for command CMD_ASYNC_PRIMITIVE
void CMD_ASYNC_PRIMITIVE_cmdHandler(
@ -373,7 +379,7 @@ class ActiveTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for command CMD_ASYNC_STRINGS
void CMD_ASYNC_STRINGS_cmdHandler(
@ -381,28 +387,28 @@ class ActiveTest :
U32 cmdSeq, //!< The command sequence number
const Fw::CmdStringArg& str1, //!< A string
const Fw::CmdStringArg& str2 //!< Another string
);
) override;
//! Handler implementation for command CMD_ASYNC_ENUM
void CMD_ASYNC_ENUM_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamEnum en //!< An enum
);
) override;
//! Handler implementation for command CMD_ASYNC_ARRAY
void CMD_ASYNC_ARRAY_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamArray arr //!< An array
);
) override;
//! Handler implementation for command CMD_ASYNC_STRUCT
void CMD_ASYNC_STRUCT_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamStruct str //!< A struct
);
) override;
PRIVATE:
@ -413,15 +419,15 @@ class ActiveTest :
//! Handler implementation for internalArray
void internalArray_internalInterfaceHandler(
const FormalParamArray& arr //!< An array
);
) override;
//! Handler implementation for internalEnum
void internalEnum_internalInterfaceHandler(
const FormalParamEnum& en //!< An enum
);
) override;
//! Handler implementation for internalNoArgs
void internalNoArgs_internalInterfaceHandler();
void internalNoArgs_internalInterfaceHandler() override;
//! Handler implementation for internalPrimitive
void internalPrimitive_internalInterfaceHandler(
@ -431,18 +437,18 @@ class ActiveTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for internalString
void internalString_internalInterfaceHandler(
const Fw::InternalInterfaceString& str1, //!< A string
const Fw::InternalInterfaceString& str2 //!< Another string
);
) override;
//! Handler implementation for internalStruct
void internalStruct_internalInterfaceHandler(
const FormalParamStruct& str //!< A struct
);
) override;
PRIVATE:
@ -455,7 +461,7 @@ class ActiveTest :
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
public:

14
FppTest/component/active/port_types.fpp
View File

@ -50,15 +50,11 @@ port PrimitiveReturn(
ref bRef: bool
) -> U32
# Commented out because of bug in Python component autocoder
# Will be tested with the FPP component autocoder
# @ A port returning a string type
# port StringReturn(
# str80: string @< A string of size 80
# ref str80Ref: string
# str100: string size 100 @< A string of size 100
# ref str100Ref: string size 100
# ) -> string
@ A port returning a string type
port StringReturn(
str: string @< A string
ref strRef: string @< A string ref
) -> string
@ A port returning an enum type
port EnumReturn(

20
FppTest/component/active/test/ut/Tester.hpp
View File

@ -105,7 +105,7 @@ class Tester : public ActiveTestGTestBase {
FormalParamEnum& enRef /*!<
An enum ref
*/
) final;
) final;
//! Handler for from_enumReturnOut
//!
@ -118,6 +118,23 @@ class Tester : public ActiveTestGTestBase {
*/
) final;
//! Handler for from_stringArgsOut
//!
void from_stringArgsOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str80,
Fw::StringBase &str80Ref,
const Fw::StringBase &str100,
Fw::StringBase &str100Ref) final;
//! Handler for from_stringReturnOut
//!
Fw::String from_stringReturnOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str,
Fw::StringBase &strRef
) final;
//! Handler for from_noArgsOut
//!
void from_noArgsOut_handler(const FwIndexType portNum /*!< The port number*/
@ -259,6 +276,7 @@ class Tester : public ActiveTestGTestBase {
FppTest::Types::EnumType enumReturnVal;
FppTest::Types::ArrayType arrayReturnVal;
FppTest::Types::StructType structReturnVal;
FppTest::Types::StringType stringReturnVal;
// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];

6
FppTest/component/include/typed_ports.fppi
View File

@ -54,9 +54,9 @@ sync input port primitiveReturnSync: PrimitiveReturn
guarded input port primitiveReturnGuarded: PrimitiveReturn
# sync input port stringReturnSync: StringReturn
sync input port stringReturnSync: StringReturn
# guarded input port stringReturnGuarded: StringReturn
guarded input port stringReturnGuarded: StringReturn
sync input port enumReturnSync: EnumReturn
@ -78,7 +78,7 @@ output port noArgsReturnOut: NoArgsReturn
output port primitiveReturnOut: PrimitiveReturn
# output port stringReturnOut: StringReturn
output port stringReturnOut: StringReturn
output port enumReturnOut: EnumReturn

26
FppTest/component/passive/PassiveTest.cpp
View File

@ -71,16 +71,6 @@
return this->arrayReturnOut_out(portNum, a, aRef);
}
void PassiveTest ::
cmdOut_handler(
FwIndexType portNum,
FwOpcodeType opCode,
U32 cmdSeq,
Fw::CmdArgBuffer& args
)
{
}
void PassiveTest ::
enumArgsGuarded_handler(
const FwIndexType portNum,
@ -121,6 +111,22 @@
return this->enumReturnOut_out(portNum, en, enRef);
}
Fw::String PassiveTest ::stringReturnGuarded_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
Fw::String PassiveTest ::stringReturnSync_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
void PassiveTest ::
noArgsGuarded_handler(
const FwIndexType portNum

83
FppTest/component/passive/PassiveTest.hpp
View File

@ -40,84 +40,91 @@ class PassiveTest :
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayArgsSync
void arrayArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnGuarded
FormalParamArray arrayReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnSync
FormalParamArray arrayReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
//! Handler implementation for cmdOut
void cmdOut_handler(
FwIndexType portNum, //!< The port number
FwOpcodeType opCode, //!< Command Op Code
U32 cmdSeq, //!< Command Sequence
Fw::CmdArgBuffer& args //!< Buffer containing arguments
);
) override;
//! Handler implementation for enumArgsGuarded
void enumArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumArgsSync
void enumArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnGuarded
FormalParamEnum enumReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnSync
FormalParamEnum enumReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for stringReturnGuarded
Fw::String stringReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for stringReturnSync
Fw::String stringReturnSync_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for noArgsGuarded
void noArgsGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnGuarded
bool noArgsReturnGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnSync
bool noArgsReturnSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsSync
void noArgsSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for primitiveArgsGuarded
void primitiveArgsGuarded_handler(
@ -128,7 +135,7 @@ class PassiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveArgsSync
void primitiveArgsSync_handler(
@ -139,7 +146,7 @@ class PassiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnGuarded
U32 primitiveReturnGuarded_handler(
@ -150,7 +157,7 @@ class PassiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnSync
U32 primitiveReturnSync_handler(
@ -161,7 +168,7 @@ class PassiveTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for stringArgsGuarded
void stringArgsGuarded_handler(
@ -170,7 +177,7 @@ class PassiveTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringArgsSync
void stringArgsSync_handler(
@ -179,35 +186,35 @@ class PassiveTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for structArgsGuarded
void structArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structArgsSync
void structArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnGuarded
FormalParamStruct structReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnSync
FormalParamStruct structReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
PRIVATE:
@ -219,13 +226,13 @@ class PassiveTest :
void serialGuarded_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialSync
void serialSync_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
PRIVATE:
@ -237,7 +244,7 @@ class PassiveTest :
void CMD_NO_ARGS_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq //!< The command sequence number
);
) override;
//! Handler implementation for command CMD_PRIMITIVE
void CMD_PRIMITIVE_cmdHandler(
@ -249,7 +256,7 @@ class PassiveTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for command CMD_STRINGS
void CMD_STRINGS_cmdHandler(
@ -257,28 +264,28 @@ class PassiveTest :
U32 cmdSeq, //!< The command sequence number
const Fw::CmdStringArg& str1, //!< A string
const Fw::CmdStringArg& str2 //!< Another string
);
) override;
//! Handler implementation for command CMD_ENUM
void CMD_ENUM_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamEnum en //!< An enum
);
) override;
//! Handler implementation for command CMD_ARRAY
void CMD_ARRAY_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamArray arr //!< An array
);
) override;
//! Handler implementation for command CMD_STRUCT
void CMD_STRUCT_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamStruct str //!< A struct
);
) override;
public:

18
FppTest/component/passive/test/ut/Tester.hpp
View File

@ -107,6 +107,23 @@ class Tester : public PassiveTestGTestBase {
*/
);
//! Handler for from_stringArgsOut
//!
void from_stringArgsOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str80,
Fw::StringBase &str80Ref,
const Fw::StringBase &str100,
Fw::StringBase &str100Ref) final;
//! Handler for from_stringReturnOut
//!
Fw::String from_stringReturnOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str,
Fw::StringBase &strRef
) final;
//! Handler for from_noArgsOut
//!
void from_noArgsOut_handler(const FwIndexType portNum /*!< The port number*/
@ -238,6 +255,7 @@ class Tester : public PassiveTestGTestBase {
FppTest::Types::EnumType enumReturnVal;
FppTest::Types::ArrayType arrayReturnVal;
FppTest::Types::StructType structReturnVal;
FppTest::Types::StringType stringReturnVal;
// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];

26
FppTest/component/queued/QueuedTest.cpp
View File

@ -149,16 +149,6 @@
return this->arrayReturnOut_out(portNum, a, aRef);
}
void QueuedTest ::
cmdOut_handler(
FwIndexType portNum,
FwOpcodeType opCode,
U32 cmdSeq,
Fw::CmdArgBuffer& args
)
{
}
void QueuedTest ::
enumArgsGuarded_handler(
const FwIndexType portNum,
@ -355,6 +345,22 @@
);
}
Fw::String QueuedTest ::stringReturnGuarded_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
Fw::String QueuedTest ::stringReturnSync_handler(
FwIndexType portNum,
const Fw::StringBase& str,
Fw::StringBase& strRef
) {
return this->stringReturnOut_out(portNum, str, strRef);
}
void QueuedTest ::
structArgsGuarded_handler(
const FwIndexType portNum,

131
FppTest/component/queued/QueuedTest.hpp
View File

@ -40,103 +40,95 @@ class QueuedTest :
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayArgsGuarded
void arrayArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayArgsSync
void arrayArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnGuarded
FormalParamArray arrayReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
) override;
//! Handler implementation for arrayReturnSync
FormalParamArray arrayReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamArray& a, //!< An array
FormalParamArray& aRef //!< An array ref
);
//! Handler implementation for cmdOut
void cmdOut_handler(
FwIndexType portNum, //!< The port number
FwOpcodeType opCode, //!< Command Op Code
U32 cmdSeq, //!< Command Sequence
Fw::CmdArgBuffer& args //!< Buffer containing arguments
);
) override;
//! Handler implementation for enumArgsAsync
void enumArgsAsync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumArgsGuarded
void enumArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumArgsSync
void enumArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnGuarded
FormalParamEnum enumReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for enumReturnSync
FormalParamEnum enumReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
//! Handler implementation for noArgsAsync
void noArgsAsync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsGuarded
void noArgsGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnGuarded
bool noArgsReturnGuarded_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsReturnSync
bool noArgsReturnSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for noArgsSync
void noArgsSync_handler(
FwIndexType portNum //!< The port number
);
) override;
//! Handler implementation for primitiveArgsAsync
void primitiveArgsAsync_handler(
@ -147,7 +139,7 @@ class QueuedTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveArgsGuarded
void primitiveArgsGuarded_handler(
@ -158,7 +150,7 @@ class QueuedTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveArgsSync
void primitiveArgsSync_handler(
@ -169,7 +161,7 @@ class QueuedTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnGuarded
U32 primitiveReturnGuarded_handler(
@ -180,7 +172,7 @@ class QueuedTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for primitiveReturnSync
U32 primitiveReturnSync_handler(
@ -191,7 +183,7 @@ class QueuedTest :
F32& f32Ref,
bool b,
bool& bRef
);
) override;
//! Handler implementation for stringArgsAsync
void stringArgsAsync_handler(
@ -200,7 +192,7 @@ class QueuedTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringArgsGuarded
void stringArgsGuarded_handler(
@ -209,7 +201,7 @@ class QueuedTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringArgsSync
void stringArgsSync_handler(
@ -218,49 +210,63 @@ class QueuedTest :
Fw::StringBase& str80Ref,
const Fw::StringBase& str100, //!< A string of size 100
Fw::StringBase& str100Ref
);
) override;
//! Handler implementation for stringReturnGuarded
Fw::String stringReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for stringReturnSync
Fw::String stringReturnSync_handler(
FwIndexType portNum, //!< The port number
const Fw::StringBase& str, //!< A string
Fw::StringBase& strRef //!< A string ref
) override;
//! Handler implementation for structArgsAsync
void structArgsAsync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structArgsGuarded
void structArgsGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structArgsSync
void structArgsSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnGuarded
FormalParamStruct structReturnGuarded_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for structReturnSync
FormalParamStruct structReturnSync_handler(
FwIndexType portNum, //!< The port number
const FormalParamStruct& s, //!< A struct
FormalParamStruct& sRef //!< A struct ref
);
) override;
//! Handler implementation for enumArgsOverflow
void enumArgsHook_handler(
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
PRIVATE:
@ -272,37 +278,37 @@ class QueuedTest :
void serialAsync_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncAssert
void serialAsyncAssert_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncBlockPriority
void serialAsyncBlockPriority_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialAsyncDropPriority
void serialAsyncDropPriority_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialGuarded
void serialGuarded_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
//! Handler implementation for serialSync
void serialSync_handler(
FwIndexType portNum, //!< The port number
Fw::SerializeBufferBase& buffer //!< The serialization buffer
);
) override;
PRIVATE:
@ -314,7 +320,7 @@ class QueuedTest :
void CMD_NO_ARGS_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq //!< The command sequence number
);
) override;
//! Handler implementation for command CMD_PRIMITIVE
void CMD_PRIMITIVE_cmdHandler(
@ -326,7 +332,7 @@ class QueuedTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for command CMD_STRINGS
void CMD_STRINGS_cmdHandler(
@ -334,34 +340,34 @@ class QueuedTest :
U32 cmdSeq, //!< The command sequence number
const Fw::CmdStringArg& str1, //!< A string
const Fw::CmdStringArg& str2 //!< Another string
);
) override;
//! Handler implementation for command CMD_ENUM
void CMD_ENUM_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamEnum en //!< An enum
);
) override;
//! Handler implementation for command CMD_ARRAY
void CMD_ARRAY_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamArray arr //!< An array
);
) override;
//! Handler implementation for command CMD_STRUCT
void CMD_STRUCT_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamStruct str //!< A struct
);
) override;
//! Handler implementation for command CMD_ASYNC_NO_ARGS
void CMD_ASYNC_NO_ARGS_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq //!< The command sequence number
);
) override;
//! Handler implementation for command CMD_ASYNC_PRIMITIVE
void CMD_ASYNC_PRIMITIVE_cmdHandler(
@ -373,7 +379,7 @@ class QueuedTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for command CMD_ASYNC_STRINGS
void CMD_ASYNC_STRINGS_cmdHandler(
@ -381,28 +387,28 @@ class QueuedTest :
U32 cmdSeq, //!< The command sequence number
const Fw::CmdStringArg& str1, //!< A string
const Fw::CmdStringArg& str2 //!< Another string
);
) override;
//! Handler implementation for command CMD_ASYNC_ENUM
void CMD_ASYNC_ENUM_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamEnum en //!< An enum
);
) override;
//! Handler implementation for command CMD_ASYNC_ARRAY
void CMD_ASYNC_ARRAY_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamArray arr //!< An array
);
) override;
//! Handler implementation for command CMD_ASYNC_STRUCT
void CMD_ASYNC_STRUCT_cmdHandler(
FwOpcodeType opCode, //!< The opcode
U32 cmdSeq, //!< The command sequence number
FormalParamStruct str //!< A struct
);
) override;
PRIVATE:
@ -413,15 +419,15 @@ class QueuedTest :
//! Handler implementation for internalArray
void internalArray_internalInterfaceHandler(
const FormalParamArray& arr //!< An array
);
) override;
//! Handler implementation for internalEnum
void internalEnum_internalInterfaceHandler(
const FormalParamEnum& en //!< An enum
);
) override;
//! Handler implementation for internalNoArgs
void internalNoArgs_internalInterfaceHandler();
void internalNoArgs_internalInterfaceHandler() override;
//! Handler implementation for internalPrimitive
void internalPrimitive_internalInterfaceHandler(
@ -431,18 +437,18 @@ class QueuedTest :
F32 f32_2, //!< An F32
bool b1, //!< A boolean
bool b2 //!< A boolean
);
) override;
//! Handler implementation for internalString
void internalString_internalInterfaceHandler(
const Fw::InternalInterfaceString& str1, //!< A string
const Fw::InternalInterfaceString& str2 //!< Another string
);
) override;
//! Handler implementation for internalStruct
void internalStruct_internalInterfaceHandler(
const FormalParamStruct& str //!< A struct
);
) override;
PRIVATE:
@ -455,8 +461,7 @@ class QueuedTest :
FwIndexType portNum, //!< The port number
const FormalParamEnum& en, //!< An enum
FormalParamEnum& enRef //!< An enum ref
);
) override;
public:

18
FppTest/component/queued/test/ut/Tester.hpp
View File

@ -170,6 +170,23 @@ class Tester : public QueuedTestGTestBase {
*/
);
//! Handler for from_stringArgsOut
//!
void from_stringArgsOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str80,
Fw::StringBase &str80Ref,
const Fw::StringBase &str100,
Fw::StringBase &str100Ref) final;
//! Handler for from_stringReturnOut
//!
Fw::String from_stringReturnOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str,
Fw::StringBase &strRef
) final;
//! Handler for from_structArgsOut
//!
void from_structArgsOut_handler(const FwIndexType portNum, /*!< The port number*/
@ -259,6 +276,7 @@ class Tester : public QueuedTestGTestBase {
FppTest::Types::EnumType enumReturnVal;
FppTest::Types::ArrayType arrayReturnVal;
FppTest::Types::StructType structReturnVal;
FppTest::Types::StringType stringReturnVal;
// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];

18
FppTest/component/tests/PortTests.hpp
View File

@ -31,6 +31,7 @@
PORT_TEST_INVOKE_DECL(PORT_KIND, NoParamReturn) \
PORT_TEST_INVOKE_DECL(PORT_KIND, PrimitiveReturn) \
PORT_TEST_INVOKE_DECL(PORT_KIND, EnumReturn) \
PORT_TEST_INVOKE_DECL(PORT_KIND, StringReturn) \
PORT_TEST_INVOKE_DECL(PORT_KIND, ArrayReturn) \
PORT_TEST_INVOKE_DECL(PORT_KIND, StructReturn)
@ -60,6 +61,7 @@
PORT_TEST_CHECK_DECL(PORT_KIND, NoParamReturn) \
PORT_TEST_CHECK_DECL(PORT_KIND, PrimitiveReturn) \
PORT_TEST_CHECK_DECL(PORT_KIND, EnumReturn) \
PORT_TEST_CHECK_DECL(PORT_KIND, StringReturn) \
PORT_TEST_CHECK_DECL(PORT_KIND, ArrayReturn) \
PORT_TEST_CHECK_DECL(PORT_KIND, StructReturn)
@ -164,6 +166,16 @@
ASSERT_EQ(returnVal, this->enumReturnVal.val); \
} \
\
void Tester ::test##PORT_KIND##PortInvoke(FwIndexType portNum, FppTest::Types::StringReturn& port) { \
ASSERT_TRUE(component.isConnected_stringReturnOut_OutputPort(portNum)); \
ASSERT_TRUE(this->isConnected_to_stringReturn##PORT_KIND(portNum)); \
\
decltype(this->stringReturnVal.val) returnVal = \
this->invoke_to_stringReturn##PORT_KIND(portNum, port.args.val1, port.args.val2); \
\
ASSERT_EQ(returnVal, this->stringReturnVal.val); \
} \
\
void Tester ::test##PORT_KIND##PortInvoke(FwIndexType portNum, FppTest::Types::ArrayReturn& port) { \
ASSERT_TRUE(component.isConnected_arrayReturnOut_OutputPort(portNum)); \
ASSERT_TRUE(this->isConnected_to_arrayReturn##PORT_KIND(portNum)); \
@ -612,6 +624,12 @@
ASSERT_from_enumReturnOut(0, port.args.val1, port.args.val2); \
} \
\
void Tester ::test##PORT_KIND##PortCheck(FppTest::Types::StringReturn& port) { \
ASSERT_FROM_PORT_HISTORY_SIZE(1); \
ASSERT_from_stringReturnOut_SIZE(1); \
ASSERT_from_stringReturnOut(0, port.args.val1, port.args.val2); \
} \
\
void Tester ::test##PORT_KIND##PortCheck(FppTest::Types::ArrayReturn& port) { \
ASSERT_FROM_PORT_HISTORY_SIZE(1); \
ASSERT_from_arrayReturnOut_SIZE(1); \

18
FppTest/component/tests/TesterHandlers.cpp
View File

@ -42,6 +42,24 @@ FormalParamEnum Tester ::from_enumReturnOut_handler(const FwIndexType portNum,
return enumReturnVal.val;
}
void Tester ::from_stringArgsOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str80,
Fw::StringBase &str80Ref,
const Fw::StringBase &str100,
Fw::StringBase &str100Ref) {
this->pushFromPortEntry_stringArgsOut(str80, str80Ref, str100, str100Ref);
}
Fw::String Tester ::from_stringReturnOut_handler(
const FwIndexType portNum,
const Fw::StringBase &str,
Fw::StringBase &strRef
) {
this->pushFromPortEntry_stringReturnOut(str, strRef);
return stringReturnVal.val;
}
void Tester ::from_noArgsOut_handler(const FwIndexType portNum) {
this->pushFromPortEntry_noArgsOut();
}

9
FppTest/component/tests/TesterHelpers.cpp
View File

@ -52,6 +52,12 @@ void Tester ::connectPorts() {
// enumReturnSync
this->connect_to_enumReturnSync(0, this->component.get_enumReturnSync_InputPort(0));
// stringReturnGuarded
this->connect_to_stringReturnGuarded(0, this->component.get_stringReturnGuarded_InputPort(0));
// stringReturnSync
this->connect_to_stringReturnSync(0, this->component.get_stringReturnSync_InputPort(0));
// noArgsGuarded
for (FwIndexType i = 0; i < 2; ++i) {
this->connect_to_noArgsGuarded(i, this->component.get_noArgsGuarded_InputPort(i));
@ -130,6 +136,9 @@ void Tester ::connectPorts() {
// enumReturnOut
this->component.set_enumReturnOut_OutputPort(0, this->get_from_enumReturnOut(0));
// stringReturnOut
this->component.set_stringReturnOut_OutputPort(0, this->get_from_stringReturnOut(0));
// eventOut
this->component.set_eventOut_OutputPort(0, this->get_from_eventOut(0));

1
FppTest/component/tests/Tests.cpp
View File

@ -31,6 +31,7 @@ using TypedPortTestImplementations = ::testing::Types<FppTest::Types::NoParams,
FppTest::Types::NoParamReturn,
FppTest::Types::PrimitiveReturn,
FppTest::Types::EnumReturn,
FppTest::Types::StringReturn,
FppTest::Types::ArrayReturn,
FppTest::Types::StructReturn>;

9
FppTest/component/types/FormalParamTypes.cpp
View File

@ -135,6 +135,15 @@ PrmStringTypes::PrmStringTypes() {
setRandomString(val2, FW_PARAM_STRING_MAX_SIZE / 2);
}
StringType::StringType() {
setRandomString(val, decltype(val)::STRING_SIZE);
}
StringTypes::StringTypes() {
setRandomString(val1, decltype(val1)::STRING_SIZE / 2);
setRandomString(val2, decltype(val2)::STRING_SIZE / 2);
}
// ----------------------------------------------------------------------
// Serial type
// ----------------------------------------------------------------------

14
FppTest/component/types/FormalParamTypes.hpp
View File

@ -207,6 +207,19 @@ struct PrmStringTypes {
Fw::ParamString val2;
};
struct StringType {
StringType();
String1 val;
};
struct StringTypes {
StringTypes();
String1 val1;
String1 val2;
};
// ----------------------------------------------------------------------
// Serial type
// ----------------------------------------------------------------------
@ -260,6 +273,7 @@ typedef FormalParams<SerialType> SerialParam;
typedef FormalParamsWithReturn<Empty, BoolType> NoParamReturn;
typedef FormalParamsWithReturn<PrimitiveTypes, U32Type> PrimitiveReturn;
typedef FormalParamsWithReturn<EnumTypes, EnumType> EnumReturn;
typedef FormalParamsWithReturn<StringTypes, StringType> StringReturn;
typedef FormalParamsWithReturn<ArrayTypes, ArrayType> ArrayReturn;
typedef FormalParamsWithReturn<StructTypes, StructType> StructReturn;

2
FppTest/typed_tests/README.md
View File

@ -11,7 +11,7 @@ serial-to-serial port connections
**Note on the StringTest suite:**
In an earlier version of the C++ back end, FPP generated string classes.
In that version, `StringTest` suite was used to provide code coverage for those
In that version, the `StringTest` suite was used to provide code coverage for those
classes.
The code generation strategy for strings has changed, and FPP no longer generates
string classes.

4
Fw/Cmd/CmdString.hpp
View File

@ -24,9 +24,9 @@ class CmdStringArg final : public StringBase {
CmdStringArg() : StringBase() { *this = ""; }
explicit CmdStringArg(const CmdStringArg& src) : StringBase() { *this = src; }
CmdStringArg(const CmdStringArg& src) : StringBase() { *this = src; }
explicit CmdStringArg(const StringBase& src) : StringBase() { *this = src; }
CmdStringArg(const StringBase& src) : StringBase() { *this = src; }
explicit CmdStringArg(const char* src) : StringBase() { *this = src; }

4
Fw/Types/FileNameString.hpp
View File

@ -25,9 +25,9 @@ class FileNameString final : public StringBase {
FileNameString() : StringBase() { *this = ""; }
explicit FileNameString(const FileNameString& src) : StringBase() { *this = src; }
FileNameString(const FileNameString& src) : StringBase() { *this = src; }
explicit FileNameString(const StringBase& src) : StringBase() { *this = src; }
FileNameString(const StringBase& src) : StringBase() { *this = src; }
explicit FileNameString(const char* src) : StringBase() { *this = src; }

4
Fw/Types/InternalInterfaceString.hpp
View File

@ -25,9 +25,9 @@ class InternalInterfaceString final : public StringBase {
InternalInterfaceString() : StringBase() { *this = ""; }
explicit InternalInterfaceString(const InternalInterfaceString& src) : StringBase() { *this = src; }
InternalInterfaceString(const InternalInterfaceString& src) : StringBase() { *this = src; }
explicit InternalInterfaceString(const StringBase& src) : StringBase() { *this = src; }
InternalInterfaceString(const StringBase& src) : StringBase() { *this = src; }
explicit InternalInterfaceString(const char* src) : StringBase() { *this = src; }

4
Fw/Types/ObjectName.hpp
View File

@ -24,9 +24,9 @@ class ObjectName final : public StringBase {
ObjectName() : StringBase() { *this = ""; }
explicit ObjectName(const ObjectName& src) : StringBase() { *this = src; }
ObjectName(const ObjectName& src) : StringBase() { *this = src; }
explicit ObjectName(const StringBase& src) : StringBase() { *this = src; }
ObjectName(const StringBase& src) : StringBase() { *this = src; }
explicit ObjectName(const char* src) : StringBase() { *this = src; }

4
Fw/Types/String.hpp
View File

@ -24,9 +24,9 @@ class String final : public StringBase {
String() : StringBase() { *this = ""; }
explicit String(const String& src) : StringBase() { *this = src; }
String(const String& src) : StringBase() { *this = src; }
explicit String(const StringBase& src) : StringBase() { *this = src; }
String(const StringBase& src) : StringBase() { *this = src; }
String(const char* src) : StringBase() { *this = src; }

4
Fw/Types/StringTemplate.hpp
View File

@ -22,9 +22,9 @@ template<Fw::StringBase::SizeType size> class StringTemplate final : public Stri
StringTemplate() : StringBase() { *this = ""; }
explicit StringTemplate(const StringTemplate& src) : StringBase() { *this = src; }
StringTemplate(const StringTemplate& src) : StringBase() { *this = src; }
explicit StringTemplate(const StringBase& src) : StringBase() { *this = src; }
StringTemplate(const StringBase& src) : StringBase() { *this = src; }
explicit StringTemplate(const char* src) : StringBase() { *this = src; }

4
Os/QueueString.hpp
View File

@ -19,9 +19,9 @@ class QueueString final : public Fw::StringBase {
QueueString() : StringBase() { *this = ""; }
explicit QueueString(const QueueString& src) : StringBase() { *this = src; }
QueueString(const QueueString& src) : StringBase() { *this = src; }
explicit QueueString(const StringBase& src) : StringBase() { *this = src; }
QueueString(const StringBase& src) : StringBase() { *this = src; }
explicit QueueString(const char* src) : StringBase() { *this = src; }

4
Os/TaskString.hpp
View File

@ -19,9 +19,9 @@ class TaskString final : public Fw::StringBase {
TaskString() : StringBase() { *this = ""; }
explicit TaskString(const TaskString& src) : StringBase() { *this = src; }
TaskString(const TaskString& src) : StringBase() { *this = src; }
explicit TaskString(const StringBase& src) : StringBase() { *this = src; }
TaskString(const StringBase& src) : StringBase() { *this = src; }
explicit TaskString(const char* src) : StringBase() { *this = src; }

26
requirements.txt
View File

@ -20,19 +20,19 @@ fprime-fpl-convert-xml==1.0.3
fprime-fpl-extract-xml==1.0.3
fprime-fpl-layout==1.0.3
fprime-fpl-write-pic==1.0.3
fprime-fpp-check==3.0.0a2
fprime-fpp-depend==3.0.0a2
fprime-fpp-filenames==3.0.0a2
fprime-fpp-format==3.0.0a2
fprime-fpp-from-xml==3.0.0a2
fprime-fpp-locate-defs==3.0.0a2
fprime-fpp-locate-uses==3.0.0a2
fprime-fpp-syntax==3.0.0a2
fprime-fpp-to-cpp==3.0.0a2
fprime-fpp-to-dict==3.0.0a2
fprime-fpp-to-json==3.0.0a2
fprime-fpp-to-xml==3.0.0a2
fprime-fpp-to-layout==3.0.0a2
fprime-fpp-check==3.0.0a3
fprime-fpp-depend==3.0.0a3
fprime-fpp-filenames==3.0.0a3
fprime-fpp-format==3.0.0a3
fprime-fpp-from-xml==3.0.0a3
fprime-fpp-locate-defs==3.0.0a3
fprime-fpp-locate-uses==3.0.0a3
fprime-fpp-syntax==3.0.0a3
fprime-fpp-to-cpp==3.0.0a3
fprime-fpp-to-dict==3.0.0a3
fprime-fpp-to-json==3.0.0a3
fprime-fpp-to-xml==3.0.0a3
fprime-fpp-to-layout==3.0.0a3
fprime-gds==3.6.1
fprime-tools==3.6.1
fprime-visual==1.0.2