From e46b56e5d2b6472b73981d260712194dcfe671fb Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Tue, 20 May 2025 09:11:50 -0400 Subject: [PATCH 1/3] https://github.com/nasa/nos3/issues/697 - Protect FSS, star tracker, thruster, and sample data point from seg fault. --- components/generic_fss | 2 +- components/generic_star_tracker | 2 +- components/generic_thruster | 2 +- components/sample | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/generic_fss b/components/generic_fss index 4a330c470..82d60dfde 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit 4a330c470ed1f2686178cdf57b29e890e50426d4 +Subproject commit 82d60dfde0e9873f8d5a14c150df4ec797710258 diff --git a/components/generic_star_tracker b/components/generic_star_tracker index 1078667e7..522c1cbd9 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit 1078667e7ae5212f80e98e105cbc7921cad1e155 +Subproject commit 522c1cbd9d843516ed6ad4766152031bdafdc92e diff --git a/components/generic_thruster b/components/generic_thruster index a250e2110..fcffc05f6 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit a250e21107639f2f011d96ea1c6cbc4e3580d4f1 +Subproject commit fcffc05f6eefa9775c5021e9b7a045dc5b92d1ce diff --git a/components/sample b/components/sample index 862b50b2f..4cc8051d8 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 862b50b2f20b1f94a6d849961eeb86b995ad3071 +Subproject commit 4cc8051d8a789016c50619eda77df731168a407e From 6b8f496215ae862ad561d2fc065bc3493302477a Mon Sep 17 00:00:00 2001 From: Mark Suder Date: Tue, 20 May 2025 10:07:52 -0400 Subject: [PATCH 2/3] https://github.com/nasa/nos3/issues/697 - Pull in sim_common changes that the updated FSS depends on. --- sims/sim_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/sim_common b/sims/sim_common index 883f9abb1..fa969924b 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit 883f9abb1467c7aba4de0a2b3ccd6f50e6e0bed1 +Subproject commit fa969924b3bab247b52efd1558d03e77c2bafef9 From a7acfcfea8e6777ee58d5878ca236a13f5bca44c Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 28 May 2025 10:43:59 -0400 Subject: [PATCH 3/3] [nasa/nos3#697] Updates to submodules after PR review; --- .github/pull_request_template.md | 2 +- components/generic_fss | 2 +- components/generic_star_tracker | 2 +- components/generic_thruster | 2 +- components/sample | 2 +- sims/sim_common | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 788aa40a1..a13ce40f3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,7 +3,7 @@ Summary of PR goals. How to test? * ... -Submodule PRs and actions prior to closing this +Submodule PRs and actions prior to closing this: * ... Closes #issue. diff --git a/components/generic_fss b/components/generic_fss index 82d60dfde..79c591811 160000 --- a/components/generic_fss +++ b/components/generic_fss @@ -1 +1 @@ -Subproject commit 82d60dfde0e9873f8d5a14c150df4ec797710258 +Subproject commit 79c591811226eb9bf74b82c97a3397d6b1b04c9e diff --git a/components/generic_star_tracker b/components/generic_star_tracker index 522c1cbd9..a4bdc659e 160000 --- a/components/generic_star_tracker +++ b/components/generic_star_tracker @@ -1 +1 @@ -Subproject commit 522c1cbd9d843516ed6ad4766152031bdafdc92e +Subproject commit a4bdc659eacaf4fd3d793814949ffe6538d8c995 diff --git a/components/generic_thruster b/components/generic_thruster index fcffc05f6..e0c41c656 160000 --- a/components/generic_thruster +++ b/components/generic_thruster @@ -1 +1 @@ -Subproject commit fcffc05f6eefa9775c5021e9b7a045dc5b92d1ce +Subproject commit e0c41c6563bb12b371e49704e5d3a8c451d754dc diff --git a/components/sample b/components/sample index 4cc8051d8..7abf763f9 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit 4cc8051d8a789016c50619eda77df731168a407e +Subproject commit 7abf763f9c7b1a8a346c97ba866dc90c11d45ef3 diff --git a/sims/sim_common b/sims/sim_common index fa969924b..5ed92a444 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit fa969924b3bab247b52efd1558d03e77c2bafef9 +Subproject commit 5ed92a444387cf05eaf572f07f71f9ae2bec03e1