From ec80f55b7805202ab6a1089e1138985527a91a77 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Jul 2025 11:23:15 +0200 Subject: [PATCH] update dependencies --- board-tests/Cargo.toml | 6 +++--- bootloader/Cargo.toml | 2 +- examples/embassy/Cargo.toml | 9 +++------ examples/rtic/Cargo.toml | 2 +- examples/simple/Cargo.toml | 2 +- flashloader/Cargo.toml | 10 +++++----- flashloader/src/main.rs | 24 ++++++++++++------------ va108xx-hal/Cargo.toml | 2 +- 8 files changed, 27 insertions(+), 30 deletions(-) diff --git a/board-tests/Cargo.toml b/board-tests/Cargo.toml index 811c3f2..dbee352 100644 --- a/board-tests/Cargo.toml +++ b/board-tests/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } +cortex-m = { version = "0.7", features = ["critical-section-single-core"] } cortex-m-rt = "0.7" defmt = "1" -defmt-rtt = "0.4" -panic-probe = { version = "0.3", features = ["print-defmt"] } +defmt-rtt = "1" +panic-probe = { version = "1", features = ["print-defmt"] } embedded-hal = "1" [dependencies.va108xx-hal] diff --git a/bootloader/Cargo.toml b/bootloader/Cargo.toml index 68d85a5..fc646a3 100644 --- a/bootloader/Cargo.toml +++ b/bootloader/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" cortex-m = "0.7" cortex-m-rt = "0.7" embedded-hal = "1" -defmt-rtt = "0.4" +defmt-rtt = "1" defmt = "1" panic-probe = { version = "1", features = ["defmt"] } crc = "3" diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml index 4c473a0..caa12b7 100644 --- a/examples/embassy/Cargo.toml +++ b/examples/embassy/Cargo.toml @@ -5,9 +5,7 @@ edition = "2021" [dependencies] cfg-if = "1" -# cortex-m = { version = "0.7", features = ["critical-section-single-core"] } cortex-m-rt = "0.7" -# embedded-hal = "1" embedded-hal-async = "1" embedded-io = "0.6" embedded-io-async = "0.6" @@ -15,13 +13,12 @@ heapless = "0.8" static_cell = "2" defmt = "1" -defmt-rtt = "0.4" -panic-probe = { version = "0.3", features = ["print-defmt"] } +defmt-rtt = "1" +panic-probe = { version = "1", features = ["print-defmt"] } critical-section = "1" -# portable-atomic = { version = "1", features = ["unsafe-assume-single-core"]} -embassy-sync = "0.6" +embassy-sync = "0.7" embassy-time = "0.4" embassy-executor = { version = "0.7", features = [ "arch-cortex-m", diff --git a/examples/rtic/Cargo.toml b/examples/rtic/Cargo.toml index bbf6d8e..74e5b73 100644 --- a/examples/rtic/Cargo.toml +++ b/examples/rtic/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] cortex-m = { version = "0.7", features = ["critical-section-single-core"] } embedded-io = "0.6" -defmt-rtt = "0.4" +defmt-rtt = "1" defmt = "1" panic-probe = { version = "1", features = ["defmt"] } rtic = { version = "2", features = ["thumbv6-backend"] } diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index b8ee41a..bed4e88 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" cortex-m = {version = "0.7", features = ["critical-section-single-core"]} cortex-m-rt = "0.7" panic-halt = "1" -defmt-rtt = "0.4" +defmt-rtt = "1" defmt = "1" panic-probe = { version = "1", features = ["defmt"] } embedded-hal = "1" diff --git a/flashloader/Cargo.toml b/flashloader/Cargo.toml index 6848af3..f005ee6 100644 --- a/flashloader/Cargo.toml +++ b/flashloader/Cargo.toml @@ -8,13 +8,13 @@ cortex-m = { version = "0.7", features = ["critical-section-single-core"]} cortex-m-rt = "0.7" embedded-io = "0.6" defmt = "1" -defmt-rtt = { version = "0.4" } -panic-probe = { version = "0.3", features = ["print-defmt"] } +defmt-rtt = { version = "1" } +panic-probe = { version = "1", features = ["print-defmt"] } num_enum = { version = "0.7", default-features = false } -cobs = { version = "0.3", default-features = false } -satrs = { version = "0.2", default-features = false } +cobs = { version = "0.4", default-features = false } +satrs = { version = "0.3.0-alpha.1", default-features = false } ringbuf = { version = "0.4.7", default-features = false, features = ["portable-atomic"] } -spacepackets = { version = "0.11", default-features = false, features = ["defmt"] } +spacepackets = { version = "0.15", default-features = false, features = ["defmt"] } # Even though we do not use this directly, we need to activate this feature explicitely # so that RTIC compiles because thumv6 does not have CAS operations natively. portable-atomic = {version = "1", features = ["unsafe-assume-single-core"]} diff --git a/flashloader/src/main.rs b/flashloader/src/main.rs index 25673f3..0648fda 100644 --- a/flashloader/src/main.rs +++ b/flashloader/src/main.rs @@ -270,7 +270,7 @@ mod app { defmt::warn!("PUS TC error: {}", pus_tc.unwrap_err()); return; } - let (pus_tc, _) = pus_tc.unwrap(); + let pus_tc = pus_tc.unwrap(); let mut write_and_send = |tm: &PusTmCreator| { let written_size = tm.write_to_bytes(cx.local.verif_buf).unwrap(); cx.shared.tm_rb.lock(|prod| { @@ -278,18 +278,18 @@ mod app { prod.buf.push_slice(&cx.local.verif_buf[0..written_size]); }); }; - let token = cx.local.verif_reporter.add_tc(&pus_tc); - let (tm, accepted_token) = cx + let request_id = VerificationReportCreator::read_request_id_from_tc(&pus_tc); + let tm = cx .local .verif_reporter - .acceptance_success(cx.local.src_data_buf, token, 0, 0, &[]) + .acceptance_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("acceptance success failed"); write_and_send(&tm); - let (tm, started_token) = cx + let tm = cx .local .verif_reporter - .start_success(cx.local.src_data_buf, accepted_token, 0, 0, &[]) + .start_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("acceptance success failed"); write_and_send(&tm); @@ -308,7 +308,7 @@ mod app { let tm = cx .local .verif_reporter - .completion_success(cx.local.src_data_buf, started_token, 0, 0, &[]) + .completion_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("completion success failed"); write_and_send(&tm); }; @@ -339,7 +339,7 @@ mod app { let tm = cx .local .verif_reporter - .completion_success(cx.local.src_data_buf, started_token, 0, 0, &[]) + .completion_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("completion success failed"); write_and_send(&tm); } @@ -349,7 +349,7 @@ mod app { let tm = cx .local .verif_reporter - .completion_success(cx.local.src_data_buf, started_token, 0, 0, &[]) + .completion_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("completion success failed"); write_and_send(&tm); } else if pus_tc.service() == PusServiceId::MemoryManagement as u8 { @@ -358,7 +358,7 @@ mod app { .verif_reporter .step_success( cx.local.src_data_buf, - &started_token, + &request_id, 0, 0, &[], @@ -408,7 +408,7 @@ mod app { .verif_reporter .completion_failure( cx.local.src_data_buf, - started_token, + &request_id, 0, 0, FailParams::new(&[], &EcssEnumU8::new(0), &[]), @@ -417,7 +417,7 @@ mod app { } else { cx.local .verif_reporter - .completion_success(cx.local.src_data_buf, started_token, 0, 0, &[]) + .completion_success(cx.local.src_data_buf, &request_id, 0, 0, &[]) .expect("completion success failed") }; write_and_send(&tm); diff --git a/va108xx-hal/Cargo.toml b/va108xx-hal/Cargo.toml index 736db62..74ddb1d 100644 --- a/va108xx-hal/Cargo.toml +++ b/va108xx-hal/Cargo.toml @@ -16,7 +16,7 @@ vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-s fugit = "0.3" thiserror = { version = "2", default-features = false } va108xx = { version = "0.5", default-features = false, features = ["critical-section", "defmt"] } -defmt = { version = "0.3", optional = true } +defmt = { version = "1", optional = true } [target.'cfg(all(target_arch = "arm", target_os = "none"))'.dependencies] portable-atomic = { version = "1", features = ["unsafe-assume-single-core"] } -- 2.43.0