Skip to content

Commit 5ca639f

Browse files
bocchinobocchino
authored
Merge pull request #599 from nasa/merge-release-branch-into-main
Merge v2.3.0 release branch into main
2 parents ff93f63 + 36338b8 commit 5ca639f

16 files changed

+17
-388
lines changed

‎compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ case class ComponentDataProducts (
4646
addAccessTagAndComment(
4747
"PROTECTED",
4848
"Handlers to implement for data products",
49-
containersByName.map((id, container) => getDpRecvHandler(container.getName)),
49+
productRequestPort match {
50+
case None => Nil
51+
case _ => containersByName.map((id, container) => getDpRecvHandler(container.getName))
52+
},
5053
CppDoc.Lines.Hpp
5154
)
5255

‎compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentImplWriter.scala‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,12 @@ case class ComponentImplWriter(
155155
addAccessTagAndComment(
156156
"PRIVATE",
157157
s"Handler implementations for data products",
158-
containersByName.map(
159-
(id, container) => getDpRecvHandler(container.getName, lines("// TODO"))
160-
)
158+
productRequestPort match {
159+
case None => Nil
160+
case _ => containersByName.map(
161+
(id, container) => getDpRecvHandler(container.getName, lines("// TODO"))
162+
)
163+
}
161164
)
162165

163166
private def getDestructor: CppDoc.Class.Member =

‎compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,42 +1298,6 @@ class ActiveGetProductsComponentBase :
12981298
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
12991299
);
13001300

1301-
PROTECTED:
1302-
1303-
// ----------------------------------------------------------------------
1304-
// Handlers to implement for data products
1305-
// ----------------------------------------------------------------------
1306-
1307-
//! Receive a container of type Container1
1308-
virtual void dpRecv_Container1_handler(
1309-
DpContainer& container, //!< The container
1310-
Fw::Success::T status //!< The container status
1311-
) = 0;
1312-
1313-
//! Receive a container of type Container2
1314-
virtual void dpRecv_Container2_handler(
1315-
DpContainer& container, //!< The container
1316-
Fw::Success::T status //!< The container status
1317-
) = 0;
1318-
1319-
//! Receive a container of type Container3
1320-
virtual void dpRecv_Container3_handler(
1321-
DpContainer& container, //!< The container
1322-
Fw::Success::T status //!< The container status
1323-
) = 0;
1324-
1325-
//! Receive a container of type Container4
1326-
virtual void dpRecv_Container4_handler(
1327-
DpContainer& container, //!< The container
1328-
Fw::Success::T status //!< The container status
1329-
) = 0;
1330-
1331-
//! Receive a container of type Container5
1332-
virtual void dpRecv_Container5_handler(
1333-
DpContainer& container, //!< The container
1334-
Fw::Success::T status //!< The container status
1335-
) = 0;
1336-
13371301
PROTECTED:
13381302

13391303
// ----------------------------------------------------------------------

‎compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,42 +1063,6 @@ class PassiveGetProductsComponentBase :
10631063
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
10641064
);
10651065

1066-
PROTECTED:
1067-
1068-
// ----------------------------------------------------------------------
1069-
// Handlers to implement for data products
1070-
// ----------------------------------------------------------------------
1071-
1072-
//! Receive a container of type Container1
1073-
virtual void dpRecv_Container1_handler(
1074-
DpContainer& container, //!< The container
1075-
Fw::Success::T status //!< The container status
1076-
) = 0;
1077-
1078-
//! Receive a container of type Container2
1079-
virtual void dpRecv_Container2_handler(
1080-
DpContainer& container, //!< The container
1081-
Fw::Success::T status //!< The container status
1082-
) = 0;
1083-
1084-
//! Receive a container of type Container3
1085-
virtual void dpRecv_Container3_handler(
1086-
DpContainer& container, //!< The container
1087-
Fw::Success::T status //!< The container status
1088-
) = 0;
1089-
1090-
//! Receive a container of type Container4
1091-
virtual void dpRecv_Container4_handler(
1092-
DpContainer& container, //!< The container
1093-
Fw::Success::T status //!< The container status
1094-
) = 0;
1095-
1096-
//! Receive a container of type Container5
1097-
virtual void dpRecv_Container5_handler(
1098-
DpContainer& container, //!< The container
1099-
Fw::Success::T status //!< The container status
1100-
) = 0;
1101-
11021066
PROTECTED:
11031067

11041068
// ----------------------------------------------------------------------

‎compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,42 +1298,6 @@ class QueuedGetProductsComponentBase :
12981298
Fw::Time timeTag = Fw::ZERO_TIME //!< The time tag
12991299
);
13001300

1301-
PROTECTED:
1302-
1303-
// ----------------------------------------------------------------------
1304-
// Handlers to implement for data products
1305-
// ----------------------------------------------------------------------
1306-
1307-
//! Receive a container of type Container1
1308-
virtual void dpRecv_Container1_handler(
1309-
DpContainer& container, //!< The container
1310-
Fw::Success::T status //!< The container status
1311-
) = 0;
1312-
1313-
//! Receive a container of type Container2
1314-
virtual void dpRecv_Container2_handler(
1315-
DpContainer& container, //!< The container
1316-
Fw::Success::T status //!< The container status
1317-
) = 0;
1318-
1319-
//! Receive a container of type Container3
1320-
virtual void dpRecv_Container3_handler(
1321-
DpContainer& container, //!< The container
1322-
Fw::Success::T status //!< The container status
1323-
) = 0;
1324-
1325-
//! Receive a container of type Container4
1326-
virtual void dpRecv_Container4_handler(
1327-
DpContainer& container, //!< The container
1328-
Fw::Success::T status //!< The container status
1329-
) = 0;
1330-
1331-
//! Receive a container of type Container5
1332-
virtual void dpRecv_Container5_handler(
1333-
DpContainer& container, //!< The container
1334-
Fw::Success::T status //!< The container status
1335-
) = 0;
1336-
13371301
PROTECTED:
13381302

13391303
// ----------------------------------------------------------------------

‎compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -176,52 +176,3 @@ void ActiveGetProducts ::
176176
{
177177
// TODO
178178
}
179-
180-
// ----------------------------------------------------------------------
181-
// Handler implementations for data products
182-
// ----------------------------------------------------------------------
183-
184-
void ActiveGetProducts ::
185-
dpRecv_Container1_handler(
186-
DpContainer& container,
187-
Fw::Success::T status
188-
)
189-
{
190-
// TODO
191-
}
192-
193-
void ActiveGetProducts ::
194-
dpRecv_Container2_handler(
195-
DpContainer& container,
196-
Fw::Success::T status
197-
)
198-
{
199-
// TODO
200-
}
201-
202-
void ActiveGetProducts ::
203-
dpRecv_Container3_handler(
204-
DpContainer& container,
205-
Fw::Success::T status
206-
)
207-
{
208-
// TODO
209-
}
210-
211-
void ActiveGetProducts ::
212-
dpRecv_Container4_handler(
213-
DpContainer& container,
214-
Fw::Success::T status
215-
)
216-
{
217-
// TODO
218-
}
219-
220-
void ActiveGetProducts ::
221-
dpRecv_Container5_handler(
222-
DpContainer& container,
223-
Fw::Success::T status
224-
)
225-
{
226-
// TODO
227-
}

‎compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -180,42 +180,6 @@ class ActiveGetProducts :
180180
const S& s //!< A struct
181181
) override;
182182

183-
PRIVATE:
184-
185-
// ----------------------------------------------------------------------
186-
// Handler implementations for data products
187-
// ----------------------------------------------------------------------
188-
189-
//! Receive a container of type Container1
190-
void dpRecv_Container1_handler(
191-
DpContainer& container, //!< The container
192-
Fw::Success::T status //!< The container status
193-
) override;
194-
195-
//! Receive a container of type Container2
196-
void dpRecv_Container2_handler(
197-
DpContainer& container, //!< The container
198-
Fw::Success::T status //!< The container status
199-
) override;
200-
201-
//! Receive a container of type Container3
202-
void dpRecv_Container3_handler(
203-
DpContainer& container, //!< The container
204-
Fw::Success::T status //!< The container status
205-
) override;
206-
207-
//! Receive a container of type Container4
208-
void dpRecv_Container4_handler(
209-
DpContainer& container, //!< The container
210-
Fw::Success::T status //!< The container status
211-
) override;
212-
213-
//! Receive a container of type Container5
214-
void dpRecv_Container5_handler(
215-
DpContainer& container, //!< The container
216-
Fw::Success::T status //!< The container status
217-
) override;
218-
219183
};
220184

221185
#endif

‎compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -110,52 +110,3 @@ void PassiveGetProducts ::
110110
{
111111
// TODO
112112
}
113-
114-
// ----------------------------------------------------------------------
115-
// Handler implementations for data products
116-
// ----------------------------------------------------------------------
117-
118-
void PassiveGetProducts ::
119-
dpRecv_Container1_handler(
120-
DpContainer& container,
121-
Fw::Success::T status
122-
)
123-
{
124-
// TODO
125-
}
126-
127-
void PassiveGetProducts ::
128-
dpRecv_Container2_handler(
129-
DpContainer& container,
130-
Fw::Success::T status
131-
)
132-
{
133-
// TODO
134-
}
135-
136-
void PassiveGetProducts ::
137-
dpRecv_Container3_handler(
138-
DpContainer& container,
139-
Fw::Success::T status
140-
)
141-
{
142-
// TODO
143-
}
144-
145-
void PassiveGetProducts ::
146-
dpRecv_Container4_handler(
147-
DpContainer& container,
148-
Fw::Success::T status
149-
)
150-
{
151-
// TODO
152-
}
153-
154-
void PassiveGetProducts ::
155-
dpRecv_Container5_handler(
156-
DpContainer& container,
157-
Fw::Success::T status
158-
)
159-
{
160-
// TODO
161-
}

‎compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -117,42 +117,6 @@ class PassiveGetProducts :
117117
const S& s //!< A struct
118118
) override;
119119

120-
PRIVATE:
121-
122-
// ----------------------------------------------------------------------
123-
// Handler implementations for data products
124-
// ----------------------------------------------------------------------
125-
126-
//! Receive a container of type Container1
127-
void dpRecv_Container1_handler(
128-
DpContainer& container, //!< The container
129-
Fw::Success::T status //!< The container status
130-
) override;
131-
132-
//! Receive a container of type Container2
133-
void dpRecv_Container2_handler(
134-
DpContainer& container, //!< The container
135-
Fw::Success::T status //!< The container status
136-
) override;
137-
138-
//! Receive a container of type Container3
139-
void dpRecv_Container3_handler(
140-
DpContainer& container, //!< The container
141-
Fw::Success::T status //!< The container status
142-
) override;
143-
144-
//! Receive a container of type Container4
145-
void dpRecv_Container4_handler(
146-
DpContainer& container, //!< The container
147-
Fw::Success::T status //!< The container status
148-
) override;
149-
150-
//! Receive a container of type Container5
151-
void dpRecv_Container5_handler(
152-
DpContainer& container, //!< The container
153-
Fw::Success::T status //!< The container status
154-
) override;
155-
156120
};
157121

158122
#endif

0 commit comments

Comments
 (0)