Skip to content
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.

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

Nos3#533 generic thruster f integration #539

Merged
merged 15 commits into from
Mar 25, 2025

Conversation

dacarter22
Copy link
Contributor

@dacarter22 dacarter22 commented Mar 11, 2025

This is the integration of the Generic_Thruster component into F' you should be able to see the Command Success result in the events tab after sending the command. Verify that the rest of nos3 runs as usual. If its not running checkout the fprime-nos3 submodule to nos3#533-thruster-f-integration, for some reason the submodule pointer may be off

Pull nos3#533-thruster-f-integration
Test F'

convert the gsw and fsw to fprime
Test that SetPercentage works with Generic_Thruster

fsw/fprime/fprime-nos3 branch:
https://github.com/nasa-itc/fprime-nos3/tree/nos3%23533-generic-thruster-f-integration

components/generic-thruster branch:
https://github.com/nasa-itc/generic_thruster/tree/nos3%23533-generic-thruster-f-integration

This merge closes issue #533

@codecov-commenter
Copy link

codecov-commenter commented Mar 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.77%. Comparing base (d74c413) to head (1b52bab).
Report is 22 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #539      +/-   ##
==========================================
- Coverage   72.77%   72.77%   -0.01%     
==========================================
  Files         744      744              
  Lines       91183    91191       +8     
  Branches     6923     6923              
==========================================
  Hits        66362    66362              
- Misses      24821    24829       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@kevincbruce kevincbruce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did some fixes to use ints and remove some bloat, and merge with dev. Once a submod pointer issue is fixed, should work in CI and be good. Confirmed building/working with dev merged in.

Copy link
Contributor

@zlynch2 zlynch2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge dev branches into high level nos and fprime submodule to reset configuration changes. Also to make sure base IDs dont stop on. However, tested and it works approving. After merging dev into this branch test that thruster still works. merge 533 into dev, then test to make sure fprime still works on dev branch.

@kevincbruce kevincbruce merged commit 1033363 into dev Mar 25, 2025
3 checks passed
@jlucas9 jlucas9 deleted the nos3#533-generic-thruster-f-integration branch March 26, 2025 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants