Skip to content

Commit

Permalink
Merge pull request #599 from nasa/merge-release-branch-into-main
Browse files Browse the repository at this point in the history 
Merge v2.3.0 release branch into main
  • Loading branch information
@bocchino
bocchino authored Feb 6, 2025
2 parents ff93f63 + 36338b8 commit 5ca639f
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 388 deletions.
5 changes: 4 additions & 1 deletion compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala
View file
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
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
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
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
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
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
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
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
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

0 comments on commit 5ca639f

Please sign in to comment.