From 78869cca2a32ec63f0b4e44adfa6fd558eafae92 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 23:38:34 +0000 Subject: [PATCH] Update for nasa/fprime#5996: add pktType to FrameContext Sync the project ComCfg.fpp override with the FrameContext change merged in nasa/fprime#5996 (SppPacketType enum and pktType field), which Svc/Ccsds SpacePacketFramer/Deframer now require. Co-Authored-By: michael.d.starch --- config/FPrimeCfsConfig/ComCfg.fpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/FPrimeCfsConfig/ComCfg.fpp b/config/FPrimeCfsConfig/ComCfg.fpp index d63926b..90294c8 100644 --- a/config/FPrimeCfsConfig/ComCfg.fpp +++ b/config/FPrimeCfsConfig/ComCfg.fpp @@ -51,10 +51,17 @@ module ComCfg { @ Reserved SA index sentinel meaning "unset"; SA index 0xFFFF cannot be selected via context constant SaIndexUnset = 0xFFFF + @ Packet type in the Space Packet Primary Header + enum SppPacketType : U8 { + SPP_TELEMETRY = 0 @< Telemetry / data packet (downlink) + SPP_COMMAND = 1 @< Telecommand packet (uplink) + } default SPP_TELEMETRY + @ Type used to pass context info between components during framing/deframing struct FrameContext { comQueueIndex: FwIndexType @< Queue Index used by the ComQueue, other components shall not modify apid: Apid @< 11 bits APID in CCSDS + pktType: SppPacketType @< 1 bit packet type in space packet primary header hasSecHdr: bool @< Secondary header flag for SpacePacketFramer sequenceFlags: U8 @< 2 bit Sequence flags (0b00=continuation, 0b01=first, 0b10=last, 0b11=unsegmented) sequenceCount: U16 @< 14 bit Sequence count - sequence count is incremented per APID @@ -67,6 +74,7 @@ module ComCfg { } default { comQueueIndex = 0 apid = Apid.FW_PACKET_UNKNOWN + pktType = SppPacketType.SPP_TELEMETRY hasSecHdr = false sequenceFlags = 0x3 sequenceCount = 0