Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v2.3.0 release branch into main #599

Merged
merged 9 commits into from
Feb 6, 2025
Merged

Merge v2.3.0 release branch into main #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8221df4
Revise ComponentDataProducts
bocchino Feb 3, 2025
fedb557
Revise test impl generation
bocchino Feb 4, 2025
74afbb5
Merge pull request #596 from nasa/issue-594-dp-receive-handler
bocchino Feb 4, 2025
69903d8
Update FPP version stamp
bocchino Feb 5, 2025
1d203ae
Merge branch 'release/v2.3.0' into merge-release-branch-into-main
bocchino Feb 5, 2025
dcf7483
Merge branch 'update-version-stamp' into merge-release-branch-into-main
bocchino Feb 5, 2025
07e72be
Merge branch 'main' into merge-release-branch-into-main
bocchino Feb 5, 2025
476e5f6
Merge pull request #598 from nasa/update-version-stamp
bocchino Feb 6, 2025
36338b8
Merge branch 'release/v2.3.0' into merge-release-branch-into-main
bocchino Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ case class ComponentDataProducts (
addAccessTagAndComment(
"PROTECTED",
"Handlers to implement for data products",
containersByName.map((id, container) => getDpRecvHandler(container.getName)),
productRequestPort match {
case None => Nil
case _ => containersByName.map((id, container) => getDpRecvHandler(container.getName))
},
CppDoc.Lines.Hpp
)

Expand Down
9 changes: 6 additions & 3 deletions compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentImplWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,12 @@ case class ComponentImplWriter(
addAccessTagAndComment(
"PRIVATE",
s"Handler implementations for data products",
containersByName.map(
(id, container) => getDpRecvHandler(container.getName, lines("// TODO"))
)
productRequestPort match {
case None => Nil
case _ => containersByName.map(
(id, container) => getDpRecvHandler(container.getName, lines("// TODO"))
)
}
)

private def getDestructor: CppDoc.Class.Member =
Expand Down
36 changes: 0 additions & 36 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,42 +1298,6 @@ class ActiveGetProductsComponentBase :
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
);

PROTECTED:

// ----------------------------------------------------------------------
// Handlers to implement for data products
// ----------------------------------------------------------------------

//! Receive a container of type Container1
virtual void dpRecv_Container1_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container2
virtual void dpRecv_Container2_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container3
virtual void dpRecv_Container3_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container4
virtual void dpRecv_Container4_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container5
virtual void dpRecv_Container5_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

PROTECTED:

// ----------------------------------------------------------------------
Expand Down
36 changes: 0 additions & 36 deletions compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,42 +1063,6 @@ class PassiveGetProductsComponentBase :
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
);

PROTECTED:

// ----------------------------------------------------------------------
// Handlers to implement for data products
// ----------------------------------------------------------------------

//! Receive a container of type Container1
virtual void dpRecv_Container1_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container2
virtual void dpRecv_Container2_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container3
virtual void dpRecv_Container3_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container4
virtual void dpRecv_Container4_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container5
virtual void dpRecv_Container5_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

PROTECTED:

// ----------------------------------------------------------------------
Expand Down
36 changes: 0 additions & 36 deletions compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,42 +1298,6 @@ class QueuedGetProductsComponentBase :
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
);

PROTECTED:

// ----------------------------------------------------------------------
// Handlers to implement for data products
// ----------------------------------------------------------------------

//! Receive a container of type Container1
virtual void dpRecv_Container1_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container2
virtual void dpRecv_Container2_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container3
virtual void dpRecv_Container3_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container4
virtual void dpRecv_Container4_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

//! Receive a container of type Container5
virtual void dpRecv_Container5_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) = 0;

PROTECTED:

// ----------------------------------------------------------------------
Expand Down
49 changes: 0 additions & 49 deletions compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,52 +176,3 @@ void ActiveGetProducts ::
{
// TODO
}

// ----------------------------------------------------------------------
// Handler implementations for data products
// ----------------------------------------------------------------------

void ActiveGetProducts ::
dpRecv_Container1_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void ActiveGetProducts ::
dpRecv_Container2_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void ActiveGetProducts ::
dpRecv_Container3_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void ActiveGetProducts ::
dpRecv_Container4_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void ActiveGetProducts ::
dpRecv_Container5_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}
36 changes: 0 additions & 36 deletions compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,42 +180,6 @@ class ActiveGetProducts :
const S& s //!< A struct
) override;

PRIVATE:

// ----------------------------------------------------------------------
// Handler implementations for data products
// ----------------------------------------------------------------------

//! Receive a container of type Container1
void dpRecv_Container1_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container2
void dpRecv_Container2_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container3
void dpRecv_Container3_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container4
void dpRecv_Container4_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container5
void dpRecv_Container5_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

};

#endif
49 changes: 0 additions & 49 deletions compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,52 +110,3 @@ void PassiveGetProducts ::
{
// TODO
}

// ----------------------------------------------------------------------
// Handler implementations for data products
// ----------------------------------------------------------------------

void PassiveGetProducts ::
dpRecv_Container1_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void PassiveGetProducts ::
dpRecv_Container2_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void PassiveGetProducts ::
dpRecv_Container3_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void PassiveGetProducts ::
dpRecv_Container4_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}

void PassiveGetProducts ::
dpRecv_Container5_handler(
DpContainer& container,
Fw::Success::T status
)
{
// TODO
}
36 changes: 0 additions & 36 deletions compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,42 +117,6 @@ class PassiveGetProducts :
const S& s //!< A struct
) override;

PRIVATE:

// ----------------------------------------------------------------------
// Handler implementations for data products
// ----------------------------------------------------------------------

//! Receive a container of type Container1
void dpRecv_Container1_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container2
void dpRecv_Container2_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container3
void dpRecv_Container3_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container4
void dpRecv_Container4_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

//! Receive a container of type Container5
void dpRecv_Container5_handler(
DpContainer& container, //!< The container
Fw::Success::T status //!< The container status
) override;

};

#endif
Loading