Fix #240, make implicit padding in SAMPLE_APP_Data_t explicit and other small fixes

.github/pull_request_template.md

@@ -5,7 +5,7 @@ A clear and concise description of what the contribution is.
 **Testing performed**
 Steps taken to test the contribution:
 1. Build steps '...'
-1. Execution steps '...'
+2. Execution steps '...'
 
 **Expected behavior changes**
 A clear and concise description of how this contribution will change behavior and level of impact.

.github/workflows/codeql-build.yml

@@ -3,13 +3,12 @@ name: CodeQl Analysis
 on:
   push:
   pull_request:
-
 
 jobs:
   codeql:
     name: Codeql Analysis
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
-    with: 
+    with:
       component-path: apps/sample_app
       prep: 'make prep; make -C build/tools/elf2cfetbl'
       make: 'make -C build/native/default_cpu1/apps/sample_app'

.github/workflows/format-check.yml

@@ -9,4 +9,3 @@ jobs:
   format-check:
     name: Run format check
     uses: nasa/cFS/.github/workflows/format-check.yml@main
-

CMakeLists.txt

@@ -1,4 +1,5 @@
-project(CFE_SAMPLE_APP C)
+cmake_minimum_required(VERSION 3.5)
+project(CFS_SAMPLE_APP C)
 
 set(APP_SRC_FILES
   fsw/src/sample_app.c

config/default_sample_app_topicids.h

@@ -23,8 +23,8 @@
 #ifndef SAMPLE_APP_TOPICIDS_H
 #define SAMPLE_APP_TOPICIDS_H
 
-#define CFE_MISSION_SAMPLE_APP_CMD_TOPICID       0x82
-#define CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID   0x83
-#define CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID    0x83
+#define CFE_MISSION_SAMPLE_APP_CMD_TOPICID     0x82
+#define CFE_MISSION_SAMPLE_APP_SEND_HK_TOPICID 0x83
+#define CFE_MISSION_SAMPLE_APP_HK_TLM_TOPICID  0x83
 
 #endif

fsw/src/sample_app.h

@@ -52,6 +52,7 @@ typedef struct
     */
     uint8 CmdCounter;
     uint8 ErrCounter;
+    uint8 spare[2];
 
     /*
     ** Housekeeping telemetry packet...

fsw/src/sample_app_cmds.c

@@ -112,9 +112,9 @@ CFE_Status_t SAMPLE_APP_ResetCountersCmd(const SAMPLE_APP_ResetCountersCmd_t *Ms
 CFE_Status_t SAMPLE_APP_ProcessCmd(const SAMPLE_APP_ProcessCmd_t *Msg)
 {
     CFE_Status_t               Status;
-    void *                     TblAddr;
+    void                      *TblAddr;
     SAMPLE_APP_ExampleTable_t *TblPtr;
-    const char *               TableName = "SAMPLE_APP.ExampleTable";
+    const char                *TableName = "SAMPLE_APP.ExampleTable";
 
     /* Sample Use of Example Table */
     SAMPLE_APP_Data.CmdCounter++;

fsw/src/sample_app_eds_dispatch.c

@@ -39,9 +39,9 @@
  */
 static const EdsDispatchTable_SAMPLE_APP_Application_CFE_SB_Telecommand_t SAMPLE_TC_DISPATCH_TABLE = {
     .CMD     = {.NoopCmd_indication          = SAMPLE_APP_NoopCmd,
-            .ResetCountersCmd_indication = SAMPLE_APP_ResetCountersCmd,
-            .ProcessCmd_indication       = SAMPLE_APP_ProcessCmd,
-            .DisplayParamCmd_indication  = SAMPLE_APP_DisplayParamCmd},
+                .ResetCountersCmd_indication = SAMPLE_APP_ResetCountersCmd,
+                .ProcessCmd_indication       = SAMPLE_APP_ProcessCmd,
+                .DisplayParamCmd_indication  = SAMPLE_APP_DisplayParamCmd},
     .SEND_HK = {.indication = SAMPLE_APP_SendHkCmd}};
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * **/

fsw/src/sample_app_utils.c

@@ -59,7 +59,6 @@ CFE_Status_t SAMPLE_APP_TblValidationFunc(void *TblData)
 void SAMPLE_APP_GetCrc(const char *TableName)
 {
     CFE_Status_t   status;
-    uint32         Crc;
     CFE_TBL_Info_t TblInfoPtr;
 
     status = CFE_TBL_GetInfo(&TblInfoPtr, TableName);
@@ -69,7 +68,6 @@ void SAMPLE_APP_GetCrc(const char *TableName)
     }
     else
     {
-        Crc = TblInfoPtr.Crc;
-        CFE_ES_WriteToSysLog("Sample App: CRC: 0x%08lX\n\n", (unsigned long)Crc);
+        CFE_ES_WriteToSysLog("Sample App: CRC: 0x%08lX\n\n", (unsigned long)TblInfoPtr.Crc);
     }
 }

fsw/src/sample_app_version.h

@@ -27,17 +27,19 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER    54
-#define SAMPLE_APP_BUILD_BASELINE  "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
-#define SAMPLE_APP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
-#define SAMPLE_APP_BUILD_CODENAME  "Equuleus" /**< @brief: Development: Code name for the current build */
+#define SAMPLE_APP_BUILD_NUMBER 54
+#define SAMPLE_APP_BUILD_BASELINE \
+    "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
+#define SAMPLE_APP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle \
+                                                   */
+#define SAMPLE_APP_BUILD_CODENAME "Equuleus"      /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
  */
-#define SAMPLE_APP_MAJOR_VERSION 1  /*!< @brief Major version number. */
-#define SAMPLE_APP_MINOR_VERSION 1  /*!< @brief Minor version number. */
-#define SAMPLE_APP_REVISION      0  /*!< @brief Revision version number. Value of 0 indicates a development version.*/
+#define SAMPLE_APP_MAJOR_VERSION 1 /*!< @brief Major version number. */
+#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief Minor version number. */
+#define SAMPLE_APP_REVISION      0 /*!< @brief Revision version number. Value of 0 indicates a development version.*/
 
 /**
  * @brief Last official release.
@@ -65,9 +67,9 @@
 
 /**
  * @brief Max Version String length.
- * 
+ *
  * Maximum length that an OSAL version string can be.
- * 
+ *
  */
 #define SAMPLE_APP_CFG_MAX_VERSION_STR_LEN 256
 

unit-test/common/eventcheck.c

@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: coveragetest_sample_app.c
+** File: eventcheck.c
 **
 ** Purpose:
 ** Coverage Unit Test cases for the SAMPLE Application
@@ -52,7 +52,7 @@ static int32 UT_CheckEvent_Hook(void *UserObj, int32 StubRetcode, uint32 CallCou
 {
     UT_CheckEvent_t *State = UserObj;
     uint16           EventId;
-    const char *     Spec;
+    const char      *Spec;
 
     /*
      * The CFE_EVS_SendEvent stub passes the EventID as the

unit-test/coveragetest/coveragetest_sample_app_cmds.c

@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: coveragetest_sample_app.c
+** File: coveragetest_sample_app_cmds.c
 **
 ** Purpose:
 ** Coverage Unit Test cases for the SAMPLE Application
@@ -131,7 +131,7 @@ void Test_SAMPLE_APP_ProcessCmd(void)
      */
     SAMPLE_APP_ProcessCmd_t   TestMsg;
     SAMPLE_APP_ExampleTable_t TestTblData;
-    void *                    TblPtr = &TestTblData;
+    void                     *TblPtr = &TestTblData;
 
     memset(&TestTblData, 0, sizeof(TestTblData));
     memset(&TestMsg, 0, sizeof(TestMsg));

unit-test/coveragetest/coveragetest_sample_app_utils.c

@@ -17,7 +17,7 @@
  ************************************************************************/
 
 /*
-** File: coveragetest_sample_app.c
+** File: coveragetest_sample_app_utils.c
 **
 ** Purpose:
 ** Coverage Unit Test cases for the Sample Application