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: "[\"cs-usersguide\"]"
       app-name: cs
-      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/cs
       prep: 'make prep; make -C build/tools/elf2cfetbl'
-      make: 'make -C build/native/default_cpu1/apps/cs'
-      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 cs)" sample_defs/targets.cmake
+      make: 'make -C build/native/default_cpu1/apps/cs'

.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: 'cs'

.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

@@ -11,8 +11,11 @@ on:
       - reopened
       - synchronize
   workflow_dispatch:
+  schedule:
+    # 9:25 PM UTC every Sunday
+    - cron:  '25 21 * * 0'
 
 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_cs_fcncode_values.h

@@ -29,7 +29,7 @@
 enum CS_FunctionCode
 {
     CS_FunctionCode_NOOP                            = 0,
-    CS_FunctionCode_RESET                           = 1,
+    CS_FunctionCode_RESET_COUNTERS                  = 1,
     CS_FunctionCode_ONE_SHOT                        = 2,
     CS_FunctionCode_CANCEL_ONE_SHOT                 = 3,
     CS_FunctionCode_ENABLE_ALL_CS                   = 4,

config/default_cs_msgdefs.h

@@ -39,8 +39,8 @@
  */
 typedef struct
 {
-    uint8 CmdCounter;    /**< \brief CS Application Command Counter */
-    uint8 CmdErrCounter; /**< \brief CS Application Command Error Counter */
+    uint8 CommandCounter;      /**< \brief CS Application Command Counter */
+    uint8 CommandErrorCounter; /**< \brief CS Application Command Error Counter */
 
     uint8 ChecksumState;  /**< \brief CS Application global checksum state */
     uint8 EepromCSState;  /**< \brief CS EEPROM table checksum state */

config/default_cs_msgstruct.h

@@ -56,7 +56,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -70,7 +70,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -79,12 +79,12 @@ typedef struct
 typedef struct
 {
     CFE_MSG_CommandHeader_t CommandHeader;
-} CS_ResetCmd_t;
+} CS_ResetCountersCmd_t;
 
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -98,7 +98,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -112,7 +112,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -126,7 +126,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -140,7 +140,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -154,7 +154,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -168,7 +168,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -182,7 +182,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -196,7 +196,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -210,7 +210,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -224,7 +224,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -238,7 +238,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -252,7 +252,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -266,7 +266,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -280,7 +280,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -294,7 +294,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -308,7 +308,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -322,7 +322,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -336,7 +336,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC
@@ -350,7 +350,7 @@ typedef struct
 /**
  * \brief No arguments command data type
  *
- *  For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC,
+ *  For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC,
  *  #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC,
  *  #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC,
  *  #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC

eds/cs.xml

@@ -54,8 +54,8 @@
 
       <ContainerDataType name="HkPacket_Payload">
         <EntryList>
-          <Entry type="BASE_TYPES/uint8" name="CmdCounter" shortDescription="CS Application Command Counter" />
-          <Entry type="BASE_TYPES/uint8" name="CmdErrCounter" shortDescription="CS Application Command Error Counter" />
+          <Entry type="BASE_TYPES/uint8" name="CommandCounter" shortDescription="CS Application Command Counter" />
+          <Entry type="BASE_TYPES/uint8" name="CommandErrorCounter" shortDescription="CS Application Command Error Counter" />
           <Entry type="ChecksumState" name="ChecksumState" shortDescription="CS Application global checksum state" />
           <Entry type="ChecksumState" name="EepromCSState" shortDescription="CS EEPROM table checksum state" />
           <Entry type="ChecksumState" name="MemoryCSState" shortDescription="CS Memory table checksum state" />
@@ -238,7 +238,7 @@
           <ValueConstraint entry="Sec.FunctionCode" value="0" />
         </ConstraintSet>
       </ContainerDataType>
-      <ContainerDataType name="ResetCmd" baseType="CMD">
+      <ContainerDataType name="ResetCountersCmd" baseType="CMD">
         <ConstraintSet>
           <ValueConstraint entry="Sec.FunctionCode" value="1" />
         </ConstraintSet>