From 610a0b8bbebc67cf3a9b5ccac5ac3a898e09527b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 12 Sep 2024 15:41:09 +0200 Subject: [PATCH] compile fixes --- bootloader/Cargo.toml | 1 - flashloader/Cargo.toml | 2 +- flashloader/src/main.rs | 14 ++++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bootloader/Cargo.toml b/bootloader/Cargo.toml index d74063d..e9406e1 100644 --- a/bootloader/Cargo.toml +++ b/bootloader/Cargo.toml @@ -13,4 +13,3 @@ crc = "3" [dependencies.va416xx-hal] path = "../va416xx-hal" -version = "0.1.0" diff --git a/flashloader/Cargo.toml b/flashloader/Cargo.toml index ec98f54..5fdc459 100644 --- a/flashloader/Cargo.toml +++ b/flashloader/Cargo.toml @@ -8,6 +8,7 @@ cortex-m = "0.7" cortex-m-rt = "0.7" embedded-hal = "1" embedded-hal-nb = "1" +embedded-io = "0.6" panic-rtt-target = { version = "0.1.3" } rtt-target = { version = "0.5" } rtt-log = "0.3" @@ -31,7 +32,6 @@ default-features = false [dependencies.va416xx-hal] path = "../va416xx-hal" -version = "0.1.0" [dependencies.rtic] version = "2" diff --git a/flashloader/src/main.rs b/flashloader/src/main.rs index b1b4b35..0f4f64d 100644 --- a/flashloader/src/main.rs +++ b/flashloader/src/main.rs @@ -63,6 +63,7 @@ mod app { use super::*; use cortex_m::asm; use embedded_hal_nb::nb; + use embedded_io::Write; use panic_rtt_target as _; use rtic::Mutex; use rtic_monotonics::systick::prelude::*; @@ -200,11 +201,11 @@ mod app { uart::Error::Overrun => { cx.local.uart_rx.clear_fifo(); } - uart::Error::FramingError => todo!(), - uart::Error::ParityError => todo!(), - uart::Error::BreakCondition => todo!(), - uart::Error::TransferPending => todo!(), - uart::Error::BufferTooShort => todo!(), + uart::Error::FramingError => (), + uart::Error::ParityError => (), + uart::Error::BreakCondition => (), + uart::Error::TransferPending => (), + uart::Error::BufferTooShort => (), } } nb::Error::WouldBlock => { @@ -397,8 +398,9 @@ mod app { ], shared=[] )] - async fn pus_tm_tx_handler(_cx: pus_tm_tx_handler::Context) { + async fn pus_tm_tx_handler(cx: pus_tm_tx_handler::Context) { loop { + // cx.local.uart_tx.write_all(); Mono::delay(500.millis()).await; } }