diff --git a/cfg/InOut/Inp_IPC.txt b/cfg/InOut/Inp_IPC.txt index bdc24c48..d7e56824 100644 --- a/cfg/InOut/Inp_IPC.txt +++ b/cfg/InOut/Inp_IPC.txt @@ -147,7 +147,7 @@ TX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE 0 ! AC.ID for ACS mode "FSS.42" ! File name for WRITE or READ SERVER ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT) -fortytwo 4281 ! Server Host Name, Port +fortytwo 4284 ! Server Host Name, Port FALSE ! Allow Blocking (i.e. wait on RX) FALSE ! Echo to stdout 1 ! Number of TX prefixes diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index ea741a33..48d6308c 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -491,7 +491,7 @@ GENERIC_FSS_42_PROVIDER fortytwo - 4281 + 4284 30 1 0 diff --git a/components/arducam b/components/arducam index 89a08de6..0cd26494 160000 --- a/components/arducam +++ b/components/arducam @@ -1 +1 @@ -Subproject commit 89a08de64585b784e488f733a2c7c2520951069c +Subproject commit 0cd2649455a69359c5b9b0fda5e33193e6de4eee diff --git a/components/generic_adcs b/components/generic_adcs index f143f8d9..694094d4 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit f143f8d9c4bba012a44aa53599c2d8cff858c008 +Subproject commit 694094d498fbc9efdc957446a1edfb27af066dc1 diff --git a/components/generic_css b/components/generic_css index e53bf022..9a719997 160000 --- a/components/generic_css +++ b/components/generic_css @@ -1 +1 @@ -Subproject commit e53bf022f8527caeddc01cd4b9d9a4e5aad8b653 +Subproject commit 9a719997f3ea45563a5d2dd3fe06408b3087705e diff --git a/components/generic_eps b/components/generic_eps index eff72c10..264d4b89 160000 --- a/components/generic_eps +++ b/components/generic_eps @@ -1 +1 @@ -Subproject commit eff72c106582b4da57372bd6a7ae03b703c49ac5 +Subproject commit 264d4b897358d1b8b61051dc807080dc611163b4 diff --git a/components/generic_fss b/components/generic_fss index a9b17808..3f3265ef 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit a9b178089336e5ef1a7eab096a1186812f37132d +Subproject commit 3f3265eff54367c5334fcc68fe3aadcd7656643f diff --git a/components/generic_imu b/components/generic_imu index 5a9df78d..05e06104 160000 --- a/components/generic_imu +++ b/components/generic_imu @@ -1 +1 @@ -Subproject commit 5a9df78d8f948d1748e06789f0039edaf087918f +Subproject commit 05e06104244bdacf08ea526d9266311678317323 diff --git a/components/generic_mag b/components/generic_mag index 1b4edc87..20e403b0 160000 --- a/components/generic_mag +++ b/components/generic_mag @@ -1 +1 @@ -Subproject commit 1b4edc87af0cf6c6c58cfdb712bcfb4fb0a067f4 +Subproject commit 20e403b0fb42e048dc2c0cc94dd59bbeb382d842 diff --git a/components/generic_radio b/components/generic_radio index 55c5669b..372a3be7 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 55c5669b267fdafccc461b20238afa7129fca7c0 +Subproject commit 372a3be7de09ab2a6aec5b05fd4cd61ee7c0940f diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 5d8d6041..43bea32c 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 5d8d60414b2eb632d212a39f05375ad71b2870b1 +Subproject commit 43bea32c6e397386b65ae357385a728b2e6c0d40 diff --git a/components/generic_star_tracker b/components/generic_star_tracker index b6d75f3c..4dbfb79e 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit b6d75f3c3538421095a6738d36e28b62e2022f8e +Subproject commit 4dbfb79ed4d838959815e906442840ecc8cd2313 diff --git a/components/generic_thruster b/components/generic_thruster index 68260572..3e5f4b0d 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 68260572c34f6b8ff29678970759671b227a2b4b +Subproject commit 3e5f4b0d2923c9dca08cf804091b8ea88484f048 diff --git a/components/generic_torquer b/components/generic_torquer index e9856ee8..02389c3e 160000 --- a/components/generic_torquer +++ b/components/generic_torquer @@ -1 +1 @@ -Subproject commit e9856ee8c86e31b8b9310d8d43be26be0bab09ae +Subproject commit 02389c3e9dff1fc602b0f365792bc624f50a6eff diff --git a/components/novatel_oem615 b/components/novatel_oem615 index b50728bb..0b26907f 160000 --- a/components/novatel_oem615 +++ b/components/novatel_oem615 @@ -1 +1 @@ -Subproject commit b50728bb05d2b7a7297740d4b0dd1282884c585e +Subproject commit 0b26907f7401ad130a764c5801d209b665837dd3 diff --git a/components/sample b/components/sample index 59034a0b..c1923af7 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 59034a0bfd9eb02823f1ea036266aeb36f2149d7 +Subproject commit c1923af750447183090437f6839022ed91d6facc diff --git a/docs/coverage/line-coverage-badge.svg b/docs/coverage/line-coverage-badge.svg index da23c719..b24ccd1e 100644 --- a/docs/coverage/line-coverage-badge.svg +++ b/docs/coverage/line-coverage-badge.svg @@ -1 +1 @@ -line coverage: 73%line coverage73% \ No newline at end of file +line coverage: 72%line coverage72% \ No newline at end of file diff --git a/gsw/yamcs b/gsw/yamcs index 36373169..d50b453a 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 36373169f97807851bdfba9469821a39d9be2459 +Subproject commit d50b453a076a616bdfa14e8919075236d521add3 diff --git a/scripts/env.sh b/scripts/env.sh index fe06d170..35c00b3e 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -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) diff --git a/scripts/gsw/gsw_yamcs_build.sh b/scripts/gsw/gsw_yamcs_build.sh index c49a7d88..24f20023 100755 --- a/scripts/gsw/gsw_yamcs_build.sh +++ b/scripts/gsw/gsw_yamcs_build.sh @@ -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 "" diff --git a/scripts/gsw/gsw_yamcs_launch.sh b/scripts/gsw/gsw_yamcs_launch.sh index 477b69a6..b5214527 100755 --- a/scripts/gsw/gsw_yamcs_launch.sh +++ b/scripts/gsw/gsw_yamcs_launch.sh @@ -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 ]