Skip to content

Nos3#533 generic thruster f integration #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevincbruce merged 15 commits into from
Mar 25, 2025
Merged

Nos3#533 generic thruster f integration #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8c429bc
[nasa/nos3#533] update repo
dacarter22 Mar 10, 2025
cba40f8
[nasa/nos3#533] update pointer
dacarter22 Mar 10, 2025
349fdab
[nasa/nos3#533] added directory for fprime platform file
dacarter22 Mar 10, 2025
7da8754
[nasa/nos3#533] update pointer
dacarter22 Mar 11, 2025
5676001
[nasa/nos3#533] update repo pointer
dacarter22 Mar 11, 2025
c9abf26
Merge branch 'dev' of github.com:nasa/nos3 into nos3#533-generic-thru…
dacarter22 Mar 11, 2025
20e6b78
[nasa/nos3#533] updating pointer to new component branch
dacarter22 Mar 11, 2025
6868014
[nasa/nos3#533] Updated libtrq sim to use the hostname trq_sim for UD…
Mar 12, 2025
2d1fb25
Merge branch 'dev' into nos3#533-generic-thruster-f-integration
kevincbruce Mar 17, 2025
c7df04d
[nasa/nos3#533] Fixed submod commit for thruster component, and other…
kevincbruce Mar 17, 2025
8981c64
[nasa/nos3#533] Fixed merge of rw
kevincbruce Mar 17, 2025
6b1743f
[nasa/nos3#533] update pointer
dacarter22 Mar 17, 2025
d74c413
[nasa/nos3#533] Updated submod of fprime for hotfix
kevincbruce Mar 21, 2025
f1494d2
[nasa/nos#533] Merge conflict resolved, and dev merged into branch
dacarter22 Mar 24, 2025
1b52bab
[nasa/nos3#533] update submod pointers for merge
kevincbruce Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfg/nos3-mission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<nos3-mission-cfg>
<start-time>814048200.0</start-time>
<!-- Note fprime only operational in sc-fprime-config.xml -->
<!-- Note fprime only operational in sc-minimal-config.xml -->

<!-- Ground Software -->
<!-- cosmos, openc3, fprime, or yamcs (default) -->
Expand Down
6 changes: 3 additions & 3 deletions cfg/sc-fprime-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<enable>true</enable>
</eps>
<fss>
<enable>true</enable>
<enable>false</enable>
</fss>
<gps>
<enable>false</enable>
Expand All @@ -52,7 +52,7 @@
<enable>true</enable>
</radio>
<rw>
<enable>true</enable>
<enable>false</enable>
</rw>
<sample>
<enable>true</enable>
Expand All @@ -67,7 +67,7 @@
<enable>true</enable>
</torquer>
<thruster>
<enable>false</enable>
<enable>true</enable>
</thruster>
</components>
<gui>
Expand Down
2 changes: 1 addition & 1 deletion cfg/sc-minimal-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<enable>false</enable>
</syn>
<torquer>
<enable>false</enable>
<enable>true</enable>
</torquer>
<thruster>
<enable>false</enable>
Expand Down
2 changes: 1 addition & 1 deletion components/generic_thruster
Open in desktop
Submodule generic_thruster updated 16 files
+64 −0 .clang-format
+38 −0 .github/workflows/linter.yml
+1 −1 fsw/cfs/mission_inc/generic_thruster_perfids.h
+6 −6 fsw/cfs/platform_inc/generic_thruster_msgids.h
+9 −9 fsw/cfs/platform_inc/generic_thruster_platform_cfg.h
+122 −106 fsw/cfs/src/generic_thruster_app.c
+15 −20 fsw/cfs/src/generic_thruster_app.h
+26 −26 fsw/cfs/src/generic_thruster_events.h
+17 −19 fsw/cfs/src/generic_thruster_msg.h
+5 −5 fsw/cfs/src/generic_thruster_version.h
+29 −0 fsw/fprime/platform_inc/generic_thruster_platform_cfg.h
+15 −15 fsw/shared/generic_thruster_device.c
+10 −11 fsw/shared/generic_thruster_device.h
+4 −4 fsw/standalone/device_cfg.h
+53 −58 fsw/standalone/generic_thruster_checkout.c
+13 −13 fsw/standalone/generic_thruster_checkout.h
2 changes: 1 addition & 1 deletion components/generic_torquer
Open in desktop
Submodule generic_torquer updated 28 files
+64 −0 .clang-format
+38 −0 .github/workflows/linter.yml
+1 −1 fsw/cfs/mission_inc/generic_torquer_perfids.h
+6 −6 fsw/cfs/platform_inc/generic_torquer_msgids.h
+1 −1 fsw/cfs/platform_inc/generic_torquer_platform_cfg.h
+132 −114 fsw/cfs/src/generic_torquer_app.c
+12 −15 fsw/cfs/src/generic_torquer_app.h
+24 −24 fsw/cfs/src/generic_torquer_events.h
+26 −32 fsw/cfs/src/generic_torquer_msg.h
+5 −5 fsw/cfs/src/generic_torquer_version.h
+8 −7 fsw/cfs/unit-test/coveragetest/coveragetest_generic_torquer_app.c
+1 −1 fsw/cfs/unit-test/inc/ut_generic_torquer_app.h
+1 −1 fsw/fprime/mission_inc/generic_torquer_perfids.h
+6 −6 fsw/fprime/platform_inc/generic_torquer_msgids.h
+1 −1 fsw/fprime/platform_inc/generic_torquer_platform_cfg.h
+126 −118 fsw/fprime/src/generic_torquer_app.c
+16 −21 fsw/fprime/src/generic_torquer_app.h
+24 −24 fsw/fprime/src/generic_torquer_events.h
+31 −38 fsw/fprime/src/generic_torquer_msg.h
+5 −5 fsw/fprime/src/generic_torquer_version.h
+2 −3 fsw/shared/generic_torquer_device.c
+6 −6 fsw/shared/generic_torquer_device.h
+1 −0 fsw/standalone/CMakeLists.txt
+1 −1 fsw/standalone/device_cfg.h
+59 −65 fsw/standalone/generic_torquer_checkout.c
+14 −14 fsw/standalone/generic_torquer_checkout.h
+8 −7 fsw/unit-test/coveragetest/coveragetest_generic_torquer_app.c
+1 −1 fsw/unit-test/inc/ut_generic_torquer_app.h
2 changes: 1 addition & 1 deletion fsw/apps/hwlib
Open in desktop
Submodule hwlib updated 0 files
2 changes: 1 addition & 1 deletion fsw/fprime/fprime-nos3
Open in desktop
Submodule fprime-nos3 updated 11 files
+1 −0 Components/CMakeLists.txt
+35 −0 Components/Generic_thruster/CMakeLists.txt
+93 −0 Components/Generic_thruster/Generic_thruster.cpp
+77 −0 Components/Generic_thruster/Generic_thruster.fpp
+52 −0 Components/Generic_thruster/Generic_thruster.hpp
+66 −0 Components/Generic_thruster/docs/sdd.md
+8 −0 SampleSimDeployment/CMakeLists.txt
+5 −0 SampleSimDeployment/Top/CMakeLists.txt
+3 −1 SampleSimDeployment/Top/SampleSimDeploymentPackets.xml
+5 −0 SampleSimDeployment/Top/instances.fpp
+1 −0 SampleSimDeployment/Top/topology.fpp