From af06ffca4d630fb9a39bdf507244eb41610c427b Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Tue, 2 Sep 2025 06:51:35 -0400 Subject: [PATCH 1/4] [tryspaceorg/tryspace-lab#25] Added ./comp/adcs submodule --- .gitmodules | 4 ++++ comp/adcs | 1 + 2 files changed, 5 insertions(+) create mode 160000 comp/adcs diff --git a/.gitmodules b/.gitmodules index 429953e..47ae3e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = comp/cryptolib url = https://github.com/TrySpaceOrg/tryspace-ext-cryptolib.git branch = dev +[submodule "comp/adcs"] + path = comp/adcs + url = https://github.com/TrySpaceOrg/tryspace-comp-adcs.git + branch = main diff --git a/comp/adcs b/comp/adcs new file mode 160000 index 0000000..d3e884b --- /dev/null +++ b/comp/adcs @@ -0,0 +1 @@ +Subproject commit d3e884b2bd43e39a3b16a7f2c1c88b771f11d929 From 8c183961b5d94aaed3a5d96f43296131633f4194 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 3 Sep 2025 17:17:53 -0400 Subject: [PATCH 2/4] [tryspaceorg/tryspace-lab#25] Initial ADCS; --- cfg/Dockerfile.base | 1 + cfg/drm/drm.yaml | 1 + comp/adcs | 2 +- fsw | 2 +- gsw | 2 +- simulith | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg/Dockerfile.base b/cfg/Dockerfile.base index a75a5a4..b59fd6e 100644 --- a/cfg/Dockerfile.base +++ b/cfg/Dockerfile.base @@ -17,6 +17,7 @@ RUN apt-get update && \ cmake \ curl \ gcovr \ + gdb \ git \ gpg \ lcov \ diff --git a/cfg/drm/drm.yaml b/cfg/drm/drm.yaml index 5067847..ccfad0e 100644 --- a/cfg/drm/drm.yaml +++ b/cfg/drm/drm.yaml @@ -1,5 +1,6 @@ mission_name: "drm" components: + - name: "adcs" - name: "demo" - name: "eps" - name: "radio" diff --git a/comp/adcs b/comp/adcs index d3e884b..3911cd9 160000 --- a/comp/adcs +++ b/comp/adcs @@ -1 +1 @@ -Subproject commit d3e884b2bd43e39a3b16a7f2c1c88b771f11d929 +Subproject commit 3911cd9669fc4467d9a0109307a8ee755b535d03 diff --git a/fsw b/fsw index 5f315b8..e918640 160000 --- a/fsw +++ b/fsw @@ -1 +1 @@ -Subproject commit 5f315b892672c7c915a298c66b956e002fbadc6c +Subproject commit e9186408a4513b54c94cdd5aeef29a6cc79b1e27 diff --git a/gsw b/gsw index 9e01c6a..4e21263 160000 --- a/gsw +++ b/gsw @@ -1 +1 @@ -Subproject commit 9e01c6a9a6b6b82c6017e8a95798d9eb23660177 +Subproject commit 4e212637d4ed202abd7330ed0c3d7d07251672a8 diff --git a/simulith b/simulith index b04112a..f0985e1 160000 --- a/simulith +++ b/simulith @@ -1 +1 @@ -Subproject commit b04112a3d848ca7d4c3c213079cf881bf037f541 +Subproject commit f0985e143f58a00ce5758775023214cad5949f0f From e890788c4fd92e0284fe657896f84098b89197ed Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 3 Sep 2025 21:31:11 -0400 Subject: [PATCH 3/4] [tryspaceorg/tryspace-lab#25] ADCS updates to xtce and unit tests; --- comp/adcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp/adcs b/comp/adcs index 3911cd9..4e7635c 160000 --- a/comp/adcs +++ b/comp/adcs @@ -1 +1 @@ -Subproject commit 3911cd9669fc4467d9a0109307a8ee755b535d03 +Subproject commit 4e7635c5b2182e5e36f305e5c12fe5aea0d8a9cf From 160ef7ef3024668916e6e3340b64beeffa27c233 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 3 Sep 2025 21:39:27 -0400 Subject: [PATCH 4/4] [tryspaceorg/tryspace-lab#25] Submodule updates after PR review; --- comp/adcs | 2 +- fsw | 2 +- gsw | 2 +- simulith | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comp/adcs b/comp/adcs index 4e7635c..6abe233 160000 --- a/comp/adcs +++ b/comp/adcs @@ -1 +1 @@ -Subproject commit 4e7635c5b2182e5e36f305e5c12fe5aea0d8a9cf +Subproject commit 6abe2332fcfb44e29426fc68cdf93a2c13f5bfe3 diff --git a/fsw b/fsw index e918640..02cc313 160000 --- a/fsw +++ b/fsw @@ -1 +1 @@ -Subproject commit e9186408a4513b54c94cdd5aeef29a6cc79b1e27 +Subproject commit 02cc313de5bb0251088e2e8afb90a1ced06ca388 diff --git a/gsw b/gsw index 4e21263..b49aa90 160000 --- a/gsw +++ b/gsw @@ -1 +1 @@ -Subproject commit 4e212637d4ed202abd7330ed0c3d7d07251672a8 +Subproject commit b49aa9040de08955ebf84aecca5008403eefcd46 diff --git a/simulith b/simulith index f0985e1..8557b30 160000 --- a/simulith +++ b/simulith @@ -1 +1 @@ -Subproject commit f0985e143f58a00ce5758775023214cad5949f0f +Subproject commit 8557b3014fd41fa07caaa33d5d642bb23240637c