nasa
diff --git a/‎Fw/Com/ComPacket.hpp‎
Lines changed: 3 additions & 3 deletions b/‎Fw/Com/ComPacket.hpp‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Ref/test/int/ref_integration_test.py‎
Lines changed: 1 addition & 1 deletion b/‎Ref/test/int/ref_integration_test.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Svc/Ccsds/ApidManager/ApidManager.cpp‎
Lines changed: 5 additions & 5 deletions b/‎Svc/Ccsds/ApidManager/ApidManager.cpp‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎Svc/Ccsds/ApidManager/ApidManager.hpp‎
Lines changed: 14 additions & 14 deletions b/‎Svc/Ccsds/ApidManager/ApidManager.hpp‎
Lines changed: 14 additions & 14 deletions
diff --git a/‎Svc/Ccsds/ApidManager/test/ut/ApidManagerTester.cpp‎
Lines changed: 15 additions & 15 deletions b/‎Svc/Ccsds/ApidManager/test/ut/ApidManagerTester.cpp‎
Lines changed: 15 additions & 15 deletions
diff --git a/‎Svc/Ccsds/ApidManager/test/ut/ApidManagerTester.hpp‎
Lines changed: 5 additions & 5 deletions b/‎Svc/Ccsds/ApidManager/test/ut/ApidManagerTester.hpp‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎Svc/Ccsds/Ports/Ports.fpp‎
Lines changed: 1 addition & 1 deletion b/‎Svc/Ccsds/Ports/Ports.fpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Svc/Ccsds/SpacePacketDeframer/SpacePacketDeframer.cpp‎
Lines changed: 1 addition & 1 deletion b/‎Svc/Ccsds/SpacePacketDeframer/SpacePacketDeframer.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Svc/Ccsds/SpacePacketDeframer/test/ut/SpacePacketDeframerTester.cpp‎
Lines changed: 2 additions & 2 deletions b/‎Svc/Ccsds/SpacePacketDeframer/test/ut/SpacePacketDeframerTester.cpp‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎Svc/Ccsds/SpacePacketFramer/SpacePacketFramer.cpp‎
Lines changed: 1 addition & 1 deletion b/‎Svc/Ccsds/SpacePacketFramer/SpacePacketFramer.cpp‎
Lines changed: 1 addition & 1 deletion
@@ -9,15 +9,15 @@
 #define COMPACKET_HPP_
 
 #include <Fw/Types/Serializable.hpp>
-#include "config/APIDEnumAc.hpp"
+#include "config/ApidEnumAc.hpp"
 
 // Packet format:
-// |32-bit packet type|packet type-specific data|
+// | packet type (width = FwPacketDescriptorType) | packet type-specific data |
 
 namespace Fw {
 
 // This type is defined in config/ComCfg.fpp
-using ComPacketType = ComCfg::APID::T;
+using ComPacketType = ComCfg::Apid::T;
 
 class ComPacket : public Serializable {
   public:
 
@@ -276,7 +276,7 @@ def test_seqgen(fprime_test_api):
         subprocess.run(
             [
                 "fprime-seqgen",
-                "-d",
+                "--dictionary",
                 str(fprime_test_api.dictionaries.dictionary_path),
                 str(sequence),
                 "/tmp/ref_test_int.bin",
 
@@ -21,7 +21,7 @@ ApidManager ::ApidManager(const char* const compName) : ApidManagerComponentBase
 // Handler implementations for typed input ports
 // ----------------------------------------------------------------------
 
-U16 ApidManager ::validateApidSeqCountIn_handler(FwIndexType portNum, const ComCfg::APID& apid, U16 receivedSeqCount) {
+U16 ApidManager ::validateApidSeqCountIn_handler(FwIndexType portNum, const ComCfg::Apid& apid, U16 receivedSeqCount) {
     U16 expectedSequenceCount = this->getAndIncrementSeqCount(apid);
     if (receivedSeqCount != expectedSequenceCount && receivedSeqCount != SEQUENCE_COUNT_ERROR) {
         // Likely a packet was dropped or out of order
@@ -32,15 +32,15 @@ U16 ApidManager ::validateApidSeqCountIn_handler(FwIndexType portNum, const ComC
     return receivedSeqCount;
 }
 
-U16 ApidManager ::getApidSeqCountIn_handler(FwIndexType portNum, const ComCfg::APID& apid, U16 unused) {
+U16 ApidManager ::getApidSeqCountIn_handler(FwIndexType portNum, const ComCfg::Apid& apid, U16 unused) {
     return this->getAndIncrementSeqCount(apid);
 }
 
 // ----------------------------------------------------------------------
 // Helpers
 // ----------------------------------------------------------------------
 
-U16 ApidManager ::getAndIncrementSeqCount(ComCfg::APID::T apid) {
+U16 ApidManager ::getAndIncrementSeqCount(ComCfg::Apid::T apid) {
     U16 seqCount = SEQUENCE_COUNT_ERROR;  // Default to error value
     // Search the APID in the sequence table
     for (U16 i = 0; i < MAX_TRACKED_APIDS; i++) {
@@ -54,7 +54,7 @@ U16 ApidManager ::getAndIncrementSeqCount(ComCfg::APID::T apid) {
     }
     // If not found, search for an uninitialized entry to track this APID
     for (U16 i = 0; i < MAX_TRACKED_APIDS; i++) {
-        if (this->m_apidSequences[i].apid == ComCfg::APID::INVALID_UNINITIALIZED) {
+        if (this->m_apidSequences[i].apid == ComCfg::Apid::INVALID_UNINITIALIZED) {
             this->m_apidSequences[i].apid = apid;               // Initialize this entry with the new APID
             seqCount = this->m_apidSequences[i].sequenceCount;  // Entries default to 0 unless otherwise specified
             // Increment entry for next call
@@ -67,7 +67,7 @@ U16 ApidManager ::getAndIncrementSeqCount(ComCfg::APID::T apid) {
     return SEQUENCE_COUNT_ERROR;
 }
 
-void ApidManager::setNextSeqCount(ComCfg::APID::T apid, U16 seqCount) {
+void ApidManager::setNextSeqCount(ComCfg::Apid::T apid, U16 seqCount) {
     for (U16 i = 0; i < MAX_TRACKED_APIDS; i++) {
         if (this->m_apidSequences[i].apid == apid) {
             this->m_apidSequences[i].sequenceCount = seqCount;
 
@@ -14,28 +14,28 @@ namespace Svc {
 
 namespace Ccsds {
 
-static_assert(ComCfg::APID::SPP_IDLE_PACKET == 0x07FF,
+static_assert(ComCfg::Apid::SPP_IDLE_PACKET == 0x07FF,
               "SPP_IDLE_PACKET must exist and equal 0x07FF (as specified by standard)");
-static_assert(ComCfg::APID::INVALID_UNINITIALIZED == 0x0800,
+static_assert(ComCfg::Apid::INVALID_UNINITIALIZED == 0x0800,
               "Invalid APID must be 0x0800 (11 bits values allow 0-2047)");
-static_assert(ComCfg::APID::FW_PACKET_COMMAND == Fw::ComPacketType::FW_PACKET_COMMAND,
+static_assert(ComCfg::Apid::FW_PACKET_COMMAND == Fw::ComPacketType::FW_PACKET_COMMAND,
               "APID FW_PACKET_COMMAND must exist, used by the Framework");
-static_assert(ComCfg::APID::FW_PACKET_TELEM == Fw::ComPacketType::FW_PACKET_TELEM,
+static_assert(ComCfg::Apid::FW_PACKET_TELEM == Fw::ComPacketType::FW_PACKET_TELEM,
               "APID FW_PACKET_TELEM must exist, used by the Framework");
-static_assert(ComCfg::APID::FW_PACKET_LOG == Fw::ComPacketType::FW_PACKET_LOG,
+static_assert(ComCfg::Apid::FW_PACKET_LOG == Fw::ComPacketType::FW_PACKET_LOG,
               "APID FW_PACKET_LOG must exist, used by the Framework");
-static_assert(ComCfg::APID::FW_PACKET_FILE == Fw::ComPacketType::FW_PACKET_FILE,
+static_assert(ComCfg::Apid::FW_PACKET_FILE == Fw::ComPacketType::FW_PACKET_FILE,
               "APID FW_PACKET_FILE must exist, used by the Framework");
-static_assert(ComCfg::APID::FW_PACKET_PACKETIZED_TLM == Fw::ComPacketType::FW_PACKET_PACKETIZED_TLM,
+static_assert(ComCfg::Apid::FW_PACKET_PACKETIZED_TLM == Fw::ComPacketType::FW_PACKET_PACKETIZED_TLM,
               "APID FW_PACKET_PACKETIZED_TLM must exist, used by the Framework");
-static_assert(ComCfg::APID::FW_PACKET_UNKNOWN == Fw::ComPacketType::FW_PACKET_UNKNOWN,
+static_assert(ComCfg::Apid::FW_PACKET_UNKNOWN == Fw::ComPacketType::FW_PACKET_UNKNOWN,
               "APID FW_PACKET_UNKNOWN must exist, used by the Framework");
 
 class ApidManager final : public ApidManagerComponentBase {
     friend class ApidManagerTester;  //!< Friend class for testing
 
   public:
-    static constexpr U16 MAX_TRACKED_APIDS = ComCfg::APID::NUM_CONSTANTS;
+    static constexpr U16 MAX_TRACKED_APIDS = ComCfg::Apid::NUM_CONSTANTS;
     static constexpr U16 SEQUENCE_COUNT_ERROR = std::numeric_limits<U16>::max();
     // ----------------------------------------------------------------------
     // Component construction and destruction
@@ -55,12 +55,12 @@ class ApidManager final : public ApidManagerComponentBase {
 
     //! Handler implementation for validateApidSeqCountIn
     U16 validateApidSeqCountIn_handler(FwIndexType portNum,  //!< The port number
-                                       const ComCfg::APID& apid,
+                                       const ComCfg::Apid& apid,
                                        U16 seqCount) override;
 
     //! Handler implementation for validateApidSeqCountIn
     U16 getApidSeqCountIn_handler(FwIndexType portNum,  //!< The port number
-                                  const ComCfg::APID& apid,
+                                  const ComCfg::Apid& apid,
                                   U16 seqCount) override;
 
   private:
@@ -69,15 +69,15 @@ class ApidManager final : public ApidManagerComponentBase {
     // ----------------------------------------------------------------------
     //! Get the sequence count for a given APID and increment it for the next
     //! Wraps around at 14 bits
-    U16 getAndIncrementSeqCount(ComCfg::APID::T apid);
+    U16 getAndIncrementSeqCount(ComCfg::Apid::T apid);
 
     //! Set the next expected sequence count for a given APID
-    void setNextSeqCount(ComCfg::APID::T apid, U16 seqCount);
+    void setNextSeqCount(ComCfg::Apid::T apid, U16 seqCount);
 
     //! This struct helps track sequence counts per APID
     //! Future work: update to using a map from Fw/DataStructures when available
     struct ApidSequenceEntry {
-        ComCfg::APID::T apid = ComCfg::APID::INVALID_UNINITIALIZED;
+        ComCfg::Apid::T apid = ComCfg::Apid::INVALID_UNINITIALIZED;
         U16 sequenceCount = 0;
     };
 
 
@@ -12,9 +12,9 @@ namespace Svc {
 
 namespace Ccsds {
 
-static constexpr ComCfg::APID::T TEST_REGISTERED_APIDS[] = {ComCfg::APID::FW_PACKET_COMMAND,
-                                                            ComCfg::APID::FW_PACKET_TELEM, ComCfg::APID::FW_PACKET_LOG,
-                                                            ComCfg::APID::FW_PACKET_FILE};
+static constexpr ComCfg::Apid::T TEST_REGISTERED_APIDS[] = {ComCfg::Apid::FW_PACKET_COMMAND,
+                                                            ComCfg::Apid::FW_PACKET_TELEM, ComCfg::Apid::FW_PACKET_LOG,
+                                                            ComCfg::Apid::FW_PACKET_FILE};
 
 // ----------------------------------------------------------------------
 // Construction and destruction
@@ -43,7 +43,7 @@ bool ApidManagerTester::GetExistingSeqCount::precondition(const ApidManagerTeste
 
 void ApidManagerTester::GetExistingSeqCount::action(ApidManagerTester& testerState) {
     testerState.clearHistory();
-    ComCfg::APID::T apid = testerState.shadow_getRandomTrackedApid();
+    ComCfg::Apid::T apid = testerState.shadow_getRandomTrackedApid();
     U16 seqCount = testerState.invoke_to_getApidSeqCountIn(0, apid, 0);
     U16 shadowSeqCount = testerState.shadow_getAndIncrementSeqCount(apid);
     ASSERT_EQ(seqCount, shadowSeqCount) << "Sequence count for APID " << static_cast<U16>(apid)
@@ -65,7 +65,7 @@ void ApidManagerTester::GetNewSeqCountOk::action(ApidManagerTester& testerState)
         return;  // Cannot get new sequence count if table is full - skip action
     }
 
-    ComCfg::APID::T apid = testerState.shadow_getRandomUntrackedApid();
+    ComCfg::Apid::T apid = testerState.shadow_getRandomUntrackedApid();
     U16 seqCount = testerState.invoke_to_getApidSeqCountIn(0, apid, 0);
     U16 shadowSeqCount = testerState.shadow_getAndIncrementSeqCount(apid);
     ASSERT_EQ(seqCount, shadowSeqCount) << "Sequence count for APID " << static_cast<U16>(apid)
@@ -79,7 +79,7 @@ bool ApidManagerTester::GetNewSeqCountTableFull::precondition(const ApidManagerT
 
 void ApidManagerTester::GetNewSeqCountTableFull::action(ApidManagerTester& testerState) {
     testerState.clearHistory();
-    ComCfg::APID::T apid = testerState.shadow_getRandomUntrackedApid();
+    ComCfg::Apid::T apid = testerState.shadow_getRandomUntrackedApid();
     U16 seqCount = testerState.invoke_to_getApidSeqCountIn(0, apid, 0);
     // Use local constexpr to potentially avoid ODR-use of ApidManager::SEQUENCE_COUNT_ERROR
     constexpr U16 sequenceCountErrorVal = ApidManager::SEQUENCE_COUNT_ERROR;
@@ -95,7 +95,7 @@ bool ApidManagerTester::ValidateSeqCountOk::precondition(const ApidManagerTester
 
 void ApidManagerTester::ValidateSeqCountOk::action(ApidManagerTester& testerState) {
     testerState.clearHistory();
-    ComCfg::APID::T apid = testerState.shadow_getRandomTrackedApid();
+    ComCfg::Apid::T apid = testerState.shadow_getRandomTrackedApid();
     U16 shadow_expectedSeqCount = testerState.shadow_seqCounts[apid];
     testerState.invoke_to_validateApidSeqCountIn(0, apid, shadow_expectedSeqCount);
     testerState.shadow_validateApidSeqCount(apid, shadow_expectedSeqCount);  // keep shadow state in sync
@@ -109,7 +109,7 @@ bool ApidManagerTester::ValidateSeqCountFailure::precondition(const ApidManagerT
 
 void ApidManagerTester::ValidateSeqCountFailure::action(ApidManagerTester& testerState) {
     testerState.clearHistory();
-    ComCfg::APID::T apid = testerState.shadow_getRandomTrackedApid();
+    ComCfg::Apid::T apid = testerState.shadow_getRandomTrackedApid();
     U16 shadow_expectedSeqCount = testerState.shadow_seqCounts.at(apid);
     U16 invalidSeqCount = static_cast<U16>(
         (shadow_expectedSeqCount + 1) %
@@ -128,7 +128,7 @@ void ApidManagerTester::ValidateSeqCountFailure::action(ApidManagerTester& teste
 // Helpers
 // ----------------------------------------------------------------------
 
-U16 ApidManagerTester::shadow_getAndIncrementSeqCount(ComCfg::APID::T apid) {
+U16 ApidManagerTester::shadow_getAndIncrementSeqCount(ComCfg::Apid::T apid) {
     // This is a shadow function to simulate the getAndIncrementSeqCount behavior
     // without modifying the actual component state.
     auto found = this->shadow_seqCounts.find(apid);
@@ -147,27 +147,27 @@ U16 ApidManagerTester::shadow_getAndIncrementSeqCount(ComCfg::APID::T apid) {
     return this->component.SEQUENCE_COUNT_ERROR;  // Return error if APID not found
 }
 
-void ApidManagerTester::shadow_validateApidSeqCount(ComCfg::APID::T apid, U16 expectedSeqCount) {
+void ApidManagerTester::shadow_validateApidSeqCount(ComCfg::Apid::T apid, U16 expectedSeqCount) {
     // This simply updates the shadow state to the next expected sequence count
     auto found = this->shadow_seqCounts.find(apid);
     if (found != this->shadow_seqCounts.end()) {
         found->second = static_cast<U16>((expectedSeqCount + 1) % (1 << SpacePacketSubfields::SeqCountWidth));
     }
 }
 
-ComCfg::APID::T ApidManagerTester::shadow_getRandomTrackedApid() {
+ComCfg::Apid::T ApidManagerTester::shadow_getRandomTrackedApid() {
     // Select a random APID from the sequence counts map
     U32 mapSize = static_cast<U32>(this->shadow_seqCounts.size());
     U32 randomIndex = STest::Random::lowerUpper(0, mapSize - 1);
-    ComCfg::APID apid = std::next(this->shadow_seqCounts.begin(), randomIndex)->first;
+    ComCfg::Apid apid = std::next(this->shadow_seqCounts.begin(), randomIndex)->first;
     return apid;
 }
 
-ComCfg::APID::T ApidManagerTester::shadow_getRandomUntrackedApid() {
+ComCfg::Apid::T ApidManagerTester::shadow_getRandomUntrackedApid() {
     // Select a random APID that is not currently tracked
-    ComCfg::APID::T apid;
+    ComCfg::Apid::T apid;
     do {
-        apid = static_cast<ComCfg::APID::T>(STest::Random::lowerUpper(10, ComCfg::APID::SPP_IDLE_PACKET));
+        apid = static_cast<ComCfg::Apid::T>(STest::Random::lowerUpper(10, ComCfg::Apid::SPP_IDLE_PACKET));
     } while (this->shadow_seqCounts.find(apid) != this->shadow_seqCounts.end());
     return apid;
 }
 
@@ -59,20 +59,20 @@ class ApidManagerTester : public ApidManagerGTestBase {
     ApidManager component;
 
     // Shadow test state
-    std::map<ComCfg::APID::T, U16> shadow_seqCounts;  //!< Map to hold expected sequence counts for APIDs
+    std::map<ComCfg::Apid::T, U16> shadow_seqCounts;  //!< Map to hold expected sequence counts for APIDs
     bool shadow_isTableFull = false;
 
     // ----------------------------------------------------------------------
     // Helpers for tracking the shadow test state
     // ----------------------------------------------------------------------
 
-    U16 shadow_getAndIncrementSeqCount(ComCfg::APID::T apid);
+    U16 shadow_getAndIncrementSeqCount(ComCfg::Apid::T apid);
 
-    void shadow_validateApidSeqCount(ComCfg::APID::T apid, U16 expectedSeqCount);
+    void shadow_validateApidSeqCount(ComCfg::Apid::T apid, U16 expectedSeqCount);
 
-    ComCfg::APID::T shadow_getRandomTrackedApid();
+    ComCfg::Apid::T shadow_getRandomTrackedApid();
 
-    ComCfg::APID::T shadow_getRandomUntrackedApid();
+    ComCfg::Apid::T shadow_getRandomUntrackedApid();
 
     // ----------------------------------------------------------------------
     // Tests: Rule Based Testing
 
@@ -2,7 +2,7 @@ module Svc {
 module Ccsds {
 
     @ Port for requesting a sequence count for a given APID
-    port ApidSequenceCount (apid: ComCfg.APID, sequenceCount: U16) -> U16
+    port ApidSequenceCount (apid: ComCfg.Apid, sequenceCount: U16) -> U16
 
 }
 }
@@ -57,7 +57,7 @@ void SpacePacketDeframer ::dataIn_handler(FwIndexType portNum, Fw::Buffer& data,
     }
 
     U16 apidValue = header.get_packetIdentification() & SpacePacketSubfields::ApidMask;
-    ComCfg::APID::T apid = static_cast<ComCfg::APID::T>(apidValue);
+    ComCfg::Apid::T apid = static_cast<ComCfg::Apid::T>(apidValue);
     ComCfg::FrameContext contextCopy = context;
     contextCopy.set_apid(apid);
 
 
@@ -41,7 +41,7 @@ void SpacePacketDeframerTester ::testDataReturnPassthrough() {
 }
 
 void SpacePacketDeframerTester ::testNominalDeframing() {
-    ComCfg::APID::T apid = static_cast<ComCfg::APID::T>(STest::Random::lowerUpper(0, 0x7FF));  // random 11 bit APID
+    ComCfg::Apid::T apid = static_cast<ComCfg::Apid::T>(STest::Random::lowerUpper(0, 0x7FF));  // random 11 bit APID
     U16 seqCount = static_cast<U8>(STest::Random::lowerUpper(0, 0x3FFF));  // random 14 bit sequence count
     U16 dataLength =
         static_cast<U8>(STest::Random::lowerUpper(1, MAX_TEST_PACKET_DATA_SIZE));  // bytes of data, random length
@@ -72,7 +72,7 @@ void SpacePacketDeframerTester ::testNominalDeframing() {
 }
 
 void SpacePacketDeframerTester ::testDeframingIncorrectLength() {
-    ComCfg::APID::T apid = static_cast<ComCfg::APID::T>(STest::Random::lowerUpper(0, 0x7FF));  // random 11 bit APID
+    ComCfg::Apid::T apid = static_cast<ComCfg::Apid::T>(STest::Random::lowerUpper(0, 0x7FF));  // random 11 bit APID
     U16 seqCount = static_cast<U8>(STest::Random::lowerUpper(0, 0x3FFF));  // random 14 bit sequence count
     U16 realDataLength =
         static_cast<U8>(STest::Random::lowerUpper(1, MAX_TEST_PACKET_DATA_SIZE));  // bytes of data, random length
 
@@ -44,7 +44,7 @@ void SpacePacketFramer ::dataIn_handler(FwIndexType portNum, Fw::Buffer& data, c
     // PVN is always 0 per Standard - Packet Type is 0 for Telemetry (downlink) - SecHdr flag is 0 for no secondary
     // header
     U16 packetIdentification = 0;
-    ComCfg::APID::T apid = context.get_apid();
+    ComCfg::Apid::T apid = context.get_apid();
     FW_ASSERT((apid >> SpacePacketSubfields::ApidWidth) == 0,
               static_cast<FwAssertArgType>(apid));  // apid must fit in 11 bits
     packetIdentification |= static_cast<U16>(apid) & static_cast<U16>(SpacePacketSubfields::ApidMask);  // 11 bit APID
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ def test_seqgen(fprime_test_api):`
`276`	`276`	`subprocess.run(`
`277`	`277`	`[`
`278`	`278`	`"fprime-seqgen",`
`279`		`- "-d",`
	`279`	`+ "--dictionary",`
`280`	`280`	`str(fprime_test_api.dictionaries.dictionary_path),`
`281`	`281`	`str(sequence),`
`282`	`282`	`"/tmp/ref_test_int.bin",`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ module Svc {`
`2`	`2`	`module Ccsds {`
`3`	`3`
`4`	`4`	`@ Port for requesting a sequence count for a given APID`
`5`		`- port ApidSequenceCount (apid: ComCfg.APID, sequenceCount: U16) -> U16`
	`5`	`+ port ApidSequenceCount (apid: ComCfg.Apid, sequenceCount: U16) -> U16`
`6`	`6`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ void SpacePacketDeframer ::dataIn_handler(FwIndexType portNum, Fw::Buffer& data,`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`U16 apidValue = header.get_packetIdentification() & SpacePacketSubfields::ApidMask;`
`60`		`- ComCfg::APID::T apid = static_cast<ComCfg::APID::T>(apidValue);`
	`60`	`+ ComCfg::Apid::T apid = static_cast<ComCfg::Apid::T>(apidValue);`
`61`	`61`	`ComCfg::FrameContext contextCopy = context;`
`62`	`62`	`contextCopy.set_apid(apid);`
`63`	`63`