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

[nasa/nos3#445] - Move yamcs component definitions #480

Merged
merged 11 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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 components/arducam
Submodule arducam updated 1 files
+141 −0 gsw/arducam.xtce
2 changes: 1 addition & 1 deletion components/generic_adcs
Submodule generic_adcs updated 1 files
+1,273 −0 gsw/generic_adcs.xtce
2 changes: 1 addition & 1 deletion components/generic_fss
Submodule generic_fss updated 1 files
+168 −0 gsw/generic_fss.xtce
2 changes: 1 addition & 1 deletion components/generic_imu
Submodule generic_imu updated 1 files
+193 −0 gsw/generic_imu.xtce
2 changes: 1 addition & 1 deletion components/generic_mag
Submodule generic_mag updated 1 files
+168 −0 gsw/generic_mag.xtce
2 changes: 1 addition & 1 deletion components/generic_radio
2 changes: 1 addition & 1 deletion components/generic_reaction_wheel
2 changes: 1 addition & 1 deletion components/generic_star_tracker
2 changes: 1 addition & 1 deletion components/generic_thruster
2 changes: 1 addition & 1 deletion components/generic_torquer
2 changes: 1 addition & 1 deletion components/novatel_oem615
2 changes: 1 addition & 1 deletion components/sample
Submodule sample updated 1 files
+209 −0 gsw/sample.xtce
2 changes: 1 addition & 1 deletion docs/coverage/line-coverage-badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions scripts/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ GSW_BIN=$BASE_DIR/gsw/cosmos/build/openc3-cosmos-nos3
GSW_DIR=$BASE_DIR/gsw/cosmos
SIM_DIR=$BASE_DIR/sims/build
SIM_BIN=$SIM_DIR/bin
COMPONENT_DIR=$SCRIPT_DIR/../components

if [ -d $SIM_DIR/bin ]; then
SIMS=$(ls $SIM_BIN/nos3*simulator)
Expand Down
1 change: 0 additions & 1 deletion scripts/gsw/gsw_yamcs_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd
SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
source $SCRIPT_DIR/env.sh

echo "YAMCS build..."
rm -rf $USER_NOS3_DIR/yamcs 2> /dev/null
cp -r $BASE_DIR/gsw/yamcs $USER_NOS3_DIR/
echo ""
3 changes: 1 addition & 2 deletions scripts/gsw/gsw_yamcs_launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd
SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts
source $SCRIPT_DIR/env.sh

echo "YAMCS Launch... "
gnome-terminal --tab --title="YAMCS" -- $DFLAGS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos_openc3-operator_1 -h cosmos --network=nos3_core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository yamcs:run
gnome-terminal --tab --title="YAMCS" -- $DFLAGS -e COMPONENT_DIR=$COMPONENT_DIR -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos_openc3-operator_1 -h cosmos --network=nos3_core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository -DCOMPONENT_DIR=$COMPONENT_DIR yamcs:run

pidof firefox > /dev/null
if [ $? -eq 1 ]
Expand Down