Skip to content

Commit 16b5f02

Browse files
author
John P. Lucas
authored
Merge pull request #516 from nasa/dev
Release 1.7.2;
2 parents 4d653f2 + 4f13a11 commit 16b5f02

File tree

211 files changed

+6804
-661
lines changed

Some content is hidden

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

211 files changed

+6804
-661
lines changed
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: "🐛 Bug Report"
2+
description: Create a new ticket for a bug.
3+
title: "🐛 [BUG] - <title>"
4+
labels: [
5+
"bug"
6+
]
7+
body:
8+
- type: textarea
9+
id: description
10+
attributes:
11+
label: "Description"
12+
description: Please enter an explicit description of your issue
13+
placeholder: Short and explicit description of your incident...
14+
validations:
15+
required: true
16+
- type: input
17+
id: reprod-url
18+
attributes:
19+
label: "Branch Name"
20+
description: Please enter the branch / link to fork
21+
placeholder: ex. 'dev' or https://github.com/USERNAME/REPO-NAME
22+
validations:
23+
required: false
24+
- type: textarea
25+
id: reprod
26+
attributes:
27+
label: "Reproduction steps"
28+
description: Please enter an explicit description of your issue
29+
value: |
30+
1. Go to '...'
31+
2. Click on '....'
32+
3. Scroll down to '....'
33+
4. See error
34+
render: bash
35+
validations:
36+
required: true
37+
- type: textarea
38+
id: screenshot
39+
attributes:
40+
label: "Screenshots"
41+
description: If applicable, add screenshots to help explain your problem.
42+
value: |
43+
![DESCRIPTION](LINK.png)
44+
render: bash
45+
validations:
46+
required: false
47+
- type: textarea
48+
id: logs
49+
attributes:
50+
label: "Logs"
51+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
52+
render: bash
53+
validations:
54+
required: false
55+
- type: dropdown
56+
id: os
57+
attributes:
58+
label: "OS"
59+
description: What is the impacted environment ?
60+
multiple: true
61+
options:
62+
- Windows (Direct Clone)
63+
- Windows (Shared Folders)
64+
- Linux (Direct Clone)
65+
- Linux (Shared Folders)
66+
- Mac (Direct Clone)
67+
- Mac (Shared Folders)
68+
validations:
69+
required: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "💡 Feature Request"
2+
description: Create a new ticket for a new feature request
3+
title: "💡 [REQUEST] - <title>"
4+
labels: [
5+
"question"
6+
]
7+
body:
8+
- type: textarea
9+
id: summary
10+
attributes:
11+
label: "Summary"
12+
description: Provide a brief explanation of the feature
13+
placeholder: Describe in a few lines your feature request
14+
validations:
15+
required: true
16+
- type: textarea
17+
id: basic_example
18+
attributes:
19+
label: "Use Case"
20+
description: Indicate here some basic examples of your feature.
21+
placeholder: A few specific words about your feature request.
22+
validations:
23+
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
### All Submissions:
2+
3+
* [ ] Have you followed the guidelines in our [Contributing](https://github.com/nasa/nos3/blob/main/CONTRIBUTING.md) document?
4+
* [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/nos3/pulls) for the same update/change?
5+
6+
### New Feature Submissions:
7+
8+
* [ ] Does your submission pass tests?
9+
10+
### Changes to Core Features:
11+
12+
* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
13+
14+
### How do you test these changes?
15+
16+
<input type="text" id="explain" name="explain"/>

.github/workflows/build.yml

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,71 @@
11
name: Build
22

33
on:
4-
push:
54
pull_request:
65

6+
env:
7+
CTEST_OUTPUT_ON_FAILURE: true
8+
79
jobs:
810
fsw:
911
runs-on: ubuntu-latest
1012
container:
11-
image: ivvitc/nos3-64:20240618
13+
image: ivvitc/nos3-64:20250124
1214
steps:
1315
- uses: actions/checkout@v4
1416
with:
17+
fetch-depth: 1
1518
submodules: recursive
16-
- name: Update
17-
run: apt-get update
18-
- name: Install dependencies
19-
run: apt-get install -y python3 docker docker.io
20-
- name: prep
21-
run: make prep
2219
- name: config
2320
run: make config
24-
- name: build directory
25-
run: mkdir ./fsw/build
2621
- name: build
27-
run: make build-fsw
22+
run: make build-test
23+
- name: test
24+
run: make test-fsw
2825

2926
sim:
3027
runs-on: ubuntu-latest
3128
container:
32-
image: ivvitc/nos3-64:20240618
29+
image: ivvitc/nos3-64:20250124
3330
steps:
34-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v4
3532
with:
33+
fetch-depth: 1
3634
submodules: recursive
37-
- name: Update
38-
run: apt-get update
39-
- name: Install dependencies
40-
run: apt-get install -y python3 docker docker.io
41-
- name: prep
42-
run: make prep
4335
- name: config
4436
run: make config
45-
- name: build directory
46-
run: mkdir ./sims/build
4737
- name: build
4838
run: make build-sim
39+
40+
coverage:
41+
runs-on: ubuntu-latest
42+
container:
43+
image: ivvitc/nos3-64:20250124
44+
steps:
45+
- uses: actions/checkout@v4
46+
with:
47+
fetch-depth: 0
48+
submodules: recursive
49+
- name: Configure Safe Directory
50+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
51+
- name: Update
52+
run: apt-get update
53+
- name: install dependencies
54+
run: apt-get install -y gcc lcov gcovr bc
55+
- name: config
56+
run: make config
57+
- name: build-test
58+
run: |
59+
export CFLAGS="-fprofile-arcs -ftest-coverage -g"
60+
make build-test
61+
make test-fsw
62+
- name: Archive Coverage Directory
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: coverage-artifacts
66+
path: docs/coverage
67+
- name: Upload coverage reports to Codecov
68+
uses: codecov/codecov-action@v5
69+
with:
70+
token: 040717d0-b624-470e-be41-d08720135088
71+

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#
44
.vagrant
55
.vscode
6+
__pycache__
7+
.Trash-1001
68

79
#
810
# Build Files
@@ -12,6 +14,19 @@ build
1214
support/nos3_install.log
1315
tmp
1416
core.*
17+
pic.jpg
18+
cam.jpg
19+
20+
#
21+
# Misc
22+
#
23+
*.pcapng
1524
.cdskeyfile
1625
.reservedkeyfile
1726
.resetkeyfile
27+
28+
#
29+
# Documentation
30+
#
31+
docs/wiki/_build
32+
docs/wiki/_templates

.gitmodules

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
[submodule "sims/sim_terminal"]
4141
path = sims/sim_terminal
4242
url = https://github.com/nasa-itc/sim_terminal.git
43-
[submodule "gsw/ait"]
44-
path = gsw/ait
45-
url = https://github.com/nasa-itc/gsw-ait.git
4643
[submodule "gsw/OrbitInviewPowerPrediction"]
4744
path = gsw/OrbitInviewPowerPrediction
4845
url = https://github.com/nasa-itc/OrbitInviewPowerPrediction.git
@@ -131,6 +128,31 @@
131128
path = components/syn
132129
url = https://github.com/nasa-itc/syn.git
133130
branch = main
131+
[submodule "fsw/apps/sbn"]
132+
path = fsw/apps/sbn
133+
url = https://github.com/nasa-itc/SBN.git
134+
[submodule "sbn_client"]
135+
path = fsw/apps/sbn_client
136+
url = https://github.com/nasa-itc/SBN-Client.git
137+
[submodule "components/onair/fsw"]
138+
path = components/onair/fsw
139+
url = https://github.com/nasa-itc/OnAIR.git
140+
branch = main
141+
[submodule "gsw/ait"]
142+
path = gsw/ait
143+
url = https://github.com/sphinxdefense/gsw-ait.git
144+
branch = main
145+
[submodule "gsw/ttc-command"]
146+
path = gsw/ttc-command
147+
url = https://github.com/sphinxdefense/ttc-command
148+
branch = main
134149
[submodule "components/generic_thruster"]
135150
path = components/generic_thruster
136151
url = https://github.com/nasa-itc/generic_thruster.git
152+
[submodule "fsw/fprime/fprime-nos3"]
153+
path = fsw/fprime/fprime-nos3
154+
url = https://github.com/nasa-itc/fprime-nos3.git
155+
[submodule "gsw/yamcs"]
156+
path = gsw/yamcs
157+
url = https://github.com/nasa-itc/yamcs-nos3.git
158+
branch = main

0 commit comments

Comments
 (0)