Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nos3-rc' into nos3-dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	CMakeLists.txt
#	fsw/platform_inc/sc_platform_cfg.h
#	fsw/src/sc_cmds.c
#	fsw/tables/sc_rts003.c
#	fsw/tables/sc_rts004.c
#	fsw/tables/sc_rts005.c
#	fsw/tables/sc_rts006.c
#	fsw/tables/sc_rts007.c
#	fsw/tables/sc_rts008.c
#	fsw/tables/sc_rts009.c
#	fsw/tables/sc_rts010.c
#	fsw/tables/sc_rts011.c
#	fsw/tables/sc_rts012.c
#	fsw/tables/sc_rts013.c
#	fsw/tables/sc_rts014.c
#	fsw/tables/sc_rts015.c
#	fsw/tables/sc_rts016.c
#	fsw/tables/sc_rts017.c
#	fsw/tables/sc_rts018.c
#	fsw/tables/sc_rts019.c
#	fsw/tables/sc_rts020.c
#	fsw/tables/sc_rts021.c
#	fsw/tables/sc_rts022.c
#	fsw/tables/sc_rts023.c
#	fsw/tables/sc_rts024.c
#	fsw/tables/sc_rts025.c
#	fsw/tables/sc_rts026.c
#	fsw/tables/sc_rts027.c
#	fsw/tables/sc_rts028.c
#	fsw/tables/sc_rts029.c
#	fsw/tables/sc_rts030.c
#	fsw/tables/sc_rts031.c
#	fsw/tables/sc_rts032.c
#	fsw/tables/sc_rts033.c
#	fsw/tables/sc_rts034.c
#	fsw/tables/sc_rts035.c
#	fsw/tables/sc_rts036.c
#	fsw/tables/sc_rts037.c
#	fsw/tables/sc_rts038.c
#	fsw/tables/sc_rts039.c
#	fsw/tables/sc_rts040.c
#	fsw/tables/sc_rts041.c
#	fsw/tables/sc_rts042.c
#	fsw/tables/sc_rts043.c
#	fsw/tables/sc_rts044.c
#	fsw/tables/sc_rts045.c
#	fsw/tables/sc_rts046.c
#	fsw/tables/sc_rts047.c
#	fsw/tables/sc_rts048.c
#	fsw/tables/sc_rts049.c
#	fsw/tables/sc_rts050.c
#	fsw/tables/sc_rts051.c
#	fsw/tables/sc_rts052.c
#	fsw/tables/sc_rts053.c
#	fsw/tables/sc_rts054.c
#	fsw/tables/sc_rts055.c
#	fsw/tables/sc_rts056.c
#	fsw/tables/sc_rts057.c
#	fsw/tables/sc_rts058.c
#	fsw/tables/sc_rts059.c
#	fsw/tables/sc_rts060.c
#	fsw/tables/sc_rts061.c
#	fsw/tables/sc_rts062.c
#	fsw/tables/sc_rts063.c
#	fsw/tables/sc_rts064.c
#	fsw/unit_test/sc_platform_cfg.h
  • Loading branch information
jlucas9 committed Aug 6, 2023
2 parents 3af4ad3 + 05f5288 commit 9b2e2b4
Show file tree
Hide file tree
Showing 361 changed files with 26,207 additions and 82,468 deletions.
6 changes: 0 additions & 6 deletions .gitattributes

This file was deleted.

40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Checklist (Please check before submitting)**

* [ ] I reviewed the [Contributing Guide](https://github.com/nasa/SC/blob/main/CONTRIBUTING.md).
* [ ] I performed a cursory search to see if the bug report is relevant, not redundant, nor in conflict with other tickets.

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Code snips**
If applicable, add references to the software.

**System observed on:**
- Hardware
- OS: [e.g. Linux 4.4]
- Versions [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps]

**Additional context**
Add any other context about the problem here.

**Reporter Info**
Full name and company/organization if applicable
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Checklist (Please check before submitting)**

* [ ] I reviewed the [Contributing Guide](https://github.com/nasa/SC/blob/main/CONTRIBUTING.md).
* [ ] I reviewed the [README file](https://github.com/nasa/SC/blob/main/README.md) to see if the feature is in the major future work.
* [ ] I performed a cursory search to see if the feature request is relevant, not redundant, nor in conflict with other tickets.

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context about the feature request here.

**Requester Info**
Full name and company/organization if applicable
34 changes: 34 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
**Checklist (Please check before submitting)**

* [ ] I reviewed the [Contributing Guide](https://github.com/nasa/SC/blob/main/CONTRIBUTING.md).
* [ ] I signed and emailed the appropriate [Contributor License Agreement](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md#contributor-license-agreement-cla) to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

**Describe the contribution**
A clear and concise description of what the contribution is.
- Include explicitly what issue it addresses [e.g. Fixes #X]

**Testing performed**
Steps taken to test the contribution:
1. Build steps '...'
1. Execution steps '...'

**Expected behavior changes**
A clear and concise description of how this contribution will change behavior and level of impact.
- API Change: xxx (if applicable)
- Behavior Change: xxx (if applicable)
- Or no impact to behavior

**System(s) tested on**
- Hardware: [e.g. PC, SP0, MCP750]
- OS: [e.g. Ubuntu 18.04, RTEMS 4.11, VxWorks 6.9]
- Versions: [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps or tools]

**Additional context**
Add any other context about the contribution here.

**Third party code**
If included, identify any third party code and provide text file of license

**Contributor Info - All information REQUIRED for consideration of pull request**
Full name and company/organization/center of all contributors ("Personal" if individual work)
- Note CLA's apply to software contributions.
15 changes: 15 additions & 0 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Build and Deploy Documentation

on:
push:
pull_request:

jobs:
build-documentation:
name: Build and deploy cFS documents
uses: nasa/cFS/.github/workflows/build-deploy-doc.yml@main
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')}}
10 changes: 10 additions & 0 deletions .github/workflows/build-run-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Build and Run

on:
push:
pull_request:

jobs:
build-run:
name: Build and run with startup msg verification
uses: nasa/cFS/.github/workflows/build-run-app.yml@main
18 changes: 18 additions & 0 deletions .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: CodeQl Analysis

on:
push:
pull_request:


jobs:
codeql:
name: Codeql Analysis
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
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
11 changes: 11 additions & 0 deletions .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Format Check

# Run on all push and pull requests
on:
push:
pull_request:

jobs:
format-check:
name: Run format check
uses: nasa/cFS/.github/workflows/format-check.yml@main
13 changes: 13 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Static Analysis

# Run on all push and pull requests
on:
push:
pull_request:

jobs:
static-analysis:
name: Run cppcheck
uses: nasa/cFS/.github/workflows/static-analysis.yml@main
with:
strict-dir-list: './fsw'
10 changes: 10 additions & 0 deletions .github/workflows/unit-test-coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Unit Test and Coverage

on:
push:
pull_request:

jobs:
unit-test-coverage:
name: Run unit test and coverage
uses: nasa/cFS/.github/workflows/unit-test-coverage.yml@main
35 changes: 27 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
cmake_minimum_required(VERSION 2.6.4)
project(CFS_SC C)

include_directories(fsw/mission_inc)
include_directories(fsw/platform_inc)
include_directories(fsw/src)
include_directories(${APPLICATION_PLATFORM_INC_LIST})
include_directories(${lc_MISSION_DIR}/fsw/src)
set(APP_SRC_FILES
fsw/src/sc_rtsrq.c
fsw/src/sc_utils.c
fsw/src/sc_app.c
fsw/src/sc_atsrq.c
fsw/src/sc_state.c
fsw/src/sc_loads.c
fsw/src/sc_cmds.c
)

aux_source_directory(fsw/src APP_SRC_FILES)
aux_source_directory(fsw/tables APP_TABLE_FILES)
include_directories(${APPLICATION_PLATFORM_INC_LIST})

# Create the app module
add_cfe_app(sc ${APP_SRC_FILES})

# This permits direct access to public headers in the fsw/inc directory
target_include_directories(sc PUBLIC fsw/inc)

aux_source_directory(fsw/tables APP_TABLE_FILES)

add_cfe_tables(sc ${APP_TABLE_FILES})

# This permits direct access to public headers in the fsw/inc directory
target_include_directories(sc PUBLIC fsw/inc)

# If UT is enabled, then add the tests from the subdirectory
# Note that this is an app, and therefore does not provide
# stub functions, as other entities would not typically make
# direct function calls into this application.
if(ENABLE_UNIT_TESTS)
add_subdirectory(unit-test)
endif()
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Contributing Guide

Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute to cFS components.

## Contributor License Agreement (CLA)

Before we can accept your code contributions we need a signed Contributor License Agreement (CLA). See the [instructions](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md#contributor-license-agreement-cla) for more information.
Binary file removed Core Flight System (CFS) NOSA.pdf
Binary file not shown.
Loading

0 comments on commit 9b2e2b4

Please # to comment.