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.

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

Jump to bottom

Nos3#98 mag #174

Merged
merged 16 commits into from
Apr 27, 2023
Merged

Nos3#98 mag #174

merged 16 commits into from
Apr 27, 2023

Conversation

wmhollan
Copy link

@wmhollan wmhollan commented Apr 13, 2023 •
edited by jlucas9
Loading

Pull request to merge in the generic magnetometer component and associated files.

This pull request can be merged once the following requests have been resolved:

William Holland and others added 15 commits March 9, 2023 10:25
Initial component template based on version 0.0.0
63203f4
@jlucas9
[nasa/nos#98] Added generic mag submodule;
63e11d4
Removing folders & files that should be submodule
b878186
converting generic_mag to submodule
d773396
@jlucas9
[#98] Generic mag ready for development;
1027604
updated branch to fix mistakenly linking wrong repo
85bd081
updated mag submodule to dev branch
ea87e3d
fixing apparent conflict in .gitmodules
280cd14
Converted device from baseline uart to spi. Added functionality for m…
fa5a073 
…agnetometer that returns generic x,y,z data when requested. Currently works with sim terminal commands and communicates with COSMOS but raw x,y,z data from 42 show as 0.
fixing missing connections between 42 and mag component
43d252f
Updated so that handle of mag is no longer conflicting on spi_1 bus 0…
c204d18 
… with generic fss handle. No longer getting data packets out of cosmos.
fixed generic mag - now sends and receives 42 mag data to the device,…
d83f7b9 
… although with a possible signed to unsigned int issue that needs fixed
Mag data should now be using uint32_t for its type and should also no…
64c990b 
…w properly handle negative float values.
Fixed device not displaying negative values.
858992e
Removed unused variable, commented out some debug statements, and upd…
aab786b 
…ated the TLM.txt file to show (nT).
msuder
msuder reviewed Apr 24, 2023
View reviewed changes
fsw/nos3_defs/tables/sch_def_msgtbl.c Outdated Show resolved Hide resolved
fsw/nos3_defs/tables/sch_def_schtbl.c Outdated Show resolved Hide resolved
fsw/nos3_defs/targets.cmake Show resolved Hide resolved
Made changes as per pull request comments - reverted duplicate nos3_d…
a07d6c2 
…ef table slots; deleted unused event IDs/directives; deleted unused generic_mag_data_provider files and related constructors/code; updated readme to reflect changes.
@msuder msuder self-requested a review April 26, 2023 15:47
@jlucas9 jlucas9 self-requested a review April 26, 2023 19:55
@jlucas9 jlucas9 merged commit f7c26f9 into dev Apr 27, 2023
@jlucas9 jlucas9 deleted the nos3#98-mag branch June 13, 2023 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msuder msuder msuder approved these changes

@jlucas9 jlucas9 Awaiting requested review from jlucas9

Assignees

@wmhollan wmhollan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wmhollan @msuder @jlucas9