From 4114878e9828b716b3dbdf85fe8d4a1e5182645c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 12 May 2025 14:44:45 +0200 Subject: [PATCH] updated flashloader test applications --- bootloader/README.md | 4 ++-- flashloader/slot-a-blinky/Cargo.toml | 2 +- flashloader/slot-a-blinky/src/main.rs | 6 +++--- flashloader/slot-b-blinky/Cargo.toml | 2 +- flashloader/slot-b-blinky/src/main.rs | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bootloader/README.md b/bootloader/README.md index 6b8b409..32a1cd9 100644 --- a/bootloader/README.md +++ b/bootloader/README.md @@ -12,8 +12,8 @@ The bootloader uses the following memory map: | 0x0 | Bootloader start | code up to 0x2FFE bytes | | 0x2FFE | Bootloader CRC | half-word | | 0x3000 | App image A start | code up to 0xE7F4 (~59K) bytes | -| 0x117F8 | App image A CRC check length | word | -| 0x117FC | App image A CRC check value | word | +| 0x117F4 | App image A CRC check length | word | +| 0x117F8 | App image A CRC check value | word | | 0x117FC | App image B start | code up to 0xE7F4 (~59K) bytes | | 0x1FFF0 | App image B CRC check length | word | | 0x1FFF4 | App image B CRC check value | word | diff --git a/flashloader/slot-a-blinky/Cargo.toml b/flashloader/slot-a-blinky/Cargo.toml index 989928a..4aa9b63 100644 --- a/flashloader/slot-a-blinky/Cargo.toml +++ b/flashloader/slot-a-blinky/Cargo.toml @@ -11,7 +11,7 @@ panic-rtt-target = { version = "0.1.3" } rtt-target = { version = "0.5" } cortex-m = { version = "0.7", features = ["critical-section-single-core"] } embedded-hal = "1" -va108xx-hal = { version = "0.10.0" } +va108xx-hal = { version = "0.11" } [profile.dev] codegen-units = 1 diff --git a/flashloader/slot-a-blinky/src/main.rs b/flashloader/slot-a-blinky/src/main.rs index cd302e4..332567a 100644 --- a/flashloader/slot-a-blinky/src/main.rs +++ b/flashloader/slot-a-blinky/src/main.rs @@ -3,7 +3,7 @@ #![no_std] use cortex_m_rt::entry; -use embedded_hal::{delay::DelayNs, digital::StatefulOutputPin}; +use embedded_hal::delay::DelayNs; use panic_rtt_target as _; use rtt_target::{rprintln, rtt_init_print}; use va108xx_hal::{gpio::PinsA, pac, prelude::*, timer::CountdownTimer}; @@ -15,11 +15,11 @@ fn main() -> ! { let mut dp = pac::Peripherals::take().unwrap(); let mut timer = CountdownTimer::new(&mut dp.sysconfig, 50.MHz(), dp.tim0); - let porta = PinsA::new(&mut dp.sysconfig, Some(dp.ioconfig), dp.porta); + let porta = PinsA::new(&mut dp.sysconfig, dp.porta); let mut led1 = porta.pa10.into_readable_push_pull_output(); loop { - led1.toggle().ok(); + led1.toggle(); timer.delay_ms(500); } } diff --git a/flashloader/slot-b-blinky/Cargo.toml b/flashloader/slot-b-blinky/Cargo.toml index 1565a4b..fdd00e4 100644 --- a/flashloader/slot-b-blinky/Cargo.toml +++ b/flashloader/slot-b-blinky/Cargo.toml @@ -11,7 +11,7 @@ panic-rtt-target = { version = "0.1.3" } rtt-target = { version = "0.5" } cortex-m = { version = "0.7", features = ["critical-section-single-core"] } embedded-hal = "1" -va108xx-hal = { version = "0.10.0" } +va108xx-hal = { version = "0.11" } [profile.dev] codegen-units = 1 diff --git a/flashloader/slot-b-blinky/src/main.rs b/flashloader/slot-b-blinky/src/main.rs index edb2f7a..5a42407 100644 --- a/flashloader/slot-b-blinky/src/main.rs +++ b/flashloader/slot-b-blinky/src/main.rs @@ -3,7 +3,7 @@ #![no_std] use cortex_m_rt::entry; -use embedded_hal::{delay::DelayNs, digital::StatefulOutputPin}; +use embedded_hal::delay::DelayNs; use panic_rtt_target as _; use rtt_target::{rprintln, rtt_init_print}; use va108xx_hal::{gpio::PinsA, pac, prelude::*, timer::CountdownTimer}; @@ -15,11 +15,11 @@ fn main() -> ! { let mut dp = pac::Peripherals::take().unwrap(); let mut timer = CountdownTimer::new(&mut dp.sysconfig, 50.MHz(), dp.tim0); - let porta = PinsA::new(&mut dp.sysconfig, Some(dp.ioconfig), dp.porta); + let porta = PinsA::new(&mut dp.sysconfig, dp.porta); let mut led2 = porta.pa7.into_readable_push_pull_output(); loop { - led2.toggle().ok(); + led2.toggle(); timer.delay_ms(1000); } }