Part #686, Update cFS Bundle for v7.0.1

.github/workflows/add-to-project.yml

@@ -0,0 +1,13 @@
+name: Add Issue or PR to Project
+
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, ready_for_review, converted_to_draft]
+
+jobs:
+  add-to-project:
+    name: Add issue or pull request to project
+    uses: nasa/cFS/.github/workflows/add-to-project-reusable.yml@dev
+    secrets: inherit

.github/workflows/build-documentation.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy Documentation
+name: Build Documentation
 
 on:
   push:
@@ -15,9 +15,8 @@ on:
 jobs:
   build-documentation:
     name: Build and deploy cFS documents
-    uses: nasa/cFS/.github/workflows/build-deploy-doc.yml@main
+    uses: nasa/cFS/.github/workflows/build-doc-reusable.yml@dev
     with:
       target: "[\"sc-usersguide\"]"
       app-name: sc
-      buildpdf: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
-      deploy: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
+      buildpdf: ${{ github.event_name == 'push' && (contains(github.ref, 'main') || contains(github.ref, 'dev')) }}

.github/workflows/build-run-app.yml

@@ -11,8 +11,11 @@ on:
       - reopened
       - synchronize
   workflow_dispatch:
+  schedule:
+    # 9:35 PM UTC every Sunday
+    - cron:  '35 21 * * 0'
 
 jobs:
   build-run:
     name: Build and run with startup msg verification
-    uses: nasa/cFS/.github/workflows/build-run-app.yml@main
+    uses: nasa/cFS/.github/workflows/build-run-app-reusable.yml@dev

.github/workflows/codeql-build.yml

@@ -15,11 +15,8 @@ on:
 jobs:
   codeql:
     name: Codeql Analysis
-    uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
+    uses: nasa/cFS/.github/workflows/codeql-reusable.yml@dev
     with:
       component-path: apps/sc
       prep: 'make prep; make -C build/tools/elf2cfetbl'
       make: 'make -C build/native/default_cpu1/apps/sc'
-      setup: |
-        cp ./cfe/cmake/Makefile.sample Makefile && cp -r ./cfe/cmake/sample_defs sample_defs
-        sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST sc)" sample_defs/targets.cmake

.github/workflows/format-check.yml

@@ -2,13 +2,18 @@ name: Format Check
 
 # Run on all push and pull requests
 on:
+  push:
+    branches:
+      - dev
+      - main
   pull_request:
     types:
       - opened
       - reopened
       - synchronize
+  workflow_dispatch:
 
 jobs:
   format-check:
     name: Run format check
-    uses: nasa/cFS/.github/workflows/format-check.yml@main
+    uses: nasa/cFS/.github/workflows/format-check.yml@dev

.github/workflows/mcdc.yml

@@ -0,0 +1,20 @@
+name: MCDC Analysis
+
+on:
+  push:
+    branches:
+      - dev
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  workflow_dispatch:
+
+jobs:
+  mcdc:
+    name: Run MCDC Analysis
+    uses: nasa/cFS/.github/workflows/mcdc-reusable.yml@dev
+    with:
+      app-name: 'sc'

.github/workflows/static-analysis.yml

@@ -15,7 +15,5 @@ on:
 
 jobs:
   static-analysis:
-    name: Run cppcheck
-    uses: nasa/cFS/.github/workflows/static-analysis.yml@main
-    with:
-      strict-dir-list: './fsw'
+    name: Static Analysis
+    uses: nasa/cFS/.github/workflows/app-static-analysis-reusable.yml@dev

.github/workflows/unit-test-coverage.yml

@@ -15,4 +15,4 @@ on:
 jobs:
   unit-test-coverage:
     name: Run unit test and coverage
-    uses: nasa/cFS/.github/workflows/unit-test-coverage.yml@main
+    uses: nasa/cFS/.github/workflows/unit-test-coverage-reusable.yml@dev

config/default_sc_msgdefs.h

@@ -150,7 +150,7 @@ typedef struct
 
     uint8 CmdErrCtr; /**< \brief Counts Request Errors */
     uint8 CmdCtr;    /**< \brief Counts Ground Requests */
-    uint8 Padding8;  /**< \brief Structure padding */
+    uint8 Padding1;  /**< \brief Structure padding */
 
     uint16           SwitchPendFlag;  /**< \brief Switch pending flag: 0 = NO, 1 = YES */
     uint16           NumRtsActive;    /**< \brief Number of RTSs currently active */
@@ -175,19 +175,21 @@ typedef struct
     uint32      NextRtsWakeupCnt;               /**< \brief Next RTS Command Absolute Wakeup Count */
     uint32      NextAtsTime;                    /**< \brief Next ATS Command Time (seconds) */
 
-    uint16 RtsExecutingStatus[(SC_NUMBER_OF_RTS + 15) / 16];
+    uint8 RtsExecutingStatusBits[(SC_NUMBER_OF_RTS + 7) / 8];
     /**< \brief RTS executing status bit map where each uint16 represents 16 RTS numbers.  Note: array
      index numbers and bit numbers use base zero indexing, but RTS numbers use base one indexing.  Thus,
      the LSB (bit zero) of uint16 array index zero represents RTS number 1, and bit one of uint16 array
      index zero represents RTS number 2, etc.  If an RTS is IDLE, then the corresponding bit is zero.
      If an RTS is EXECUTING, then the corresponding bit is one. */
 
-    uint16 RtsDisabledStatus[(SC_NUMBER_OF_RTS + 15) / 16];
+    uint8 RtsDisabledStatusBits[(SC_NUMBER_OF_RTS + 7) / 8];
     /**< \brief RTS disabled status bit map where each uint16 represents 16 RTS numbers.  Note: array
      index numbers and bit numbers use base zero indexing, but RTS numbers use base one indexing.  Thus,
      the LSB (bit zero) of uint16 array index zero represents RTS number 1, and bit one of uint16 array
      index zero represents RTS number 2, etc.  If an RTS is ENABLED, then the corresponding bit is zero.
      If an RTS is DISABLED, then the corresponding bit is one. */
+
+    uint8 Padding2[2];
 } SC_HkTlm_Payload_t;
 
 /**\}*/
@@ -229,7 +231,7 @@ typedef struct
 typedef struct
 {
     SC_AtsCont_Enum_t ContinueState; /**< \brief true or false, to continue ATS after a failure  */
-    uint16            Padding;       /**< \brief Structure Padding */
+    uint8             Padding[3];    /**< \brief Structure Padding */
 } SC_SetContinueAtsOnFailureCmd_Payload_t;
 
 /**

eds/sc.xml

@@ -146,20 +146,20 @@
           <Entry name="AtpFreeBytes" type="AtpFreeBytes"  shortDescription="Free Bytes in each ATS" />
           <Entry type="BASE_TYPES/uint32" name="NextRtsWakeupCnt" shortDescription="Next RTS Command Absolute Wakeup Count" />
           <Entry type="BASE_TYPES/uint32" name="NextAtsTime" shortDescription="Next ATS Command Time (seconds)" />
-          <Entry name="RtsExecutingStatus" type="RtsStatusBits"  shortDescription="RTS disabled status bit map">
+          <Entry name="RtsExecutingStatusBits" type="RtsStatusBits"  shortDescription="RTS disabled status bit map">
             <LongDescription>
-             Each BASE_TYPES/uint16 represents 16 RTS numbers.
+             Each entry represents 8 RTS numbers.  Note: array
              Note: array index numbers and bit numbers use base zero indexing, but RTS numbers use base one indexing.
-             Thus, the LSB (bit zero) of BASE_TYPES/uint16 array index zero represents RTS number 1, and bit one of BASE_TYPES/uint16
+             Thus, the LSB (bit zero) of uint8 array index zero represents RTS number 1, and bit one of uint8
              array index zero represents RTS number 2, etc.  If an RTS is ENABLED, then the corresponding bit is zero.
              If an RTS is DISABLED, then the corresponding bit is one.
             </LongDescription>
           </Entry>
-          <Entry name="RtsDisabledStatus" type="RtsStatusBits"  shortDescription="RTS executing status bit map">
+          <Entry name="RtsDisabledStatusBits" type="RtsStatusBits"  shortDescription="RTS executing status bit map">
             <LongDescription>
-             Each BASE_TYPES/uint16 represents 16 RTS numbers.  Note: array
+             Each entry represents 8 RTS numbers.  Note: array
              index numbers and bit numbers use base zero indexing, but RTS numbers use base one indexing.  Thus,
-             the LSB (bit zero) of BASE_TYPES/uint16 array index zero represents RTS number 1, and bit one of BASE_TYPES/uint16 array
+             the LSB (bit zero) of uint8 array index zero represents RTS number 1, and bit one of uint8 array
              index zero represents RTS number 2, etc.  If an RTS is IDLE, then the corresponding bit is zero.
              If an RTS is EXECUTING, then the corresponding bit is one.
             </LongDescription>
@@ -187,7 +187,7 @@
       <ContainerDataType name="ContinueAtsOnFailureCmd_Payload" shortDescription="Continue ATS on failure command Payload">
         <EntryList>
           <Entry type="AtsCont" name="ContinueState" shortDescription="true or false, to continue ATS after a failure" />
-          <PaddingEntry sizeInBits="16" />
+          <PaddingEntry sizeInBits="24" />
         </EntryList>
       </ContainerDataType>
       <ContainerDataType name="AppendAtsCmd_Payload" shortDescription="Append to ATS Command Payload">

fsw/inc/sc_fcncodes.h

@@ -157,7 +157,7 @@
  *
  *  \sa #SC_START_ATS_CC
  */
-#define SC_STOP_ATS_CC 3
+#define SC_STOP_ATS_CC  3
 
 /**
  * \brief Start an RTS