Skip to content

833 improve adac #835

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
zlynch2 merged 9 commits into from
Apr 17, 2026
Merged

833 improve adac #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70bea97
https://github.com/nasa/nos3/issues/833 - Add in AD_rateEst.
msuder Feb 18, 2026
eeea6d3
https://github.com/nasa/nos3/issues/833 - Fix rate estimation telemetry.
msuder Feb 19, 2026
5a661ae
https://github.com/nasa/nos3/issues/833 - Add in AD_rateEst initializ…
msuder Feb 19, 2026
d2551cd
https://github.com/nasa/nos3/issues/833 - Update submodules: Add Mur…
msuder Feb 24, 2026
21e01e8
https://github.com/nasa/nos3/issues/833 - Submodule update.
msuder Feb 25, 2026
ba6c8db
[nasa/nos3#833] adcs changes ported to fp, unfinished, can build, nee…
Apr 8, 2026
50a0e3f
[nasa/nos3#833] gps fpp ports working, f' adcs working
Apr 8, 2026
979e57d
[nasa/nos3#833] adding sleeps for fprime to stay connected per [nasa/…
zlynch2 Apr 17, 2026
1618f71
prep merge 833
zlynch2 Apr 17, 2026
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/spacecraft/sc-fprime-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</applications>
<components>
<adcs>
<enable>false</enable>
<enable>true</enable>
</adcs>
<cam>
<enable>true</enable>
Expand Down
2 changes: 1 addition & 1 deletion components/generic_adcs
Open in desktop
Submodule generic_adcs updated 19 files
+3 −0 fsw/cfs/CMakeLists.txt
+18 −5 fsw/cfs/src/generic_adcs_app.c
+1 −0 fsw/cfs/src/generic_adcs_app.h
+19 −0 fsw/cfs/src/generic_adcs_ingest.c
+1 −0 fsw/cfs/src/generic_adcs_ingest.h
+122 −4 fsw/cfs/src/generic_adcs_msg.h
+181 −3 fsw/fprime/adcs_src/Generic_adcs.cpp
+6 −0 fsw/fprime/adcs_src/Generic_adcs.fpp
+22 −3 fsw/fprime/adcs_src/Generic_adcs.hpp
+19 −0 fsw/fprime/src/generic_adcs_ingest.c
+3 −0 fsw/fprime/src/generic_adcs_ingest.h
+122 −5 fsw/fprime/src/generic_adcs_msg.h
+21 −1 fsw/shared/cfg/Inp_ADAC.txt
+1,217 −15 fsw/shared/generic_adcs_adac.c
+3 −1 fsw/shared/generic_adcs_adac.h
+622 −0 fsw/shared/generic_adcs_utilities.c
+61 −0 fsw/shared/generic_adcs_utilities.h
+227 −0 gsw/GENERIC_ADCS/cmd_tlm/GENERIC_ADCS_TLM.txt
+1 −1 gsw/GENERIC_ADCS/lib/generic_adcs_lib.rb
2 changes: 1 addition & 1 deletion components/novatel_oem615
Open in desktop
Submodule novatel_oem615 updated 5 files
+51 −11 fsw/fprime/novatel_src/novatel_oem615.cpp
+9 −0 fsw/fprime/novatel_src/novatel_oem615.fpp
+10 −0 fsw/fprime/novatel_src/novatel_oem615.hpp
+3 −3 fsw/shared/novatel_oem615_device.h
+3 −3 gsw/NOVATEL_OEM615/cmd_tlm/NOVATEL_OEM615_TLM.txt
2 changes: 1 addition & 1 deletion fsw/fprime/fprime-nos3
Open in desktop
Submodule fprime-nos3 updated 4 files
+1 −0 Ports/ADCSports.fpp
+2 −0 Sequences/adcsstart.seq
+5 −0 Sequences/nos3test.seq
+17 −14 deployment/Top/topology.fpp
4 changes: 3 additions & 1 deletion scripts/fsw/fsw_fprime_launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ do
gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone
echo ""

sleep 5 #sleeping to give time for containers to intialize for fprime to connect successfully

echo $SC_NUM " - Flight Software..."
# cd $FSW_DIR
gnome-terminal --window-with-profile=KeepOpen --title="FPrime" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-fprime" --network=$SC_NETNAME -h nos-fsw -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=105 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw/start_fprime.sh
Expand All @@ -153,7 +155,7 @@ done
echo ""


sleep 1
sleep 3

urlIP=$(docker container inspect sc01-fprime | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b")

Expand Down