Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
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
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
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
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
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
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
9 changes: 7 additions & 2 deletions default/config/FpConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ 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

Comment thread
bocchino marked this conversation as resolved.
// Enable direct port calls
#ifndef FW_DIRECT_PORT_CALLS
#define FW_DIRECT_PORT_CALLS 0
#define FW_DIRECT_PORT_CALLS (0) //!< Indicates whether direct port calls are used (saves space and time)
#endif
Comment thread
bocchino marked this conversation as resolved.
Outdated

// Allow objects to have names. Allocates storage for each instance
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
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