Skip to content

Commit a778ce4

Browse files
dzbakerdzbaker
authored
Merge pull request #486 from nasa/dev
Part #686, Update cFS Bundle for v7.0.1
2 parents 92baf07 + c96a832 commit a778ce4

70 files changed

Lines changed: 2446 additions & 1375 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Add Issue or PR to Project
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
pull_request_target:
7+
types: [opened, ready_for_review, converted_to_draft]
8+
9+
jobs:
10+
add-to-project:
11+
name: Add issue or pull request to project
12+
uses: nasa/cFS/.github/workflows/add-to-project-reusable.yml@dev
13+
secrets: inherit

‎.github/workflows/build-documentation.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Deploy Documentation
1+
name: Build Documentation
22

33
on:
44
push:
@@ -15,9 +15,8 @@ on:
1515
jobs:
1616
build-documentation:
1717
name: Build and deploy cFS documents
18-
uses: nasa/cFS/.github/workflows/build-deploy-doc.yml@main
18+
uses: nasa/cFS/.github/workflows/build-doc-reusable.yml@dev
1919
with:
2020
target: "[\"cf-usersguide\"]"
2121
app-name: cf
22-
buildpdf: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
23-
deploy: ${{ github.event_name == 'push' && contains(github.ref, 'main')}}
22+
buildpdf: ${{ github.event_name == 'push' && (contains(github.ref, 'main') || contains(github.ref, 'dev')) }}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ on:
1111
- reopened
1212
- synchronize
1313
workflow_dispatch:
14+
schedule:
15+
# 9:35 PM UTC every Sunday
16+
- cron: '35 21 * * 0'
1417

1518
jobs:
1619
build-run:
1720
name: Build and run with startup msg verification
18-
uses: nasa/cFS/.github/workflows/build-run-app.yml@main
21+
uses: nasa/cFS/.github/workflows/build-run-app-reusable.yml@dev

‎.github/workflows/codeql-build.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ on:
1515
jobs:
1616
codeql:
1717
name: Codeql Analysis
18-
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
18+
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@dev
1919
with:
2020
component-path: apps/cf
2121
prep: 'make prep; make -C build/tools/elf2cfetbl'
22-
make: 'make -C build/native/default_cpu1/apps/cf'
23-
setup: |
24-
cp ./cfe/cmake/Makefile.sample Makefile && cp -r ./cfe/cmake/sample_defs sample_defs
25-
sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST cf)" sample_defs/targets.cmake
22+
make: 'make -C build/native/default_cpu1/apps/cf'

‎.github/workflows/format-check.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@ name: Format Check
22

33
# Run on all push and pull requests
44
on:
5+
push:
6+
branches:
7+
- dev
8+
- main
59
pull_request:
610
types:
711
- opened
812
- reopened
913
- synchronize
14+
workflow_dispatch:
1015

1116
jobs:
1217
format-check:
1318
name: Run format check
14-
uses: nasa/cFS/.github/workflows/format-check.yml@main
19+
uses: nasa/cFS/.github/workflows/format-check.yml@dev

‎.github/workflows/mcdc.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: MCDC Analysis
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
- main
8+
pull_request:
9+
types:
10+
- opened
11+
- reopened
12+
- synchronize
13+
workflow_dispatch:
14+
15+
jobs:
16+
mcdc:
17+
name: Run MCDC Analysis
18+
uses: nasa/cFS/.github/workflows/mcdc-reusable.yml@dev
19+
with:
20+
app-name: 'cf'

‎.github/workflows/static-analysis.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ on:
1515

1616
jobs:
1717
static-analysis:
18-
name: Run cppcheck
19-
uses: nasa/cFS/.github/workflows/static-analysis.yml@main
20-
with:
21-
strict-dir-list: './fsw'
18+
name: Static Analysis
19+
uses: nasa/cFS/.github/workflows/app-static-analysis-reusable.yml@dev

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ on:
1111
- reopened
1212
- synchronize
1313
workflow_dispatch:
14+
schedule:
15+
# 9:25 PM UTC every Sunday
16+
- cron: '25 21 * * 0'
1417

1518
jobs:
1619
unit-test-coverage:
1720
name: Run unit test and coverage
18-
uses: nasa/cFS/.github/workflows/unit-test-coverage.yml@main
21+
uses: nasa/cFS/.github/workflows/unit-test-coverage-reusable.yml@dev

‎config/default_cf_fcncode_values.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@
3333
* Macro Definitions
3434
************************************************************************/
3535

36-
#define CF_CCVAL(x) CF_FunctionCode_##x
36+
#define CF_CCVAL(x) CF_FunctionCode_##x
3737

38-
enum CF_FunctionCode_
39-
{
40-
CF_FunctionCode_NOOP = 0,
41-
CF_FunctionCode_RESET_COUNTERS = 1,
42-
CF_FunctionCode_TX_FILE = 2,
43-
CF_FunctionCode_PLAYBACK_DIR = 3,
44-
CF_FunctionCode_FREEZE = 4,
45-
CF_FunctionCode_THAW = 5,
46-
CF_FunctionCode_SUSPEND = 6,
47-
CF_FunctionCode_RESUME = 7,
48-
CF_FunctionCode_CANCEL = 8,
49-
CF_FunctionCode_ABANDON = 9,
50-
CF_FunctionCode_SET_PARAM = 10,
51-
CF_FunctionCode_GET_PARAM = 11,
52-
CF_FunctionCode_WRITE_QUEUE = 15,
53-
CF_FunctionCode_ENABLE_DEQUEUE = 16,
54-
CF_FunctionCode_DISABLE_DEQUEUE = 17,
55-
CF_FunctionCode_ENABLE_DIR_POLLING = 18,
56-
CF_FunctionCode_DISABLE_DIR_POLLING = 19,
57-
CF_FunctionCode_PURGE_QUEUE = 21,
58-
CF_FunctionCode_ENABLE_ENGINE = 22,
59-
CF_FunctionCode_DISABLE_ENGINE = 23,
60-
};
38+
enum CF_FunctionCode_
39+
{
40+
CF_FunctionCode_NOOP = 0,
41+
CF_FunctionCode_RESET_COUNTERS = 1,
42+
CF_FunctionCode_TX_FILE = 2,
43+
CF_FunctionCode_PLAYBACK_DIR = 3,
44+
CF_FunctionCode_FREEZE = 4,
45+
CF_FunctionCode_THAW = 5,
46+
CF_FunctionCode_SUSPEND = 6,
47+
CF_FunctionCode_RESUME = 7,
48+
CF_FunctionCode_CANCEL = 8,
49+
CF_FunctionCode_ABANDON = 9,
50+
CF_FunctionCode_SET_PARAM = 10,
51+
CF_FunctionCode_GET_PARAM = 11,
52+
CF_FunctionCode_WRITE_QUEUE = 15,
53+
CF_FunctionCode_ENABLE_DEQUEUE = 16,
54+
CF_FunctionCode_DISABLE_DEQUEUE = 17,
55+
CF_FunctionCode_ENABLE_DIR_POLLING = 18,
56+
CF_FunctionCode_DISABLE_DIR_POLLING = 19,
57+
CF_FunctionCode_PURGE_QUEUE = 21,
58+
CF_FunctionCode_ENABLE_ENGINE = 22,
59+
CF_FunctionCode_DISABLE_ENGINE = 23,
60+
};
6161

62-
#endif
62+
#endif

‎config/default_cf_msgdefs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ typedef struct CF_HkChannel_Data
107107
uint8 poll_counter; /**< \brief Number of active polling directories */
108108
uint8 playback_counter; /**< \brief Number of active playback directories */
109109
uint8 frozen; /**< \brief Frozen state: 0 == not frozen, else frozen */
110-
uint8 spare[7]; /**< \brief Alignment spare (uint64 values in the counters) */
110+
uint8 spare; /**< \brief Alignment spare (uint64 values in the counters) */
111111
} CF_HkChannel_Data_t;
112112

113113
/**
@@ -116,7 +116,7 @@ typedef struct CF_HkChannel_Data
116116
typedef struct CF_HkPacket_Payload
117117
{
118118
CF_HkCmdCounters_t counters; /**< \brief Command counters */
119-
uint8 spare[4]; /**< \brief Alignment spare (CF_HkCmdCounters_t is 4 bytes) */
119+
uint8 Padding[4];
120120

121121
CF_HkChannel_Data_t channel_hk[CF_NUM_CHANNELS]; /**< \brief Per channel housekeeping data */
122122
} CF_HkPacket_Payload_t;

0 commit comments

Comments
 (0)