nasa/fpp
1
0
Fork 0
mirror of https://github.com/nasa/fpp.git synced 2025-12-10 00:40:22 -06:00
Code Issues Packages Projects Releases 83 Wiki Activity

Fix code gen for ports

Browse Source
This commit is contained in:
Rob Bocchino 2025-12-05 17:00:59 -08:00
parent c412602891
commit 28dc03171d
13 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
View File

@ -135,7 +135,10 @@ case class PortCppWriter (
private def getHppIncludes: CppDoc.Member = {
val unconditional = List.concat(
List("Fw/FPrimeBasicTypes.hpp").map(CppWriter.headerString),
List(
"Fw/FPrimeBasicTypes.hpp",
"Fw/Types/String.hpp"
).map(CppWriter.headerString),
writeIncludeDirectives
).sorted.map(line)
val conditional = List.concat(
@ -144,7 +147,6 @@ case class PortCppWriter (
"Fw/Comp/PassiveComponentBase.hpp",
"Fw/Port/InputPortBase.hpp",
"Fw/Port/OutputPortBase.hpp",
"Fw/Types/String.hpp",
)
).map(CppWriter.headerString).sorted.map(line)
linesMember(

2
compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp vendored
View File

@ -8,12 +8,12 @@
#define Ports_NoArgsPortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace Ports {

2
compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp vendored
View File

@ -8,11 +8,11 @@
#define Ports_NoArgsReturnPortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace Ports {

2
compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp vendored
View File

@ -10,13 +10,13 @@
#include "AArrayAc.hpp"
#include "EEnumAc.hpp"
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#include "SSerializableAc.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace Ports {

2
compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp vendored
View File

@ -10,12 +10,12 @@
#include "AArrayAc.hpp"
#include "EEnumAc.hpp"
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#include "SSerializableAc.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace Ports {

2
compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp vendored
View File

@ -8,13 +8,13 @@
#define AbsTypePortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#include "include/T.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! AbsType port constants

2
compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp vendored
View File

@ -8,12 +8,12 @@
#define EmptyPortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! Empty port constants

2
compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp vendored
View File

@ -10,13 +10,13 @@
#include "AArrayAc.hpp"
#include "EEnumAc.hpp"
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#include "SSerializableAc.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! FppType port constants

2
compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp vendored
View File

@ -8,12 +8,12 @@
#define KwdNamePortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! KwdName port constants

2
compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp vendored
View File

@ -8,12 +8,12 @@
#define PrimitivePortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! Primitive port constants

2
compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp vendored
View File

@ -8,11 +8,11 @@
#define M_ReturnTypePortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace M {

2
compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp vendored
View File

@ -8,12 +8,12 @@
#define StringPortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/Serializable.hpp"
#include "Fw/Types/String.hpp"
#endif
//! String port constants

2
compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp vendored
View File

@ -8,11 +8,11 @@
#define M_StringReturnTypePortAc_HPP
#include "Fw/FPrimeBasicTypes.hpp"
#include "Fw/Types/String.hpp"
#if !FW_DIRECT_PORT_CALLS
#include "Fw/Comp/PassiveComponentBase.hpp"
#include "Fw/Port/InputPortBase.hpp"
#include "Fw/Port/OutputPortBase.hpp"
#include "Fw/Types/String.hpp"
#endif
namespace M {