Bump F Prime commit

config-samd-reference/CMakeLists.txt

@@ -31,6 +31,7 @@ register_fprime_config(
         # --- overrides lib/fprime/default/config ---
         "${CMAKE_CURRENT_LIST_DIR}/AcConstants.fpp"
         "${CMAKE_CURRENT_LIST_DIR}/ComCfg.fpp"
+        "${CMAKE_CURRENT_LIST_DIR}/FpConfig.fpp"
         "${CMAKE_CURRENT_LIST_DIR}/FpConstants.fpp"
         ${PLATFORM_CFG_OVERRIDE}
         "${CMAKE_CURRENT_LIST_DIR}/FpConfig.h"

config-samd-reference/CommandDispatcherImplCfg.hpp

@@ -30,6 +30,10 @@ constexpr FwOpcodeType getEventOpcode(const FwOpcodeType opcode) {
     return IncludeCommandOpcodesInEvents ? opcode : std::numeric_limits<FwOpcodeType>::max();
 }
 
+//! Default for whether a sequence command is dispatched when the sequence tracker table is full.
+//! Per-instance override: CommandDispatcherImpl::configure(bool).
+constexpr bool EXECUTE_WHEN_SEQUENCE_TABLE_FULL_DEFAULT = false;
+
 }  // namespace CmdDispatcherCfg
 }  // namespace Svc
 

config-samd-reference/FpConfig.fpp

@@ -0,0 +1,89 @@
+# ======================================================================
+# \title  config-samd-reference/FpConfig.fpp
+# \brief  FPP alias configuration file
+# ======================================================================
+
+####
+# Integer type aliases:
+# Used for the project to override types supplied by the platform for things like sizes, indices, etc.
+####
+
+@ The unsigned type of larger sizes internal to the software,
+@ e.g., memory buffer sizes, file sizes. Must be unsigned.
+type FwSizeType = PlatformSizeType
+
+@ The signed type of larger sizes internal to the software, used
+@ for signed offsets, e.g., file seek offsets. Must be signed.
+type FwSignedSizeType = PlatformSignedSizeType
+
+@ The type of smaller indices internal to the software, used
+@ for array indices, e.g., port indices. Must be signed.
+type FwIndexType = PlatformIndexType
+
+@ The type of arguments to assert functions.
+type FwAssertArgType = PlatformAssertArgType
+
+@ The type of task priorities used.
+type FwTaskPriorityType = PlatformTaskPriorityType
+
+@ The type of queue priorities used.
+type FwQueuePriorityType = PlatformQueuePriorityType
+
+@ The id type.
+type FwIdType = U32
+
+@ The type of task identifiers used.
+type FwTaskIdType = PlatformTaskIdType
+
+####
+# GDS type aliases:
+# Used for the project to override types shared with GDSes and other remote systems.
+####
+
+@ The type of a telemetry channel identifier
+dictionary type FwChanIdType = FwIdType
+
+@ The type of a data product identifier
+type FwDpIdType = FwIdType
+
+@ The type of a data product priority
+type FwDpPriorityType = U32
+
+@ The type of an event identifier
+dictionary type FwEventIdType = FwIdType
+
+@ The type of a command opcode
+dictionary type FwOpcodeType = FwIdType
+
+@ The type of a parameter identifier
+type FwPrmIdType = FwIdType
+
+@ The type used to serialize a size value.
+@ Note: fixed at U16 rather than the F Prime default (an alias of FwSizeType, i.e.
+@ PlatformSizeType).
+dictionary type FwSizeStoreType = U16
+
+@ The type used to serialize a time context value
+dictionary type FwTimeContextStoreType = U8
+
+@ The type of a telemetry packet identifier
+type FwTlmPacketizeIdType = U16
+
+@ The type of a trace identifier
+type FwTraceIdType = U32
+
+@ The type used to serialize a C++ enumeration constant
+@ FPP enumerations are serialized according to their representation types
+type FwEnumStoreType = I32
+
+@ The type used to serialize a time base value
+type FwTimeBaseStoreType = U16
+
+@ Define enumeration for Time base types
+dictionary enum TimeBase : FwTimeBaseStoreType {
+    TB_NONE = 0              @< No time base has been established (Required)
+    TB_PROC_TIME = 1         @< Indicates time is processor cycle time. Not tied to external time
+    TB_WORKSTATION_TIME = 2  @< Time as reported on workstation where software is running. For testing. (Required)
+    TB_SC_TIME = 3,          @< Time as reported by the spacecraft clock.
+    TB_DONT_CARE = 0xFFFF    @< Don't care value for sequences. If FwTimeBaseStoreType is changed, value should be changed (Required)
+} default TB_NONE;