Fix #26, Adjust SAMPLE_APP to Work with an EDS Build and Default COSMOS

Packet Definition Files

Squashed commit of the following:

commit 0827b46280f3f99148f7fa876682784883fd07da
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Thu Mar 26 16:18:43 2026 -0400

    Fix #26, Clang format

commit f17fc02b33c4277ce2ec43330a604382c5ec2f71
Merge: 8ca95b9 c6e03b0
Author: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date:   Thu Mar 26 16:09:17 2026 -0400

    Merge branch 'jph-rename-tlm' into fix-26-make-sample-app-work-with-eds

commit c6e03b00a839e84d6a9e50f649defb6400c34979
Author: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date:   Thu Mar 26 14:51:40 2026 -0400

    Rename CommandCounters

commit 8ca95b9900389926ec8fa90d64eecd8151b7e95f
Author: Cameron Sykes <cameron.j.sykes@nasa.gov>
Date:   Wed Mar 11 14:32:34 2026 -0400

    Fix #26, Fix alignment on hk packet

Author: Cameron-Sykes

config/default_sample_app_msgdefs.h

@@ -43,7 +43,6 @@ typedef struct SAMPLE_APP_HkTlm_Payload
 {
     uint8 CommandCounter;
     uint8 CommandErrorCounter;
-    uint8 spare[2];
 } SAMPLE_APP_HkTlm_Payload_t;
 
 #endif

fsw/src/sample_app.h

@@ -50,8 +50,8 @@ typedef struct
     /*
     ** Command interface counters...
     */
-    uint8 CmdCounter;
-    uint8 ErrCounter;
+    uint8 CommandCounter;
+    uint8 CommandErrorCounter;
 
     /*
     ** Housekeeping telemetry packet...

fsw/src/sample_app_cmds.c

@@ -51,8 +51,8 @@ CFE_Status_t SAMPLE_APP_SendHkCmd(const SAMPLE_APP_SendHkCmd_t *Msg)
     /*
     ** Get command execution counters...
     */
-    SAMPLE_APP_Data.HkTlm.Payload.CommandErrorCounter = SAMPLE_APP_Data.ErrCounter;
-    SAMPLE_APP_Data.HkTlm.Payload.CommandCounter      = SAMPLE_APP_Data.CmdCounter;
+    SAMPLE_APP_Data.HkTlm.Payload.CommandErrorCounter = SAMPLE_APP_Data.CommandErrorCounter;
+    SAMPLE_APP_Data.HkTlm.Payload.CommandCounter      = SAMPLE_APP_Data.CommandCounter;
 
     /*
     ** Send housekeeping telemetry packet...
@@ -78,7 +78,7 @@ CFE_Status_t SAMPLE_APP_SendHkCmd(const SAMPLE_APP_SendHkCmd_t *Msg)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
 CFE_Status_t SAMPLE_APP_NoopCmd(const SAMPLE_APP_NoopCmd_t *Msg)
 {
-    SAMPLE_APP_Data.CmdCounter++;
+    SAMPLE_APP_Data.CommandCounter++;
 
     CFE_EVS_SendEvent(SAMPLE_APP_NOOP_INF_EID,
                       CFE_EVS_EventType_INFORMATION,
@@ -97,8 +97,8 @@ CFE_Status_t SAMPLE_APP_NoopCmd(const SAMPLE_APP_NoopCmd_t *Msg)
 /* * * * * * * * * * * * * * * * * * * * * * * *  * * * * * * *  * *  * * * * */
 CFE_Status_t SAMPLE_APP_ResetCountersCmd(const SAMPLE_APP_ResetCountersCmd_t *Msg)
 {
-    SAMPLE_APP_Data.CmdCounter = 0;
-    SAMPLE_APP_Data.ErrCounter = 0;
+    SAMPLE_APP_Data.CommandCounter      = 0;
+    SAMPLE_APP_Data.CommandErrorCounter = 0;
 
     CFE_EVS_SendEvent(SAMPLE_APP_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "SAMPLE: RESET command");
 
@@ -119,7 +119,7 @@ CFE_Status_t SAMPLE_APP_ProcessCmd(const SAMPLE_APP_ProcessCmd_t *Msg)
     const char                *TableName = "SAMPLE_APP.ExampleTable";
 
     /* Sample Use of Example Table */
-    SAMPLE_APP_Data.CmdCounter++;
+    SAMPLE_APP_Data.CommandCounter++;
     Status = CFE_TBL_GetAddress(&TblAddr, SAMPLE_APP_Data.TblHandles[0]);
     if (Status < CFE_SUCCESS)
     {
@@ -154,7 +154,7 @@ CFE_Status_t SAMPLE_APP_ProcessCmd(const SAMPLE_APP_ProcessCmd_t *Msg)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/
 CFE_Status_t SAMPLE_APP_DisplayParamCmd(const SAMPLE_APP_DisplayParamCmd_t *Msg)
 {
-    SAMPLE_APP_Data.CmdCounter++;
+    SAMPLE_APP_Data.CommandCounter++;
     CFE_EVS_SendEvent(SAMPLE_APP_VALUE_INF_EID,
                       CFE_EVS_EventType_INFORMATION,
                       "SAMPLE_APP: ValU32=%lu, ValI16=%d, ValStr=%s",

fsw/src/sample_app_dispatch.c

@@ -63,7 +63,7 @@ bool SAMPLE_APP_VerifyCmdLength(const CFE_MSG_Message_t *MsgPtr, size_t Expected
 
         result = false;
 
-        SAMPLE_APP_Data.ErrCounter++;
+        SAMPLE_APP_Data.CommandErrorCounter++;
     }
 
     return result;

fsw/src/sample_app_eds_dispatch.c

@@ -38,7 +38,7 @@
  * Define a lookup table for SAMPLE app command codes
  */
 /* clang-format off */
-static const EdsDispatchTable_EdsComponent_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE = 
+static const EdsDispatchTable_EdsComponent_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE =
 {
     .CMD =
     {
@@ -75,7 +75,7 @@ void SAMPLE_APP_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr)
         CFE_MSG_GetMsgId(&SBBufPtr->Msg, &MsgId);
         CFE_MSG_GetSize(&SBBufPtr->Msg, &MsgSize);
         CFE_MSG_GetFcnCode(&SBBufPtr->Msg, &MsgFc);
-        ++SAMPLE_APP_Data.ErrCounter;
+        ++SAMPLE_APP_Data.CommandErrorCounter;
 
         if (Status == CFE_STATUS_UNKNOWN_MSG_ID)
         {