Skip to content

Commit 538e93d

Browse files
Brian CampuzanoBrian Campuzano
authored andcommitted
Updated parameter delegate to accept a serial buffer base instead of a parameter buffer
1 parent 6a89d16 commit 538e93d

8 files changed

Lines changed: 30 additions & 30 deletions

File tree

FppTest/component/active/test/ut/Tester.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Fw::SerializeStatus Tester::ActiveTestComponentBaseParamExternalDelegate ::
131131
const FwPrmIdType base_id,
132132
const FwPrmIdType local_id,
133133
const Fw::ParamValid prmStat,
134-
Fw::ParamBuffer& buff
134+
Fw::SerializeBufferBase& buff
135135
)
136136
{
137137
Fw::SerializeStatus stat;
@@ -176,7 +176,7 @@ Fw::SerializeStatus Tester::ActiveTestComponentBaseParamExternalDelegate ::
176176
serializeParam(
177177
const FwPrmIdType base_id,
178178
const FwPrmIdType local_id,
179-
Fw::ParamBuffer& buff
179+
Fw::SerializeBufferBase& buff
180180
) const
181181
{
182182
Fw::SerializeStatus stat;

FppTest/component/active/test/ut/Tester.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,14 +372,14 @@ class Tester : public ActiveTestGTestBase {
372372
const FwPrmIdType base_id, //!< The component base parameter ID to deserialize
373373
const FwPrmIdType local_id, //!< The parameter local ID to deserialize
374374
const Fw::ParamValid prmStat, //!< The parameter validity status
375-
Fw::ParamBuffer& buff //!< The buffer containing the parameter to deserialize
375+
Fw::SerializeBufferBase& buff //!< The buffer containing the parameter to deserialize
376376
) override;
377377

378378
//! Parameter serialization function for external parameter unit testing
379379
Fw::SerializeStatus serializeParam(
380380
const FwPrmIdType base_id, //!< The component base parameter ID to serialize
381381
const FwPrmIdType local_id, //!< The parameter local ID to serialize
382-
Fw::ParamBuffer& buff //!< The buffer to serialize the parameter into
382+
Fw::SerializeBufferBase& buff //!< The buffer to serialize the parameter into
383383
) const override;
384384

385385
};

FppTest/component/passive/test/ut/Tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Fw::SerializeStatus Tester::PassiveTestComponentBaseParamExternalDelegate ::
129129
const FwPrmIdType base_id,
130130
const FwPrmIdType local_id,
131131
const Fw::ParamValid prmStat,
132-
Fw::ParamBuffer& buff
132+
Fw::SerializeBufferBase& buff
133133
)
134134
{
135135
Fw::SerializeStatus stat;
@@ -174,7 +174,7 @@ Fw::SerializeStatus Tester::PassiveTestComponentBaseParamExternalDelegate ::
174174
serializeParam(
175175
const FwPrmIdType base_id,
176176
const FwPrmIdType local_id,
177-
Fw::ParamBuffer& buff
177+
Fw::SerializeBufferBase& buff
178178
) const
179179
{
180180
Fw::SerializeStatus stat;
@@ -213,4 +213,4 @@ Fw::SerializeStatus Tester::PassiveTestComponentBaseParamExternalDelegate ::
213213
}
214214

215215
return stat;
216-
}
216+
}

FppTest/component/passive/test/ut/Tester.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,14 @@ class Tester : public PassiveTestGTestBase {
351351
const FwPrmIdType base_id, //!< The component base parameter ID to deserialize
352352
const FwPrmIdType local_id, //!< The parameter local ID to deserialize
353353
const Fw::ParamValid prmStat, //!< The parameter validity status
354-
Fw::ParamBuffer& buff //!< The buffer containing the parameter to deserialize
354+
Fw::SerializeBufferBase& buff //!< The buffer containing the parameter to deserialize
355355
) override;
356356

357357
//! Parameter serialization function for external parameter unit testing
358358
Fw::SerializeStatus serializeParam(
359359
const FwPrmIdType base_id, //!< The component base parameter ID to serialize
360360
const FwPrmIdType local_id, //!< The parameter local ID to serialize
361-
Fw::ParamBuffer& buff //!< The buffer to serialize the parameter into
361+
Fw::SerializeBufferBase& buff //!< The buffer to serialize the parameter into
362362
) const override;
363363

364364
};

FppTest/component/queued/test/ut/Tester.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Fw::SerializeStatus Tester::QueuedTestComponentBaseParamExternalDelegate ::
129129
const FwPrmIdType base_id,
130130
const FwPrmIdType local_id,
131131
const Fw::ParamValid prmStat,
132-
Fw::ParamBuffer& buff
132+
Fw::SerializeBufferBase& buff
133133
)
134134
{
135135
Fw::SerializeStatus stat;
@@ -174,7 +174,7 @@ Fw::SerializeStatus Tester::QueuedTestComponentBaseParamExternalDelegate ::
174174
serializeParam(
175175
const FwPrmIdType base_id,
176176
const FwPrmIdType local_id,
177-
Fw::ParamBuffer& buff
177+
Fw::SerializeBufferBase& buff
178178
) const
179179
{
180180
Fw::SerializeStatus stat;
@@ -213,4 +213,4 @@ Fw::SerializeStatus Tester::QueuedTestComponentBaseParamExternalDelegate ::
213213
}
214214

215215
return stat;
216-
}
216+
}

FppTest/component/queued/test/ut/Tester.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,14 @@ class Tester : public QueuedTestGTestBase {
373373
const FwPrmIdType base_id, //!< The component base parameter ID to deserialize
374374
const FwPrmIdType local_id, //!< The parameter local ID to deserialize
375375
const Fw::ParamValid prmStat, //!< The parameter validity status
376-
Fw::ParamBuffer& buff //!< The buffer containing the parameter to deserialize
376+
Fw::SerializeBufferBase& buff //!< The buffer containing the parameter to deserialize
377377
) override;
378378

379379
//! Parameter serialization function for external parameter unit testing
380380
Fw::SerializeStatus serializeParam(
381381
const FwPrmIdType base_id, //!< The component base parameter ID to serialize
382382
const FwPrmIdType local_id, //!< The parameter local ID to serialize
383-
Fw::ParamBuffer& buff //!< The buffer to serialize the parameter into
383+
Fw::SerializeBufferBase& buff //!< The buffer to serialize the parameter into
384384
) const override;
385385

386386
};

Fw/Prm/PrmExternalTypes.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace Fw {
3333
const FwPrmIdType base_id,
3434
const FwPrmIdType local_id,
3535
const ParamValid prmStat,
36-
ParamBuffer& buff) = 0;
36+
SerializeBufferBase& buff) = 0;
3737

3838
//! Serialize a parameter into a parameter buffer
3939
//!
@@ -45,9 +45,9 @@ namespace Fw {
4545
virtual SerializeStatus serializeParam(
4646
const FwPrmIdType base_id,
4747
const FwPrmIdType local_id,
48-
ParamBuffer& buff) const = 0;
48+
SerializeBufferBase& buff) const = 0;
4949
};
5050

5151
} // namespace Fw
5252

53-
#endif
53+
#endif

requirements.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ fprime-fpl-convert-xml==1.0.3
2020
fprime-fpl-extract-xml==1.0.3
2121
fprime-fpl-layout==1.0.3
2222
fprime-fpl-write-pic==1.0.3
23-
fprime-fpp-check==3.0.0a8-67-gefde0d459
24-
fprime-fpp-depend==3.0.0a8-67-gefde0d459
25-
fprime-fpp-filenames==3.0.0a8-67-gefde0d459
26-
fprime-fpp-format==3.0.0a8-67-gefde0d459
27-
fprime-fpp-from-xml==3.0.0a8-67-gefde0d459
28-
fprime-fpp-locate-defs==3.0.0a8-67-gefde0d459
29-
fprime-fpp-locate-uses==3.0.0a8-67-gefde0d459
30-
fprime-fpp-syntax==3.0.0a8-67-gefde0d459
31-
fprime-fpp-to-cpp==3.0.0a8-67-gefde0d459
32-
fprime-fpp-to-dict==3.0.0a8-67-gefde0d459
33-
fprime-fpp-to-json==3.0.0a8-67-gefde0d459
34-
fprime-fpp-to-xml==3.0.0a8-67-gefde0d459
35-
fprime-fpp-to-layout==3.0.0a8-67-gefde0d459
23+
fprime-fpp-check==3.0.0a8-71-g77dee8489
24+
fprime-fpp-depend==3.0.0a8-71-g77dee8489
25+
fprime-fpp-filenames==3.0.0a8-71-g77dee8489
26+
fprime-fpp-format==3.0.0a8-71-g77dee8489
27+
fprime-fpp-from-xml==3.0.0a8-71-g77dee8489
28+
fprime-fpp-locate-defs==3.0.0a8-71-g77dee8489
29+
fprime-fpp-locate-uses==3.0.0a8-71-g77dee8489
30+
fprime-fpp-syntax==3.0.0a8-71-g77dee8489
31+
fprime-fpp-to-cpp==3.0.0a8-71-g77dee8489
32+
fprime-fpp-to-dict==3.0.0a8-71-g77dee8489
33+
fprime-fpp-to-json==3.0.0a8-71-g77dee8489
34+
fprime-fpp-to-xml==3.0.0a8-71-g77dee8489
35+
fprime-fpp-to-layout==3.0.0a8-71-g77dee8489
3636
fprime-gds==3.6.1
3737
fprime-tools==3.6.1
3838
fprime-visual==1.0.2

0 commit comments

Comments
 (0)