Skip to content

Commit c409eb0

Browse files
authored
Merge branch 'master' into gbin/log_stmt
2 parents 4aa47d8 + c1ca1b4 commit c409eb0

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

examples/cu_flight_controller/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ libm = { version = "0.2", default-features = false }
6262

6363
## Log reader depencies
6464
cu29-export = { git = "https://github.com/copper-project/copper-rs.git", branch = "master", optional = true }
65-
pyo3 = { version = "0.28", optional = true, default-features = false, features = [
65+
pyo3 = { version = "0.29", optional = true, default-features = false, features = [
6666
"extension-module",
6767
"macros",
6868
] }

examples/cu_flight_controller/justfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@ dag mission="":
1616
fi
1717
1818
cd "{{ROOT}}"
19+
copper_root="${COPPER_ROOT:-{{ROOT}}/../copper-rs}"
20+
if [[ ! -f "${copper_root}/Cargo.toml" ]]; then
21+
echo "cu29-runtime is not in this workspace and COPPER_ROOT does not point to copper-rs" >&2
22+
echo "Set COPPER_ROOT to a copper-rs checkout containing cu29-runtime." >&2
23+
exit 1
24+
fi
1925
mission_value="{{mission}}"
2026
if [[ -n "$mission_value" ]]; then
21-
cargo run -p cu29-runtime --bin cu29-rendercfg -- --mission "$mission_value" --open "$cfg_path"
27+
cargo run --manifest-path "${copper_root}/Cargo.toml" -p cu29-runtime --bin cu29-rendercfg -- --mission "$mission_value" --open "$cfg_path"
2228
else
23-
cargo run -p cu29-runtime --bin cu29-rendercfg -- --open "$cfg_path"
29+
cargo run --manifest-path "${copper_root}/Cargo.toml" -p cu29-runtime --bin cu29-rendercfg -- --open "$cfg_path"
2430
fi
2531
2632
# A quick test to see if the sim can pick up your RC.

0 commit comments

Comments
 (0)