bootloader/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
-defmt-rtt = "0.4"
+defmt-rtt = "1"
 defmt = "1"
 panic-probe = { version = "1", features = ["defmt"] }
 crc = "3"

examples/embassy/Cargo.toml

@@ -8,12 +8,11 @@ cortex-m = "0.7"
 cortex-m-rt = "0.7"
 cfg-if = "1"
 embedded-io = "0.6"
-embedded-can = "0.4"
 embedded-hal-async = "1"
 embedded-io-async = "0.6"
 
 heapless = "0.8"
-defmt-rtt = "0.4"
+defmt-rtt = "1"
 defmt = "1"
 panic-probe = { version = "1", features = ["print-defmt"] }
 static_cell = "2"
@@ -21,7 +20,7 @@ critical-section = "1"
 ringbuf = { version = "0.4", default-features = false }
 
 nb = "1"
-embassy-sync = "0.6"
+embassy-sync = "0.7"
 embassy-time = "0.4"
 embassy-executor = { version = "0.7", features = [
   "arch-cortex-m",

examples/rtic/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 cortex-m = { version = "0.7", features = ["critical-section-single-core"] }
-defmt-rtt = "0.4"
+defmt-rtt = "1"
 defmt = "1"
 panic-probe = { version = "1", features = ["defmt"] }
 

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"
 critical-section = "1"
-defmt-rtt = "0.4"
+defmt-rtt = "1"
 defmt = "1"
 panic-probe = { version = "1", features = ["defmt"] }
 embedded-hal = "1"

flashloader/Cargo.toml

@@ -6,15 +6,15 @@ edition = "2021"
 [dependencies]
 cortex-m = "0.7"
 embedded-io = "0.6"
-defmt-rtt = "0.4"
+defmt-rtt = "1"
 defmt = "1"
 panic-probe = { version = "1", features = ["defmt"] }
 static_cell = "2"
-satrs = { version = "0.3.0-alpha.0", default-features = false }
+satrs = { version = "0.3.0-alpha.1", default-features = false }
 ringbuf = { version = "0.4", default-features = false }
 once_cell = { version = "1", default-features = false, features = ["critical-section"] }
-spacepackets = { version = "0.13", default-features = false, features = ["defmt"] }
+spacepackets = { version = "0.15", default-features = false, features = ["defmt"] }
-cobs = { version = "0.3", default-features = false }
+cobs = { version = "0.4", default-features = false }
 
 va416xx-hal = { version = "0.5", features = ["va41630", "defmt"], path = "../va416xx-hal" }
 

flashloader/src/main.rs

@@ -347,7 +347,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_prod.lock(|prod| {
@@ -356,18 +356,18 @@ mod app {
                     .push_slice(&cx.local.verif_buf[0..written_size]);
             });
         };
-        let token = cx.local.verif_reporter.add_tc(&pus_tc);
+        let request_id = VerificationReportCreator::read_request_id_from_tc(&pus_tc);
-        let (tm, accepted_token) = cx
+        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);
 
@@ -387,7 +387,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);
             };
@@ -405,7 +405,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 {
@@ -414,7 +414,7 @@ mod app {
                 .verif_reporter
                 .step_success(
                     cx.local.src_data_buf,
-                    &started_token,
+                    &request_id,
                     0,
                     0,
                     &[],
@@ -460,7 +460,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);
                 defmt::info!("NVM operation done");

va416xx-embassy/Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["no-std", "hal", "cortex-m", "vorago", "va416xx"]
 categories = ["aerospace", "embedded", "no-std", "hardware-support"]
 
 [dependencies]
-vorago-shared-periphs = { path = "../../vorago-shared-periphs", features = ["vor4x"] }
+vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs.git", rev = "c8e475cbba820a4b235b46f3d284e23d72396855", features = ["vor4x"] }
 va416xx-hal = { path = "../va416xx-hal" }
 
 [features]

va416xx-hal/Cargo.toml

@@ -15,7 +15,7 @@ cortex-m = { version = "0.7", features = ["critical-section-single-core"] }
 va416xx = { version = "0.4", features = ["critical-section"], default-features = false }
 derive-mmio = { git = "https://github.com/knurling-rs/derive-mmio.git",  version = "0.6" }
 static_assertions = "1.1"
-vorago-shared-periphs = { path = "../../vorago-shared-periphs", features = ["vor4x"] }
+vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs.git", rev = "c8e475cbba820a4b235b46f3d284e23d72396855", features = ["vor4x"] }
 
 libm = "0.2"
 nb = "1"
@@ -26,10 +26,10 @@ bitbybit = "1.3"
 arbitrary-int = "1.3"
 fugit = "0.3"
 embedded-can = "0.4"
-embassy-sync = "0.6"
+embassy-sync = "0.7"
 thiserror = { version = "2", default-features = false }
 
-defmt = { version = "0.3", optional = true }
+defmt = { version = "1", optional = true }
 
 [features]
 default = ["rt", "revb"]

va416xx/Cargo.toml

@@ -16,7 +16,7 @@ categories = ["embedded", "no-std", "hardware-support"]
 cortex-m = "0.7"
 vcell = "0.1.3"
 
-defmt = { version = "0.3", optional = true }
+defmt = { version = "1", optional = true }
 critical-section = { version = "1", optional = true }
 
 [dependencies.cortex-m-rt]