Release 1.0.0

.github/ISSUE_TEMPLATE/2-FEATURE_REQUEST.yml

@@ -11,7 +11,6 @@ body:
       label: "Description"
       value: |
         Provide details related to the new feature.
-      render: bash
     validations:
       required: true
   - type: markdown

.github/PULL_REQUEST_TEMPLATE/feature.md

@@ -0,0 +1,21 @@
+## Summary
+
+Provide a brief description of the changes in this pull request.
+
+## How to Test
+
+* ...
+
+## Checklist
+
+- [ ] My code follows the project's coding standards
+- [ ] I have performed a self-review of my own code
+- [ ] I have made corresponding changes to the documentation
+- [ ] I have added tests that prove my fix is effective or that my feature works
+
+## Related
+
+List any related issues or submodule PRs that need to be completed:
+* ...
+
+Closes #123.

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   build-simulith:
     runs-on: ubuntu-latest
     container:
-        image: tryspaceorg/tryspace-lab:0.0.0
+        image: tryspaceorg/tryspace-lab:1.0.0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
   build-fsw:
     runs-on: ubuntu-latest
     container:
-        image: tryspaceorg/tryspace-lab:0.0.0
+        image: tryspaceorg/tryspace-lab:1.0.0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -47,13 +47,15 @@ jobs:
         run: |
           cd cfg
           python3 tryspace-orchestrator.py
+          export MISSION=$(python3 -c "import yaml; print(yaml.safe_load(open('active.yaml'))['mission'])")
+          export SPACECRAFT=$(python3 -c "import yaml; print(yaml.safe_load(open('active.yaml'))['spacecraft'])")
           cd ../fsw
-          make build-fsw
+          MISSION=$MISSION SPACECRAFT=$SPACECRAFT make build-fsw
 
   build-test:
     runs-on: ubuntu-latest
     container:
-        image: tryspaceorg/tryspace-lab:0.0.0
+        image: tryspaceorg/tryspace-lab:1.0.0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -64,10 +66,34 @@ jobs:
         run: |
           cd cfg
           python3 tryspace-orchestrator.py
+          export MISSION=$(python3 -c "import yaml; print(yaml.safe_load(open('active.yaml'))['mission'])")
+          export SPACECRAFT=$(python3 -c "import yaml; print(yaml.safe_load(open('active.yaml'))['spacecraft'])")
           cd ../fsw
-          make build-test
+          MISSION=$MISSION SPACECRAFT=$SPACECRAFT make build-test
       - name: Upload to Codecov
         uses: codecov/codecov-action@v5
         with:
           verbose: true
           recurse_submodules: true
+
+  build-cli:
+    runs-on: ubuntu-latest
+    container:
+        image: tryspaceorg/tryspace-lab:1.0.0
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 1
+      - name: Build CLI
+        run: |
+          cd cfg
+          python3 tryspace-orchestrator.py
+          cd ..
+          for dir in $(pwd)/comp/*/cli ; do
+            if [ -f "$dir/Makefile" ]; then
+              echo "Building CLI component in $dir"
+              make -C "$dir" build-cli || { echo "Failed building $dir"; exit 1; }
+            fi
+          done

.gitignore

@@ -1,4 +1,6 @@
 .vscode
 build
 cfg/active.yaml
-cfg/build.yaml
+cfg/build.yaml
+cfg/cli-compose.yaml
+cfg/lab-compose.yaml

.gitmodules

@@ -18,3 +18,19 @@
 	path = atlas
 	url = https://github.com/TrySpaceOrg/TrySpaceOrg.github.io.git
 	branch = main
+[submodule "comp/eps"]
+	path = comp/eps
+	url = https://github.com/TrySpaceOrg/tryspace-comp-eps.git
+	branch = main
+[submodule "comp/radio"]
+	path = comp/radio
+	url = https://github.com/TrySpaceOrg/tryspace-comp-radio.git
+	branch = main
+[submodule "comp/cryptolib"]
+	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

Makefile

@@ -1,12 +1,26 @@
 # Makefile for TrySpace Lab development
-.PHONY: build clean clean-cli clean-fsw clean-gsw clean-sim cfg cli container debug fsw gsw help sim start stop uninstall
+.PHONY: build clean clean-cache clean-cli clean-fsw clean-gsw clean-sim cfg cli cli-start container debug fsw gsw help mold sim start stop uninstall
 
 # Build image name
-export BUILD_IMAGE ?= tryspaceorg/tryspace-lab:0.0.0
+export BUILD_IMAGE ?= tryspaceorg/tryspace-lab:1.0.0
 
 # Common paths
 CFG_DIR := $(CURDIR)/cfg
 
+# Read spacecraft from active.yaml for unified build directory structure
+SPACECRAFT := $(shell grep '^spacecraft:' $(CFG_DIR)/active.yaml 2>/dev/null | sed 's/spacecraft: *//' | tr -d ' ')
+MISSION := $(shell grep '^mission:' $(CFG_DIR)/active.yaml 2>/dev/null | sed 's/mission: *//' | tr -d ' ')
+ifneq ($(SPACECRAFT),)
+ifneq ($(MISSION),)
+export BUILDDIR_MISSION := $(CURDIR)/build/$(MISSION)/
+export BUILDDIR_BASE := $(BUILDDIR_MISSION)/$(SPACECRAFT)
+export BUILDDIR_SIM := $(BUILDDIR_BASE)/sim
+export BUILDDIR_FSW := $(BUILDDIR_BASE)/fsw
+export BUILDDIR_GSW := $(BUILDDIR_BASE)/gsw
+export BUILDDIR_COMP := $(BUILDDIR_BASE)/comp
+endif
+endif
+
 # Commands
 build: cfg
 	$(MAKE) sim
@@ -18,17 +32,18 @@ cfg: container
 
 clean:
 	$(MAKE) stop
-	@if docker image inspect $(BUILD_IMAGE):latest >/dev/null 2>&1; then \
-		$(MAKE) clean-cli; \
-		$(MAKE) clean-fsw; \
+	@if docker image inspect $(BUILD_IMAGE) >/dev/null 2>&1; then \
+		rm -rf $(BUILDDIR_MISSION); \
 		$(MAKE) clean-gsw; \
-		$(MAKE) clean-sim; \
-		docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm \
-		docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm \
+		docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm; \
+		docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm; \
 	else \
 		echo "Docker image $(BUILD_IMAGE) does not exist. Skipping clean subcommands."; \
 	fi
-	rm -f $(CFG_DIR)/active.yaml $(CFG_DIR)/build.yaml 
+
+clean-cache:
+	docker builder prune -f
+	docker volume rm -f gsw-data simulith_ipc || true
 
 clean-cli:
 	@for dir in $(CURDIR)/comp/*/cli ; do \
@@ -44,7 +59,7 @@ clean-gsw:
 	cd gsw && $(MAKE) clean
 
 clean-sim:
-	@for dir in $(CURDIR)/comp/* ; do \
+	@for dir in $(CURDIR)/comp/*/sim ; do \
 		if [ -d "$$dir" ] && [ -f "$$dir/Makefile" ]; then \
 			$(MAKE) -C "$$dir" clean; \
 		fi; \
@@ -55,11 +70,13 @@ cli: cfg
 	$(MAKE) container
 	@for dir in $(CURDIR)/comp/*/cli ; do \
         if [ -f "$$dir/Makefile" ]; then \
-            $(MAKE) -C "$$dir" runtime; \
+            comp_name=$$(basename $$(dirname "$$dir")); \
+            $(MAKE) -C "$$dir" runtime BUILDDIR=$(BUILDDIR_COMP)/$$comp_name/cli; \
         fi; \
     done
-	cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server
-	docker compose -f ./cfg/cli-compose.yml up
+
+cli-start: cfg
+	docker compose -f ./cfg/cli-compose.yaml up
 
 container: cfg/Dockerfile.base
 	@command -v docker >/dev/null 2>&1 || { echo "Error: docker is not installed or not in PATH."; exit 1; }
@@ -69,18 +86,30 @@ debug: cfg
 	docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_debug" -w $(CURDIR) --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE) /bin/bash
 
 fsw: cfg
-	cd $(CURDIR)/fsw && $(MAKE) runtime
+	cd $(CURDIR)/fsw && $(MAKE) runtime BUILDDIR=$(BUILDDIR_FSW) SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION)
 
 gsw: cfg
-	cd $(CURDIR)/gsw && $(MAKE) runtime
+	cd $(CURDIR)/comp/cryptolib && $(MAKE) tryspace SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION)
+	cd $(CURDIR)/gsw && $(MAKE) runtime BUILDDIR=$(BUILDDIR_GSW) SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION)
+
+mold:
+	@if [ "$(COMP)" = "" ]; then \
+		echo "Error: COMP parameter is required"; \
+		echo "Usage: make mold COMP=<name>"; \
+		echo "Example: make mold COMP=my_sensor"; \
+		exit 1; \
+	fi
+	python3 $(CFG_DIR)/tryspace-comp-mold.py "$(COMP)"
 
 help:
 	@echo "Usage: make <target>"
 	@echo "Targets:"
 	@echo "  build         - Build the full runtime environment"
 	@echo "  cfg           - Run orchestrator to configure environment"
-	@echo "  cli           - Build CLI and start CLI services"
-	@echo "  clean         - Remove build artifacts and stop services"
+	@echo "  cli           - Build CLI components"
+	@echo "  cli-start     - Start CLI compose"
+	@echo "  clean         - Remove build artifacts and stop compose"
+	@echo "  clean-cache   - Clean Docker build cache (frees significant disk space)"
 	@echo "  clean-cli     - Clean CLI components"
 	@echo "  clean-fsw     - Clean FSW components"
 	@echo "  clean-gsw     - Clean GSW components"
@@ -89,32 +118,39 @@ help:
 	@echo "  debug         - Start a debug shell in the container"
 	@echo "  fsw           - Build FSW"
 	@echo "  gsw           - Build GSW"
+	@echo "  mold          - Create new component from demo template (Usage: make mold COMP=<name>)"
 	@echo "  sim           - Build Simulith and component simulators"
-	@echo "  start         - Start lab services"
-	@echo "  stop          - Stop lab and CLI services, clean up Docker images"
+	@echo "  start         - Start lab compose"
+	@echo "  stop          - Stop lab and CLI compose, clean up Docker images"
 	@echo "  uninstall     - Remove containers, images, volumes, and networks"
 
 sim: cfg
+	cd $(CURDIR)/simulith && $(MAKE) build BUILDDIR=$(BUILDDIR_SIM) SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION)
 	@for dir in $(CURDIR)/comp/*/sim ; do \
 		if [ -d "$$dir" ] && [ -f "$$dir/Makefile" ]; then \
 			echo "Building component in $$dir"; \
-			$(MAKE) -C "$$dir" runtime; \
+			comp_name=$$(basename $$(dirname "$$dir")); \
+			$(MAKE) -C "$$dir" build BUILDDIR=$(BUILDDIR_COMP)/$$comp_name/sim; \
 		fi; \
 	done
-	cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server
+	cd $(CURDIR)/simulith && $(MAKE) director BUILDDIR=$(BUILDDIR_SIM) BUILDDIR_COMP=$(BUILDDIR_COMP) SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION) && $(MAKE) server BUILDDIR=$(BUILDDIR_SIM) BUILDDIR_COMP=$(BUILDDIR_COMP) SPACECRAFT=$(SPACECRAFT) MISSION=$(MISSION)
 
 start: cfg
-	docker compose -f ./cfg/lab-compose.yml up
+	docker compose -f ./cfg/lab-compose.yaml up
 
 stop:
-	docker compose -f ./cfg/cli-compose.yml down
-	docker compose -f ./cfg/lab-compose.yml down
+	docker compose -f ./cfg/cli-compose.yaml down --remove-orphans
+	docker compose -f ./cfg/lab-compose.yaml down --remove-orphans
 	docker images -f "dangling=true" -q | xargs -r docker rmi
+	@echo ""
+	@echo "To cleanup Docker build cache, run: make clean-cache"
+	@echo "To cleanup everything Docker, run: docker system prune -a"
 
-uninstall: clean
+uninstall: clean clean-cache
+	rm -f $(CFG_DIR)/active.yaml $(CFG_DIR)/build.yaml 
 	docker ps -a --filter "name=tryspace-" -q | xargs -r docker rm -f
-	docker images "tryspace-*" -q | xargs -r docker rmi
-	docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm
+	docker images "tryspace-*" -q | xargs -r docker rmi -f
+	docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm -f 
 	docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm
 	docker network ls -q --filter "name=tryspace-net" | xargs -r docker network rm
 	docker network ls -q --filter "name=cfg_tryspace-net" | xargs -r docker network rm

cfg/Dockerfile.base

@@ -3,7 +3,7 @@
 # 
 # Assumes build using `make container` from top level of tryspace-lab repository
 #
-# docker push tryspaceorg/tryspace-lab:0.0.0
+# docker push tryspaceorg/tryspace-lab:1.0.0
 #
 
 FROM debian:bookworm-slim@sha256:6ac2c08566499cc2415926653cf2ed7c3aedac445675a013cc09469c9e118fdd
@@ -17,9 +17,12 @@ RUN apt-get update && \
     cmake \
     curl \
     gcovr \
+    gdb \
     git \
     gpg \
     lcov \
+    libcurl4-openssl-dev \
+    libgcrypt20-dev \
     libsocketcan-dev \
     libzmq3-dev \
     pkg-config \

cfg/cli-compose.yml → cfg/cli-compose.j2

@@ -1,9 +1,5 @@
-# Start
-#   docker compose -f cli-compose.yml up
-# View specific containers
-#   docker attach tryspace-comp-demo-cli
-#   docker attach tryspace-sim
-#   docker attach tryspace-director
+# Jinja2 template for dynamic CLI Compose file
+# Usage: Render with orchestrator using active CLI component
 services:
   tryspace-sim:
     image: tryspace-server:latest
@@ -40,9 +36,9 @@ services:
     tmpfs:
       - /dev/shm:noexec,nosuid,size=100m
 
-  tryspace-comp-demo-cli:
-    image: tryspace-comp-demo-cli:latest
-    container_name: tryspace-comp-demo-cli
+  tryspace-comp-{{ cli_component }}-cli:
+    image: tryspace-comp-{{ cli_component }}-cli:latest
+    container_name: tryspace-comp-{{ cli_component }}-cli
     networks:
       - tryspace-net
     stdin_open: true

cfg/drm/drm.yaml

@@ -1,8 +1,24 @@
 mission_name: "drm"
+
+# Spacecraft configurations
+spacecraft:
+  - name: "flatsat"
+    config_file: "drm/spacecraft/flatsat.yaml"
+  - name: "sat-1"
+    config_file: "drm/spacecraft/sat-1.yaml"
+  - name: "sat-2"
+    config_file: "drm/spacecraft/sat-2.yaml"
+
+# Fallback components if no spacecraft selected
 components:
+  - name: "adcs"
   - name: "demo"
+  - name: "eps"
+  - name: "radio"
+
+# Scenarios for mission operations
 scenarios:
   - name: "nominal"
     config_file: "drm/scenarios/drm-nominal.yaml"
-  - name: "flight"
-    config_file: "drm/scenarios/drm-flight.yaml"
+  - name: "debug"
+    config_file: "drm/scenarios/drm-debug.yaml"

cfg/drm/scenarios/drm-debug.yaml

@@ -0,0 +1,3 @@
+scenario_name: "debug"
+overrides:
+  debug: true