From ac372c07b11112fe7c3152ff0adac17619cd29d8 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 6 Nov 2024 16:09:51 -0500 Subject: [PATCH 01/35] https://github.com/nasa/nos3/issues/351 - Fix USART number for star tracker. --- cfg/sims/nos3-simulator.xml | 4 ++-- components/generic_star_tracker | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 38a7152c..ea741a33 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -623,8 +623,8 @@ star-tracker-command usart - usart_29 - 29 + usart_10 + 10 diff --git a/components/generic_star_tracker b/components/generic_star_tracker index 2f259c76..f0824ab4 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit 2f259c76403d53b0f73698327a9437b66e70fcf8 +Subproject commit f0824ab49698f75d358e27349b872ee7b86eb184 From 4036c027ef8a4f4d3a6d9119f9194a3616a60b01 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Wed, 20 Nov 2024 22:18:11 +0000 Subject: [PATCH 02/35] [nasa/nos3#384] sequencing sampele in fprime 20 times, and fixing star tracker uart 10 --- cfg/sims/nos3-simulator.xml | 4 ++-- fsw/fprime/fprime-nos3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 38a7152c..ea741a33 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -623,8 +623,8 @@ star-tracker-command usart - usart_29 - 29 + usart_10 + 10 diff --git a/fsw/fprime/fprime-nos3 b/fsw/fprime/fprime-nos3 index d3fadff1..9346f0ab 160000 --- a/fsw/fprime/fprime-nos3 +++ b/fsw/fprime/fprime-nos3 @@ -1 +1 @@ -Subproject commit d3fadff1d2bfcbcdbb1b210581570359b92023a3 +Subproject commit 9346f0abcdf60922aa0afdb665abe264c775a0e9 From 295afd2ebf49303d64855da9fd2e2b25e17302b5 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Wed, 4 Dec 2024 12:31:29 -0500 Subject: [PATCH 03/35] https://github.com/nasa/nos3/issues/351 - Submodule updates to fix initialization and usage of _not_parsed flag. --- components/generic_star_tracker | 2 +- components/generic_thruster | 2 +- components/sample | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/generic_star_tracker b/components/generic_star_tracker index f0824ab4..db8dce65 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit f0824ab49698f75d358e27349b872ee7b86eb184 +Subproject commit db8dce650f484b148cff2873685d1f96e529022e diff --git a/components/generic_thruster b/components/generic_thruster index 0191219f..bb30f29a 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit 0191219ffac1c106bd23e9ab1a7140c321d80215 +Subproject commit bb30f29ad5c9ebe8a8c597f96745cb85367a804b diff --git a/components/sample b/components/sample index 99c34e2f..8281b229 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 99c34e2f5a28ea90969ebfc703b248ca16879fe0 +Subproject commit 8281b229e40f149b88b51e5d4e51e9918e18ac42 From 9f60f5d9d5071aca4be2e0d3f84de46421b9b3c5 Mon Sep 17 00:00:00 2001 From: zlynch2 Date: Wed, 4 Dec 2024 21:44:17 +0000 Subject: [PATCH 04/35] editing scripts to fix bug when creating fprime components with docker --- scripts/cfg/prepare.sh | 5 +++++ scripts/cfg/uninstall.sh | 1 + scripts/debug.sh | 2 +- scripts/env.sh | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/cfg/prepare.sh b/scripts/cfg/prepare.sh index aab0f4eb..7236c916 100755 --- a/scripts/cfg/prepare.sh +++ b/scripts/cfg/prepare.sh @@ -36,6 +36,11 @@ echo "Proceeding to optional additions." echo "" echo "" +echo "Preparing Shared Folders for Fprime..." +mkdir $USER_FPRIME_PATH 2> /dev/null +echo "" +echo "" + echo "Prepare Igniter (optional)..." pip3 install pyside6 xmltodict cd $BASE_DIR diff --git a/scripts/cfg/uninstall.sh b/scripts/cfg/uninstall.sh index 310ebf92..77acb8bc 100755 --- a/scripts/cfg/uninstall.sh +++ b/scripts/cfg/uninstall.sh @@ -21,6 +21,7 @@ yes | rm $BASE_DIR/minicom.cap 2> /dev/null echo "Cleaning up local user directory..." $DFLAGS -v $USER_NOS3_DIR:$USER_NOS3_DIR $DBOX rm -rf $USER_NOS3_DIR rm -rf $USER_NOS3_DIR/* +rm -rf $USER_FPRIME_PATH yes | rm -rf $USER_NOS3_DIR/.m2 2> /dev/null yes | rm -rf $USER_NOS3_DIR 2> /dev/null diff --git a/scripts/debug.sh b/scripts/debug.sh index 877819a7..8045531c 100755 --- a/scripts/debug.sh +++ b/scripts/debug.sh @@ -9,4 +9,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source $SCRIPT_DIR/env.sh mkdir -p $BASE_DIR/fsw/build -$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -v $MVN_DIR:$MVN_DIR -p 8090:8090 -p 5012:5012 -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice --name "nos3_debug" $DBOX bash +$DFLAGS_CPUS -v $USER_FPRIME_PATH:$USER_FPRIME_PATH -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -v $MVN_DIR:$MVN_DIR -p 8090:8090 -p 5012:5012 -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice --name "nos3_debug" $DBOX bash diff --git a/scripts/env.sh b/scripts/env.sh index b0f965df..f4fb9d60 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -20,6 +20,7 @@ NUM_CPUS="$( nproc )" USERDIR=$(cd ~/ && pwd) USER_NOS3_DIR=$(cd ~/ && pwd)/.nos3 +USER_FPRIME_PATH=$USERDIR/.cookiecutter_replay OPENC3_DIR=$USER_NOS3_DIR/cosmos OPENC3_PATH=$OPENC3_DIR/openc3.sh From 2a83d8ad0e2ab165918e1dac8808968427488319 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Mon, 9 Dec 2024 13:47:14 -0500 Subject: [PATCH 05/35] https://github.com/nasa/nos3/issues/351 - Fix quaternion initialization to be a vector of dimension 4 not 3. --- sims/truth_42_sim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/truth_42_sim b/sims/truth_42_sim index e1b1e265..3d99405b 160000 --- a/sims/truth_42_sim +++ b/sims/truth_42_sim @@ -1 +1 @@ -Subproject commit e1b1e2657345d44be82fb72b0706ce8f178f1fd1 +Subproject commit 3d99405ba930df74aafca1c46ddb8c966627a70d From bf07e101e8d986583d9ffc6243367ae2bc5ee7fa Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 11:59:56 -0500 Subject: [PATCH 06/35] [nos3#358] Initial creation of the requirements in doorstop --- docs/reqs/.doorstop.yml | 4 ++++ docs/reqs/config_reqs/.doorstop.yml | 5 +++++ docs/reqs/fsw_reqs/.doorstop.yml | 5 +++++ docs/reqs/gsw_reqs/.doorstop.yml | 5 +++++ docs/reqs/sim_reqs/.doorstop.yml | 5 +++++ docs/reqs/sv_reqs/.doorstop.yml | 5 +++++ 6 files changed, 29 insertions(+) create mode 100644 docs/reqs/.doorstop.yml create mode 100644 docs/reqs/config_reqs/.doorstop.yml create mode 100644 docs/reqs/fsw_reqs/.doorstop.yml create mode 100644 docs/reqs/gsw_reqs/.doorstop.yml create mode 100644 docs/reqs/sim_reqs/.doorstop.yml create mode 100644 docs/reqs/sv_reqs/.doorstop.yml diff --git a/docs/reqs/.doorstop.yml b/docs/reqs/.doorstop.yml new file mode 100644 index 00000000..1778fe7c --- /dev/null +++ b/docs/reqs/.doorstop.yml @@ -0,0 +1,4 @@ +settings: + digits: 3 + prefix: SRD + sep: '' diff --git a/docs/reqs/config_reqs/.doorstop.yml b/docs/reqs/config_reqs/.doorstop.yml new file mode 100644 index 00000000..550abde7 --- /dev/null +++ b/docs/reqs/config_reqs/.doorstop.yml @@ -0,0 +1,5 @@ +settings: + digits: 3 + parent: SRD + prefix: CONFIG_REQ + sep: '' diff --git a/docs/reqs/fsw_reqs/.doorstop.yml b/docs/reqs/fsw_reqs/.doorstop.yml new file mode 100644 index 00000000..d24b2f67 --- /dev/null +++ b/docs/reqs/fsw_reqs/.doorstop.yml @@ -0,0 +1,5 @@ +settings: + digits: 3 + parent: SRD + prefix: FSW_REQ + sep: '' diff --git a/docs/reqs/gsw_reqs/.doorstop.yml b/docs/reqs/gsw_reqs/.doorstop.yml new file mode 100644 index 00000000..c9e9032f --- /dev/null +++ b/docs/reqs/gsw_reqs/.doorstop.yml @@ -0,0 +1,5 @@ +settings: + digits: 3 + parent: SRD + prefix: GSW_REQ + sep: '' diff --git a/docs/reqs/sim_reqs/.doorstop.yml b/docs/reqs/sim_reqs/.doorstop.yml new file mode 100644 index 00000000..8c09e756 --- /dev/null +++ b/docs/reqs/sim_reqs/.doorstop.yml @@ -0,0 +1,5 @@ +settings: + digits: 3 + parent: SRD + prefix: SIM_REQ + sep: '' diff --git a/docs/reqs/sv_reqs/.doorstop.yml b/docs/reqs/sv_reqs/.doorstop.yml new file mode 100644 index 00000000..78f8415c --- /dev/null +++ b/docs/reqs/sv_reqs/.doorstop.yml @@ -0,0 +1,5 @@ +settings: + digits: 3 + parent: SRD + prefix: SV_REQ + sep: '' From 730ec0fc0c6c478e670db5dd13676a7f4d8a052b Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 12:36:58 -0500 Subject: [PATCH 07/35] [nos3#358] Initial commit of a requirement --- docs/reqs/SRD001.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docs/reqs/SRD001.yml diff --git a/docs/reqs/SRD001.yml b/docs/reqs/SRD001.yml new file mode 100644 index 00000000..a109d787 --- /dev/null +++ b/docs/reqs/SRD001.yml @@ -0,0 +1,11 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +name: General +normative: true +ref: '' +requirement-level: 1 +reviewed: null +text: NOS shall be able to simulate one or multiple Space Vehicles (SVs) From 6120516d21c02452dd7e12cf9b7fd0f3e6e03772 Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 12:46:35 -0500 Subject: [PATCH 08/35] [nos3#358] Adding some configuration requirements --- docs/reqs/SRD002.yml | 9 +++++++++ docs/reqs/config_reqs/CONFIG_REQ001.yml | 10 ++++++++++ docs/reqs/config_reqs/CONFIG_REQ002.yml | 10 ++++++++++ docs/reqs/config_reqs/CONFIG_REQ003.yml | 10 ++++++++++ 4 files changed, 39 insertions(+) create mode 100644 docs/reqs/SRD002.yml create mode 100644 docs/reqs/config_reqs/CONFIG_REQ001.yml create mode 100644 docs/reqs/config_reqs/CONFIG_REQ002.yml create mode 100644 docs/reqs/config_reqs/CONFIG_REQ003.yml diff --git a/docs/reqs/SRD002.yml b/docs/reqs/SRD002.yml new file mode 100644 index 00000000..0c8b2491 --- /dev/null +++ b/docs/reqs/SRD002.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.1 +links: [] +normative: true +ref: '' +reviewed: null +text: '' diff --git a/docs/reqs/config_reqs/CONFIG_REQ001.yml b/docs/reqs/config_reqs/CONFIG_REQ001.yml new file mode 100644 index 00000000..a8cdd08f --- /dev/null +++ b/docs/reqs/config_reqs/CONFIG_REQ001.yml @@ -0,0 +1,10 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +requirement-level: 2 +reviewed: null +text: NOS Shall be able to simulate different ground software (such as F', COSMOS, OpenC3, YAMCS) diff --git a/docs/reqs/config_reqs/CONFIG_REQ002.yml b/docs/reqs/config_reqs/CONFIG_REQ002.yml new file mode 100644 index 00000000..cb1d7aa9 --- /dev/null +++ b/docs/reqs/config_reqs/CONFIG_REQ002.yml @@ -0,0 +1,10 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +requirement-level: 2 +reviewed: null +text: NOS shall be able to simulate different flight software (such as F' and cFS) diff --git a/docs/reqs/config_reqs/CONFIG_REQ003.yml b/docs/reqs/config_reqs/CONFIG_REQ003.yml new file mode 100644 index 00000000..0ef4854d --- /dev/null +++ b/docs/reqs/config_reqs/CONFIG_REQ003.yml @@ -0,0 +1,10 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +requirement-level: 2 +reviewed: null +text: NOS shall be able to be reconfigured to represent multiple disparate missions (and multiple scenarios within each mission) From 1c0ff188d90309bde23908878a9e404ad4a30202 Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 12:49:12 -0500 Subject: [PATCH 09/35] [nos3#358] Further updates to the config requirements --- docs/reqs/config_reqs/CONFIG_REQ004.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/reqs/config_reqs/CONFIG_REQ004.yml diff --git a/docs/reqs/config_reqs/CONFIG_REQ004.yml b/docs/reqs/config_reqs/CONFIG_REQ004.yml new file mode 100644 index 00000000..ee43b132 --- /dev/null +++ b/docs/reqs/config_reqs/CONFIG_REQ004.yml @@ -0,0 +1,10 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +requirement-level: 2 +reviewed: null +text: NOS shall have a simulation environment which is configurable in its startup location, time, and configuration or state of the vehicle From 3317055b97b7280b28c19acb60e589fcf8419062 Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 12:55:43 -0500 Subject: [PATCH 10/35] [nos3#358] Updates to the configuration requirements --- docs/reqs/config_reqs/CONFIG_REQ003.yml | 5 ++++- docs/reqs/config_reqs/CONFIG_REQ004.yml | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/reqs/config_reqs/CONFIG_REQ003.yml b/docs/reqs/config_reqs/CONFIG_REQ003.yml index 0ef4854d..43bd58b2 100644 --- a/docs/reqs/config_reqs/CONFIG_REQ003.yml +++ b/docs/reqs/config_reqs/CONFIG_REQ003.yml @@ -7,4 +7,7 @@ normative: true ref: '' requirement-level: 2 reviewed: null -text: NOS shall be able to be reconfigured to represent multiple disparate missions (and multiple scenarios within each mission) +text: | + NOS shall be able to be reconfigured to represent: + - multiple disparate missions + - multiple scenarios within each mission diff --git a/docs/reqs/config_reqs/CONFIG_REQ004.yml b/docs/reqs/config_reqs/CONFIG_REQ004.yml index ee43b132..ce097d23 100644 --- a/docs/reqs/config_reqs/CONFIG_REQ004.yml +++ b/docs/reqs/config_reqs/CONFIG_REQ004.yml @@ -7,4 +7,8 @@ normative: true ref: '' requirement-level: 2 reviewed: null -text: NOS shall have a simulation environment which is configurable in its startup location, time, and configuration or state of the vehicle +text: | + NOS shall have a simulation environment which is configurable: + a. In its startup location + b. In its startup time + c. In configuration or state of the vehicle From f422f42d4130f88fb1544c882ea76aa96eb170a3 Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 13:00:09 -0500 Subject: [PATCH 11/35] [nos3#358] Adding the FSW requirements --- docs/reqs/fsw_reqs/FSW_REQ001.yml | 9 +++++++++ docs/reqs/fsw_reqs/FSW_REQ002.yml | 9 +++++++++ docs/reqs/fsw_reqs/FSW_REQ003.yml | 9 +++++++++ docs/reqs/fsw_reqs/FSW_REQ004.yml | 9 +++++++++ 4 files changed, 36 insertions(+) create mode 100644 docs/reqs/fsw_reqs/FSW_REQ001.yml create mode 100644 docs/reqs/fsw_reqs/FSW_REQ002.yml create mode 100644 docs/reqs/fsw_reqs/FSW_REQ003.yml create mode 100644 docs/reqs/fsw_reqs/FSW_REQ004.yml diff --git a/docs/reqs/fsw_reqs/FSW_REQ001.yml b/docs/reqs/fsw_reqs/FSW_REQ001.yml new file mode 100644 index 00000000..7707b1ae --- /dev/null +++ b/docs/reqs/fsw_reqs/FSW_REQ001.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS FSW shall be able to build and run diff --git a/docs/reqs/fsw_reqs/FSW_REQ002.yml b/docs/reqs/fsw_reqs/FSW_REQ002.yml new file mode 100644 index 00000000..32f608af --- /dev/null +++ b/docs/reqs/fsw_reqs/FSW_REQ002.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.1 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS FSW shall be able to build unit tests diff --git a/docs/reqs/fsw_reqs/FSW_REQ003.yml b/docs/reqs/fsw_reqs/FSW_REQ003.yml new file mode 100644 index 00000000..93256477 --- /dev/null +++ b/docs/reqs/fsw_reqs/FSW_REQ003.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.2 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS FSW shall be able to run code coverage diff --git a/docs/reqs/fsw_reqs/FSW_REQ004.yml b/docs/reqs/fsw_reqs/FSW_REQ004.yml new file mode 100644 index 00000000..e00f71b8 --- /dev/null +++ b/docs/reqs/fsw_reqs/FSW_REQ004.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.3 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS FSW shall be able to allow for processor-level emulation From 22c0b6f743bd3e3cc7dbbd7df2dd645ffc7f3963 Mon Sep 17 00:00:00 2001 From: Isgaroth-the-Green Date: Wed, 11 Dec 2024 13:04:19 -0500 Subject: [PATCH 12/35] [nos3#358] Updates to the sim and gsw requirements --- docs/reqs/gsw_reqs/GSW_REQ001.yml | 9 +++++++++ docs/reqs/sim_reqs/SIM_REQ001.yml | 9 +++++++++ docs/reqs/sim_reqs/SIM_REQ002.yml | 9 +++++++++ docs/reqs/sim_reqs/SIM_REQ003.yml | 9 +++++++++ docs/reqs/sim_reqs/SIM_REQ004.yml | 12 ++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 docs/reqs/gsw_reqs/GSW_REQ001.yml create mode 100644 docs/reqs/sim_reqs/SIM_REQ001.yml create mode 100644 docs/reqs/sim_reqs/SIM_REQ002.yml create mode 100644 docs/reqs/sim_reqs/SIM_REQ003.yml create mode 100644 docs/reqs/sim_reqs/SIM_REQ004.yml diff --git a/docs/reqs/gsw_reqs/GSW_REQ001.yml b/docs/reqs/gsw_reqs/GSW_REQ001.yml new file mode 100644 index 00000000..af68ebf0 --- /dev/null +++ b/docs/reqs/gsw_reqs/GSW_REQ001.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS GSW shall be able to build and run diff --git a/docs/reqs/sim_reqs/SIM_REQ001.yml b/docs/reqs/sim_reqs/SIM_REQ001.yml new file mode 100644 index 00000000..880a40a6 --- /dev/null +++ b/docs/reqs/sim_reqs/SIM_REQ001.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.0 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS sims shall be able to build and run diff --git a/docs/reqs/sim_reqs/SIM_REQ002.yml b/docs/reqs/sim_reqs/SIM_REQ002.yml new file mode 100644 index 00000000..9816c20b --- /dev/null +++ b/docs/reqs/sim_reqs/SIM_REQ002.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.1 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS sims shall be able to build unit tests diff --git a/docs/reqs/sim_reqs/SIM_REQ003.yml b/docs/reqs/sim_reqs/SIM_REQ003.yml new file mode 100644 index 00000000..9cbe5417 --- /dev/null +++ b/docs/reqs/sim_reqs/SIM_REQ003.yml @@ -0,0 +1,9 @@ +active: true +derived: false +header: '' +level: 1.2 +links: [] +normative: true +ref: '' +reviewed: null +text: NOS sims shall be able to run code coverage diff --git a/docs/reqs/sim_reqs/SIM_REQ004.yml b/docs/reqs/sim_reqs/SIM_REQ004.yml new file mode 100644 index 00000000..d1028f19 --- /dev/null +++ b/docs/reqs/sim_reqs/SIM_REQ004.yml @@ -0,0 +1,12 @@ +active: true +derived: false +header: '' +level: 1.3 +links: [] +normative: true +ref: '' +reviewed: null +text: | + NOS sims shall demonstrate every supported communication protocol: + a. SPI + b. I2C From d5c7a97a41aa947870fc534f1f9c83a57832bbe6 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Wed, 11 Dec 2024 14:57:23 -0500 Subject: [PATCH 13/35] [nasa/nos3#380] Started reorganizing the FSS Device files and adapting the Sample Checkout files to work for FSS --- components/generic_fss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_fss b/components/generic_fss index bcc68f4e..219789ec 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit bcc68f4ea092813fcea311d5c8b0bfc0919ab1ef +Subproject commit 219789ec15a99e2901b85e513a4ed698a203800a From d02bbbce79f90ebd5f8bc7f3adbbf4508756677e Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Wed, 11 Dec 2024 15:35:48 -0500 Subject: [PATCH 14/35] [nasa/nos3#380] Removed non-existant functions from the fss checkout, and updated generic_adcs includes paths in cmake to include the new shared directory for the fss device --- components/generic_adcs | 2 +- components/generic_fss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_adcs b/components/generic_adcs index 40c77957..e686aea2 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 40c77957c3f527fbcba64113f868d924946a23cf +Subproject commit e686aea236ed503b6cddb5b0c18dca11ccf17660 diff --git a/components/generic_fss b/components/generic_fss index 219789ec..8392db02 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit 219789ec15a99e2901b85e513a4ed698a203800a +Subproject commit 8392db02e2ae3698a09ff9f04dcc65504a447efa From 351c28020b7bc7c128dc101bb456cc82b9630b7e Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Fri, 13 Dec 2024 11:28:27 -0500 Subject: [PATCH 15/35] [hotfix] Rolled back SC modification to avoid issues with launching causing lack of telemetry flow; --- fsw/apps/sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/apps/sc b/fsw/apps/sc index b13da5bf..bb3e6945 160000 --- a/fsw/apps/sc +++ b/fsw/apps/sc @@ -1 +1 @@ -Subproject commit b13da5bfdb4bc0bc8902ea2364e51813ebfc7c33 +Subproject commit bb3e6945830b7e6cd7a3d25fa00969ac2c4f7be6 From 61405044afe70da8b121f97b95838eb58f1477ab Mon Sep 17 00:00:00 2001 From: "Lucas, John P" Date: Fri, 13 Dec 2024 17:54:07 +0000 Subject: [PATCH 16/35] [nasa/nos3#426] Added executible permission to ./scripts/fsw/onair_launch.sh --- scripts/fsw/onair_launch.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/fsw/onair_launch.sh diff --git a/scripts/fsw/onair_launch.sh b/scripts/fsw/onair_launch.sh old mode 100644 new mode 100755 From fac0386e50e1f21dca34bfb1b2bb3e7196ee27e6 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Fri, 13 Dec 2024 15:26:12 -0500 Subject: [PATCH 17/35] [nasa/nos3#426] Default to localhost (0.0.0.0) if hostname lookup fails for SBN; --- fsw/apps/sbn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/apps/sbn b/fsw/apps/sbn index 26a4e996..7953a380 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit 26a4e99687b5269551473a69c6273cdc23828e5b +Subproject commit 7953a380acd6c024e53b90380d0dcb5fc3c26a55 From 203518e3fba77dd52f9001d149d98888073e6c94 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Fri, 13 Dec 2024 16:50:29 -0500 Subject: [PATCH 18/35] [nasa/nos3#381] Added Reaction Wheel Checkout, updated reaction wheel app to have device files, and updated ADCS pointers to have the subdirectory for reaction wheel device --- cfg/nos3-mission.xml | 2 +- components/generic_adcs | 2 +- components/generic_reaction_wheel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 547b6317..413cae03 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - yamcs + cosmos diff --git a/components/generic_adcs b/components/generic_adcs index 40c77957..86e247fe 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 40c77957c3f527fbcba64113f868d924946a23cf +Subproject commit 86e247fe29a240ae83f6d2c69dc63465fc872f26 diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 1e89c312..b4b9b9ff 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 1e89c312edb0ff351807df5a3a4a43f66373d793 +Subproject commit b4b9b9ffd459723d9dce2bbfa9546044de8decc0 From e51bf537d4ce734af20c26222a2d5650a4b47100 Mon Sep 17 00:00:00 2001 From: Kevin Bruce <77984549+kevincbruce@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:37:18 -0500 Subject: [PATCH 19/35] Update nos3-mission.xml Fix back to yamcs default --- cfg/nos3-mission.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 413cae03..547b6317 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - cosmos + yamcs From 790506d6de704a28132ee37abfaa4d828716e785 Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Tue, 17 Dec 2024 08:02:09 -0500 Subject: [PATCH 20/35] https://github.com/nasa/nos3/issues/351 - Change Inp_DI.txt and SC_NOS3.txt to both use the identity (no) rotation. This causes the DI quaternion and the truth quaternion to track each other (when the star tracker is valid). --- cfg/InOut/SC_NOS3.txt | 4 ++-- components/generic_adcs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/InOut/SC_NOS3.txt b/cfg/InOut/SC_NOS3.txt index 9338b4b7..19878b76 100644 --- a/cfg/InOut/SC_NOS3.txt +++ b/cfg/InOut/SC_NOS3.txt @@ -13,7 +13,7 @@ CM ! Pos of CM or ORIGIN, wrt F NAN ! Ang Vel wrt [NL], Att [QA] wrt [NLF] 0.0 0.0 0.0 ! Ang Vel (deg/sec) 0.0 0.0 0.0 1.0 ! Quaternion -60.0 40.0 20.0 213 ! Angles (deg) & Euler Sequence +90.0 90.0 90.0 213 ! Angles (deg) & Euler Sequence *************************** Dynamics Flags *************************** GAUSS_ELIM ! Solve Dynamics by GAUSS_ELIM or ORDER_N FALSE ! Compute Constraint Forces and Torques @@ -249,7 +249,7 @@ Z_AXIS ! Boresight Axis X_AXIS, Y_AXIS, or Z_AXIS 1 ! Number of Star Trackers =============================== ST 0 ==================================== 0.25 ! Sample Time,sec -30.0 20.0 10.0 213 ! Mounting Angles (deg), Seq in Body +0.0 0.0 0.0 213 ! Mounting Angles (deg), Seq in Body Z_AXIS ! Boresight Axis X_AXIS, Y_AXIS, or Z_AXIS 8.0 8.0 ! H, V FOV Size, deg 30.0 10.0 10.0 ! Sun, Earth, Moon Exclusion Angles, deg diff --git a/components/generic_adcs b/components/generic_adcs index 40c77957..70fcb3a1 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 40c77957c3f527fbcba64113f868d924946a23cf +Subproject commit 70fcb3a183b33158bdca7665c2b33f3c40ef6ce5 From 8437c81b11bd70b7f94ae21797691259eb66cf67 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 18 Dec 2024 12:22:42 -0500 Subject: [PATCH 21/35] [nasa/nos3#380] Updated generic fss standalone, generic adcs to look for shared folders, added a sim_truth_interface to the configuration, and setup environment for quick testing of the FSS checkout for others to review; --- cfg/nos3-mission.xml | 2 +- cfg/sc-full-config.xml | 3 +++ cfg/sc-minimal-config.xml | 11 +++++++---- components/generic_adcs | 2 +- components/generic_fss | 2 +- scripts/cfg/configure.py | 7 +++++++ scripts/checkout.sh | 40 ++++++++++++++++++++++++++------------- 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 547b6317..4397ef1b 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -15,7 +15,7 @@ - sc-full-config.xml + sc-minimal-config.xml diff --git a/cfg/sc-full-config.xml b/cfg/sc-full-config.xml index 289cb7ad..5007eb05 100644 --- a/cfg/sc-full-config.xml +++ b/cfg/sc-full-config.xml @@ -77,4 +77,7 @@ 1.0 -1.0 + + true + \ No newline at end of file diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 8b78c6fa..3a14d38d 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -33,7 +33,7 @@ false - false + true false @@ -73,8 +73,11 @@ false - 0.1 - 1.0 - -1.0 + 5.0 + -5.0 + 5.0 + + false + \ No newline at end of file diff --git a/components/generic_adcs b/components/generic_adcs index e686aea2..011aa7f8 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit e686aea236ed503b6cddb5b0c18dca11ccf17660 +Subproject commit 011aa7f842b799ec741ea6f8cddb5f74fc88053b diff --git a/components/generic_fss b/components/generic_fss index 8392db02..485fc635 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit 8392db02e2ae3698a09ff9f04dcc65504a447efa +Subproject commit 485fc6351ae97bf992e27f781504e098cc79563e diff --git a/scripts/cfg/configure.py b/scripts/cfg/configure.py index 9507c7f0..2cb0e76e 100644 --- a/scripts/cfg/configure.py +++ b/scripts/cfg/configure.py @@ -118,6 +118,7 @@ sc_orbit_tipoff_x = sc_root.find('orbit/tipoff_x').text sc_orbit_tipoff_y = sc_root.find('orbit/tipoff_y').text sc_orbit_tipoff_z = sc_root.find('orbit/tipoff_z').text + sc_sim_truth_en = sc_root.find('sim/sim_truth_interface').text ### ### Flight Software - Startup Script @@ -311,6 +312,7 @@ st_index = 999 torquer_index = 999 thruster_index = 999 + truth_index = 999 with open('./cfg/InOut/Inp_IPC.txt', 'r') as fp: lines = fp.readlines() @@ -360,6 +362,9 @@ if line.find('Thruster IPC') != -1: if (lines.index(line)) < thruster_index: thruster_index = lines.index(line) + 1 + if line.find('Truth data') != -1: + if (lines.index(line)) < truth_index: + truth_index = lines.index(line) + 1 ipc_off = 'OFF ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)\n' if (sc_css_en != 'true'): @@ -387,6 +392,8 @@ lines[torquer_index] = ipc_off if (sc_thruster_en != 'true'): lines[thruster_index] = ipc_off + if (sc_sim_truth_en != 'true'): + lines[truth_index] = ipc_off with open('./cfg/build/InOut/Inp_IPC.txt', 'w') as fp: lines = "".join(lines) diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 21c61e8b..821672db 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -19,22 +19,20 @@ echo "" # Debugging # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually -#echo "42..." -#rm -rf $USER_NOS3_DIR/42/NOS3InOut -#cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut -#xhost +local:* -#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut -#echo "" - echo "NOS Core..." gnome-terminal --tab --title="NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal +echo "" -echo " Checkout..." -# Rename for your simulator under test to allow checkout, uncomment if already exists - -# Example manual build for sample checkout: +## +## HOW TO CHECKOUT +## +# Rename for your simulator under test in this file below to allow checkout, uncomment if already exists +# Change configuration for your selected component (if using 42 for data) +# Modify ./cfg/nos3-mission.xml to use `sc-minimal-config.xml` +# Modify ./cfg/sc_minimal-config.xml to enable your specific component to test +# Manually build checkout: (sample shown as reference) # make debug # cd ./components/sample/fsw/standalone # mkdir build @@ -42,6 +40,11 @@ echo " Checkout..." # cmake .. -DTGTNAME=cpu1 # make # exit +# Run `make clean; make; make checkout` +# Double check everything running as expected +# Run tests as needed +# Run `make stop` and repeat until feature complete +echo "Checkout..." ## ## Arducam @@ -49,11 +52,22 @@ echo " Checkout..." #gnome-terminal --tab --title="Arducam Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim #gnome-terminal --title="Arducam Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_arducam_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/arducam/fsw/standalone/build/arducam_checkout +## +## Fine Sun Sensor (FSS) +## +rm -rf $USER_NOS3_DIR/42/NOS3InOut +cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut +xhost +local:* +gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +echo "" +gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim +gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout + ## ## Sample ## -gnome-terminal --tab --title="Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim -gnome-terminal --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/fsw/standalone/build/sample_checkout +#gnome-terminal --tab --title="Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim +#gnome-terminal --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/fsw/standalone/build/sample_checkout # sleep 1 # urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") From 95c6b2948d66af02fc0c5cf1d144fb0f972d7d8b Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Wed, 18 Dec 2024 14:49:40 -0500 Subject: [PATCH 22/35] [nasa/nos3#380] updated pointers for merge --- components/generic_adcs | 2 +- components/generic_fss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_adcs b/components/generic_adcs index 011aa7f8..bf098d87 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 011aa7f842b799ec741ea6f8cddb5f74fc88053b +Subproject commit bf098d87c8d7a4db1ee151971502e8aafdd6c7e4 diff --git a/components/generic_fss b/components/generic_fss index 485fc635..a9b17808 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit 485fc6351ae97bf992e27f781504e098cc79563e +Subproject commit a9b178089336e5ef1a7eab096a1186812f37132d From a6aba33faa1404580ccf3f422f1fd9bfd192525b Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Wed, 18 Dec 2024 16:19:46 -0500 Subject: [PATCH 23/35] [nasa/nos3#381] Attempted to do fixes, but issues launching sims --- components/generic_reaction_wheel | 2 +- scripts/checkout.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index b4b9b9ff..a5f2c00b 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit b4b9b9ffd459723d9dce2bbfa9546044de8decc0 +Subproject commit a5f2c00b6d9546b7bcd19dd55478bac354209ca3 diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 821672db..f3670e91 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -62,6 +62,15 @@ gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $U echo "" gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout +echo "" + +## +## Reaction Wheels (RW) +## +gnome-terminal --tab --title=$SC_NUM" - RW_0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_0_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 +gnome-terminal --tab --title=$SC_NUM" - RW_1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_1_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 +gnome-terminal --tab --title=$SC_NUM" - RW_2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_2_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 +gnome-terminal --title="RW Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_rw_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_reaction_wheel/fsw/standalone/build/generic_reaction_wheel_checkout ## ## Sample From 9299af3294a76e00ec053e761d39cb296d90e8fd Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Wed, 18 Dec 2024 16:28:41 -0500 Subject: [PATCH 24/35] [nasa/nos3#381] Attempted to use RW sim launches from make launch cfs. Didn't seem to work --- scripts/checkout.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/checkout.sh b/scripts/checkout.sh index f3670e91..2ff52bda 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -67,9 +67,9 @@ echo "" ## ## Reaction Wheels (RW) ## -gnome-terminal --tab --title=$SC_NUM" - RW_0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_0_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 -gnome-terminal --tab --title=$SC_NUM" - RW_1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_1_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 -gnome-terminal --tab --title=$SC_NUM" - RW_2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_2_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 +gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 +gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 +gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 gnome-terminal --title="RW Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_rw_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_reaction_wheel/fsw/standalone/build/generic_reaction_wheel_checkout ## From 6cf5e9de14a59b9ab2afea35aece741e9f43e2d5 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Thu, 19 Dec 2024 13:51:28 -0500 Subject: [PATCH 25/35] [nasa/nos3#381] Updates to enable RW sims in config and assure checkout is launching by itself --- cfg/sc-minimal-config.xml | 6 +++--- components/generic_reaction_wheel | 2 +- scripts/checkout.sh | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 3a14d38d..d2080abf 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -33,7 +33,7 @@ false - true + false false @@ -45,13 +45,13 @@ false - true + false false - false + true true diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index a5f2c00b..86e05342 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit a5f2c00b6d9546b7bcd19dd55478bac354209ca3 +Subproject commit 86e053423b2e7e19ce8c3f340ab3677a592873ed diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 2ff52bda..1ced0ef8 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -55,18 +55,23 @@ echo "Checkout..." ## ## Fine Sun Sensor (FSS) ## +# rm -rf $USER_NOS3_DIR/42/NOS3InOut +# cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut +# xhost +local:* +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# echo "" +# gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim +# gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout +# echo "" + +## +## Reaction Wheels (RW) +## rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" -gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim -gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout -echo "" - -## -## Reaction Wheels (RW) -## gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 From 6ededdd0ad323eba565a37a51b54ddfd7fec89a7 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Thu, 19 Dec 2024 14:50:08 -0500 Subject: [PATCH 26/35] [nasa/nos3#381] Pushing RW Checkout/App/Device fixes to top level --- components/generic_reaction_wheel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 86e05342..d2c65b52 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 86e053423b2e7e19ce8c3f340ab3677a592873ed +Subproject commit d2c65b5227017a87219757890fc71fd5bd1232c2 From eee8dad9cbf48c69b9e05cc9c76c7b7d9b1790e2 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 19 Dec 2024 19:26:03 -0500 Subject: [PATCH 27/35] [nasa/nos3#382] Updated generic_torquer to include a standalone checkout; --- cfg/sc-minimal-config.xml | 6 +++--- components/generic_torquer | 2 +- scripts/checkout.sh | 20 +++++++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 3a14d38d..0b99fe6e 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -33,7 +33,7 @@ false - true + false false @@ -45,7 +45,7 @@ false - true + false false @@ -63,7 +63,7 @@ false - false + true false diff --git a/components/generic_torquer b/components/generic_torquer index 34bf9c24..1f4d58c6 160000 --- a/components/generic_torquer +++ b/components/generic_torquer @@ -1 +1 @@ -Subproject commit 34bf9c24ad810ec3b499ac1b5b240e9dcd2dfff0 +Subproject commit 1f4d58c66e7e9979f15b06eba255b56cd3aebf7f diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 821672db..02353607 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -55,13 +55,13 @@ echo "Checkout..." ## ## Fine Sun Sensor (FSS) ## -rm -rf $USER_NOS3_DIR/42/NOS3InOut -cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut -xhost +local:* -gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut -echo "" -gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim -gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout +#rm -rf $USER_NOS3_DIR/42/NOS3InOut +#cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut +#xhost +local:* +#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +#echo "" +#gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim +#gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout ## ## Sample @@ -69,6 +69,12 @@ gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $ #gnome-terminal --tab --title="Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim #gnome-terminal --title="Sample Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/sample/fsw/standalone/build/sample_checkout +## +## Torquer +## +gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim +gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_torquer_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_torquer/fsw/standalone/build/generic_torquer_checkout + # sleep 1 # urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") # sleep 10 From 53b31fae25d59f6abf59e8133707e8849d3c9d96 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 19 Dec 2024 22:25:10 -0500 Subject: [PATCH 28/35] [nasa/nos3#382] Updates to get generic torquer unit tests working for CI; --- components/generic_torquer | 2 +- fsw/apps/hwlib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_torquer b/components/generic_torquer index 1f4d58c6..54dee27f 160000 --- a/components/generic_torquer +++ b/components/generic_torquer @@ -1 +1 @@ -Subproject commit 1f4d58c66e7e9979f15b06eba255b56cd3aebf7f +Subproject commit 54dee27f441414eccd67ec5fbb89ceba110cd434 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index 9c4dc2a1..9cb56bc5 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit 9c4dc2a169f220c515629e5e8cc1a60929605035 +Subproject commit 9cb56bc555f58cf1f11e779766374a75fd33896e From fb3c878844f11e530a03442d841dafb541dd27dc Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Fri, 20 Dec 2024 09:51:39 -0500 Subject: [PATCH 29/35] [nasa/nos3#381] Removing build files from commit --- components/generic_reaction_wheel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index d2c65b52..78520ec1 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit d2c65b5227017a87219757890fc71fd5bd1232c2 +Subproject commit 78520ec1c07075b9566d794b4549949af9e8be9c From 01caa56957b70abce412792b912a7c41b0a6f4d2 Mon Sep 17 00:00:00 2001 From: Kevin Bruce Date: Fri, 20 Dec 2024 10:05:00 -0500 Subject: [PATCH 30/35] [nasa/nos3#381] pushed double fix to top level --- components/generic_reaction_wheel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 78520ec1..3b7be181 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 78520ec1c07075b9566d794b4549949af9e8be9c +Subproject commit 3b7be181697527a035508b2c48e312d62b1ca966 From 15b9dbf66e767098c809d2442350c5e59490cd4e Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 20 Dec 2024 11:09:15 -0500 Subject: [PATCH 31/35] [nasa/nos3#381] - Fixed renamed uninstall target. Fixed mission xml to default to COSMOS and full config. Fixed minimal config to really be minimal. Update reaction wheel submodule to fix constructor. --- Makefile | 2 +- cfg/nos3-mission.xml | 4 ++-- cfg/sc-minimal-config.xml | 6 +++--- components/generic_reaction_wheel | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 31640064..2560e7e6 100755 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # The "LOCALTGTS" defines the top-level targets that are implemented in this makefile # Any other target may also be given, in that case it will simply be passed through. -LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw +LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep sim stop stop-gsw uninstall OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS)) # As this makefile does not build any real files, treat everything as a PHONY target diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 4397ef1b..413cae03 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - yamcs + cosmos @@ -15,7 +15,7 @@ - sc-minimal-config.xml + sc-full-config.xml diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index d2080abf..a25b0c65 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -51,10 +51,10 @@ false - true + false - true + false false @@ -70,7 +70,7 @@ - false + true 5.0 diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index 3b7be181..c24ed5f5 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit 3b7be181697527a035508b2c48e312d62b1ca966 +Subproject commit c24ed5f5cdcb22902e7290aa4d3e8978d2534261 From 049334d376a63cb095aa2cd4d68b1cd35126cc3e Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Fri, 20 Dec 2024 11:55:39 -0500 Subject: [PATCH 32/35] [nasa/nos3#381] - Fix YAMCS to be the default as intended. --- cfg/nos3-mission.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index 413cae03..547b6317 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -4,7 +4,7 @@ - cosmos + yamcs From 0fbbd8e41b720dcf4149d68a6a5bcd3374cfbd00 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Mon, 6 Jan 2025 16:30:02 -0500 Subject: [PATCH 33/35] [nasa/nos3#382] Updates to after code reviewsfor generic torquer checkout; --- components/generic_torquer | 2 +- fsw/apps/hwlib | 2 +- scripts/checkout.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/generic_torquer b/components/generic_torquer index 54dee27f..e9856ee8 160000 --- a/components/generic_torquer +++ b/components/generic_torquer @@ -1 +1 @@ -Subproject commit 54dee27f441414eccd67ec5fbb89ceba110cd434 +Subproject commit e9856ee8c86e31b8b9310d8d43be26be0bab09ae diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index 9cb56bc5..0cabb81b 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit 9cb56bc555f58cf1f11e779766374a75fd33896e +Subproject commit 0cabb81bc3a63c2cdae570c2db9b42a724fe9cbc diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 02353607..44f014fc 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -73,7 +73,7 @@ echo "Checkout..." ## Torquer ## gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim -gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_torquer_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_torquer/fsw/standalone/build/generic_torquer_checkout +gnome-terminal --title="Torquer Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_torquer_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_torquer/fsw/standalone/build/generic_torquer_checkout # sleep 1 # urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") From d7500076e69b19ec21d9865a453caadf416228fa Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Mon, 6 Jan 2025 16:50:10 -0500 Subject: [PATCH 34/35] [nasa/nos3#351] Updated submodules after code review and merges; --- components/generic_adcs | 2 +- components/generic_star_tracker | 2 +- components/generic_thruster | 2 +- components/sample | 2 +- sims/truth_42_sim | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/generic_adcs b/components/generic_adcs index 91d4e7be..f386ba7d 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 91d4e7be01e9266c638c672802fcc2685430f710 +Subproject commit f386ba7d6a91d4c273aecd704c93beb3069d1c22 diff --git a/components/generic_star_tracker b/components/generic_star_tracker index db8dce65..b6d75f3c 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit db8dce650f484b148cff2873685d1f96e529022e +Subproject commit b6d75f3c3538421095a6738d36e28b62e2022f8e diff --git a/components/generic_thruster b/components/generic_thruster index bb30f29a..68260572 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit bb30f29ad5c9ebe8a8c597f96745cb85367a804b +Subproject commit 68260572c34f6b8ff29678970759671b227a2b4b diff --git a/components/sample b/components/sample index 8281b229..59034a0b 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 8281b229e40f149b88b51e5d4e51e9918e18ac42 +Subproject commit 59034a0bfd9eb02823f1ea036266aeb36f2149d7 diff --git a/sims/truth_42_sim b/sims/truth_42_sim index 3d99405b..6b9cd330 160000 --- a/sims/truth_42_sim +++ b/sims/truth_42_sim @@ -1 +1 @@ -Subproject commit 3d99405ba930df74aafca1c46ddb8c966627a70d +Subproject commit 6b9cd330aac0993cd3a8d90e3d2eba346075568b From 379da3c18c78f53ff92722850d855a007b6a2a61 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Mon, 6 Jan 2025 17:40:51 -0500 Subject: [PATCH 35/35] [nasa/nos3#381] Updates after code review in prep for merge; --- components/generic_adcs | 2 +- components/generic_reaction_wheel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/generic_adcs b/components/generic_adcs index 91d4e7be..f143f8d9 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 91d4e7be01e9266c638c672802fcc2685430f710 +Subproject commit f143f8d9c4bba012a44aa53599c2d8cff858c008 diff --git a/components/generic_reaction_wheel b/components/generic_reaction_wheel index c24ed5f5..5d8d6041 160000 --- a/components/generic_reaction_wheel +++ b/components/generic_reaction_wheel @@ -1 +1 @@ -Subproject commit c24ed5f5cdcb22902e7290aa4d3e8978d2534261 +Subproject commit 5d8d60414b2eb632d212a39f05375ad71b2870b1