Skip to content

Add support for direct port calls #4987

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

Open
bocchino wants to merge 23 commits into
base: devel
Choose a base branch
from
Open

Add support for direct port calls #4987

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b5ea6db
Remove test output files
bocchino Mar 25, 2026
9d20b52
Add .gitignore file
bocchino Mar 25, 2026
dfcd449
Revise fpp version; update tests
bocchino Mar 25, 2026
f4ca689
Update tests
bocchino Mar 25, 2026
29682a1
Merge branch 'devel' into direct-ports-serial
bocchino Mar 25, 2026
1419828
Merge branch 'devel' into direct-ports-serial
bocchino Mar 26, 2026
1a78688
Update requirements
bocchino Mar 26, 2026
cf5c2b5
Update requirements
bocchino Mar 26, 2026
c7a7f23
Update requirements
bocchino Mar 26, 2026
7430ea1
Merge branch 'devel' into direct-ports-serial
bocchino Mar 26, 2026
7fc0a2f
Update fpp version
bocchino Mar 27, 2026
132dddd
Merge branch 'devel' into direct-ports-serial
bocchino Mar 30, 2026
33dc305
Update fpp version
bocchino Mar 30, 2026
58e09cc
Merge branch 'devel' into direct-ports-serial
bocchino Apr 6, 2026
6c8f1e8
Merge branch 'devel' into direct-ports-serial
bocchino Apr 6, 2026
e3118f5
Revise FPP config
bocchino Apr 9, 2026
5fbd17a
Merge branch 'devel' into direct-ports-serial
bocchino Apr 9, 2026
d5c6156
Update FPP version
bocchino Apr 10, 2026
afcb493
Fix header includes
bocchino Apr 10, 2026
f970680
Merge branch 'devel' into direct-port-calls
bocchino Apr 10, 2026
f0eae36
Revise FpConfig.h
bocchino Apr 10, 2026
8be09f3
Revise FP config
bocchino Apr 10, 2026
eed7efd
Revise Ref/Main.cpp
bocchino Apr 10, 2026
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
10 changes: 5 additions & 5 deletions FppTestProject/FppTest/component/active/test/ut/ActiveTestTester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ class ActiveTestTester : public ActiveTestGTestBase {
FppTest::Types::AliasStringArrayType arrayStringAliasReturnVal;

// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];
U8 stringData[InputStringArgsPort::SERIALIZED_SIZE];
U8 enumData[InputEnumArgsPort::SERIALIZED_SIZE];
U8 arrayData[InputArrayArgsPort::SERIALIZED_SIZE];
U8 structData[InputStructArgsPort::SERIALIZED_SIZE];
U8 primitiveData[PrimitiveArgsPortBuffer::CAPACITY];
U8 stringData[StringArgsPortBuffer::CAPACITY];
U8 enumData[EnumArgsPortBuffer::CAPACITY];
U8 arrayData[ArrayArgsPortBuffer::CAPACITY];
U8 structData[StructArgsPortBuffer::CAPACITY];
U8 serialData[SERIAL_ARGS_BUFFER_CAPACITY];

Fw::SerialBuffer primitiveBuf;
Expand Down
10 changes: 5 additions & 5 deletions FppTestProject/FppTest/component/passive/test/ut/PassiveTestTester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ class PassiveTestTester : public PassiveTestGTestBase {
FppTest::Types::AliasStringArrayType arrayStringAliasReturnVal;

// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];
U8 stringData[InputStringArgsPort::SERIALIZED_SIZE];
U8 enumData[InputEnumArgsPort::SERIALIZED_SIZE];
U8 arrayData[InputArrayArgsPort::SERIALIZED_SIZE];
U8 structData[InputStructArgsPort::SERIALIZED_SIZE];
U8 primitiveData[PrimitiveArgsPortBuffer::CAPACITY];
U8 stringData[StringArgsPortBuffer::CAPACITY];
U8 enumData[EnumArgsPortBuffer::CAPACITY];
U8 arrayData[ArrayArgsPortBuffer::CAPACITY];
U8 structData[StructArgsPortBuffer::CAPACITY];
U8 serialData[SERIAL_ARGS_BUFFER_CAPACITY];

Fw::SerialBuffer primitiveBuf;
Expand Down
10 changes: 5 additions & 5 deletions FppTestProject/FppTest/component/queued/test/ut/QueuedTestTester.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ class QueuedTestTester : public QueuedTestGTestBase {
FppTest::Types::AliasStringArrayType arrayStringAliasReturnVal;

// Buffers from serial output ports;
U8 primitiveData[InputPrimitiveArgsPort::SERIALIZED_SIZE];
U8 stringData[InputStringArgsPort::SERIALIZED_SIZE];
U8 enumData[InputEnumArgsPort::SERIALIZED_SIZE];
U8 arrayData[InputArrayArgsPort::SERIALIZED_SIZE];
U8 structData[InputStructArgsPort::SERIALIZED_SIZE];
U8 primitiveData[PrimitiveArgsPortBuffer::CAPACITY];
U8 stringData[StringArgsPortBuffer::CAPACITY];
U8 enumData[EnumArgsPortBuffer::CAPACITY];
U8 arrayData[ArrayArgsPortBuffer::CAPACITY];
U8 structData[StructArgsPortBuffer::CAPACITY];
U8 serialData[SERIAL_ARGS_BUFFER_CAPACITY];

Fw::SerialBuffer primitiveBuf;
Expand Down
10 changes: 5 additions & 5 deletions FppTestProject/FppTest/component/tests/PortTests.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
this->checkSerializeStatusBufferEmpty(); \
\
/* Check successful serialization */ \
U8 data[InputPrimitiveArgsPort::SERIALIZED_SIZE]; \
U8 data[PrimitiveArgsPortBuffer::CAPACITY]; \
Fw::SerialBuffer buf(data, sizeof(data)); \
\
status = buf.serializeFrom(port.args.val1); \
Expand Down Expand Up @@ -452,7 +452,7 @@
this->checkSerializeStatusBufferEmpty(); \
\
/* Check successful serialization */ \
U8 data[InputStringArgsPort::SERIALIZED_SIZE]; \
U8 data[StringArgsPortBuffer::CAPACITY]; \
Fw::SerialBuffer buf(data, sizeof(data)); \
\
status = buf.serializeFrom(port.args.val1); \
Expand Down Expand Up @@ -497,7 +497,7 @@
this->checkSerializeStatusBufferEmpty(); \
\
/* Check successful serialization */ \
U8 data[InputEnumArgsPort::SERIALIZED_SIZE]; \
U8 data[EnumArgsPortBuffer::CAPACITY]; \
Fw::SerialBuffer buf(data, sizeof(data)); \
\
status = buf.serializeFrom(port.args.val1); \
Expand Down Expand Up @@ -541,7 +541,7 @@
\
this->checkSerializeStatusBufferEmpty(); \
\
U8 data[InputArrayArgsPort::SERIALIZED_SIZE]; \
U8 data[ArrayArgsPortBuffer::CAPACITY]; \
Fw::SerialBuffer buf(data, sizeof(data)); \
\
status = buf.serializeFrom(port.args.val1); \
Expand Down Expand Up @@ -591,7 +591,7 @@
\
this->checkSerializeStatusBufferEmpty(); \
\
U8 data[InputStructArgsPort::SERIALIZED_SIZE]; \
U8 data[StructArgsPortBuffer::CAPACITY]; \
Fw::SerialBuffer buf(data, sizeof(data)); \
\
status = buf.serializeFrom(port.args.val1); \
Expand Down
2 changes: 2 additions & 0 deletions Ref/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// Used for command line argument processing
#include <getopt.h>
// Used for printf functions
#include <cstdio>
// Used for atoi
#include <cstdlib>
// Used to get the Os::Console
#include <Os/Os.hpp>
Expand Down
13 changes: 11 additions & 2 deletions default/config/FpConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,18 @@ extern "C" {
// Configuration switches
// ----------------------------------------------------------------------

// Direct port calls (TODO)
// Enable strict assertions
#ifndef FW_STRICT_ASSERTIONS
#define FW_STRICT_ASSERTIONS (1) //!< Indicates whether strict assertions are used (more checking, more instructions)
#endif

// Enable direct port calls
#ifndef FW_DIRECT_PORT_CALLS
#define FW_DIRECT_PORT_CALLS 0
#ifdef BUILD_UT
#define FW_DIRECT_PORT_CALLS (0) //!< Indirect port calls are required for unit tests
#else
#define FW_DIRECT_PORT_CALLS (1) //!< Indicates whether direct port calls are used (saves space and time)
#endif
#endif

// Allow objects to have names. Allocates storage for each instance
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Flask-Compress==1.15
Flask-RESTful==0.3.10
fprime-fpl-layout==1.0.4
fprime-fpl-write-pic==1.0.4
fprime-fpp==3.2.0
fprime-fpp==3.3.0a1
fprime-gds==4.2.0
fprime-tools==4.2.0
fprime-visual==1.0.2
Expand Down
Loading