max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embassy-boot (rp): Add WatchdogFlash

Browse Source
This commit is contained in:
kalkyl
2023-01-03 22:58:56 +01:00
parent 0aa2a9ac27
commit 9428c40c8d
5 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/boot/application/rp/src/bin/a.rs
View File

@ -7,6 +7,7 @@ use embassy_boot_rp::*;
use embassy_executor::Spawner;
use embassy_rp::flash::Flash;
use embassy_rp::gpio::{Level, Output};
use embassy_rp::watchdog::Watchdog;
use embassy_time::{Duration, Timer};
#[cfg(feature = "panic-probe")]
use panic_probe as _;
@ -21,11 +22,16 @@ async fn main(_s: Spawner) {
let p = embassy_rp::init(Default::default());
let mut led = Output::new(p.PIN_25, Level::Low);
// Override bootloader watchdog
let mut watchdog = Watchdog::new(p.WATCHDOG);
watchdog.start(Duration::from_secs(8));
let mut flash: Flash<_, FLASH_SIZE> = Flash::new(p.FLASH);
let mut updater = FirmwareUpdater::default();
Timer::after(Duration::from_secs(5)).await;
watchdog.feed();
led.set_high();
let mut offset = 0;
let mut buf: AlignedBuffer<4096> = AlignedBuffer([0; 4096]);
@ -43,6 +49,7 @@ async fn main(_s: Spawner) {
.unwrap();
offset += chunk.len();
}
watchdog.feed();
defmt::info!("firmware written, marking update");
updater.mark_updated_blocking(&mut flash, &mut buf.0[..1]).unwrap();
Timer::after(Duration::from_secs(2)).await;

2
examples/boot/bootloader/rp/Cargo.toml
View File

@ -11,6 +11,8 @@ defmt-rtt = { version = "0.4", optional = true }
embassy-rp = { path = "../../../../embassy-rp", default-features = false, features = ["nightly"] }
embassy-boot-rp = { path = "../../../../embassy-boot/rp", default-features = false }
embassy-time = { path = "../../../../embassy-time", features = ["nightly"] }
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0"

6
examples/boot/bootloader/rp/src/main.rs
View File

@ -5,8 +5,8 @@ use cortex_m_rt::{entry, exception};
#[cfg(feature = "defmt")]
use defmt_rtt as _;
use embassy_boot_rp::*;
use embassy_rp::flash::{Flash, ERASE_SIZE};
use embassy_rp::peripherals::FLASH;
use embassy_rp::flash::ERASE_SIZE;
use embassy_time::Duration;
const FLASH_SIZE: usize = 2 * 1024 * 1024;
@ -23,7 +23,7 @@ fn main() -> ! {
*/
let mut bl: BootLoader = BootLoader::default();
let flash: Flash<'_, FLASH, FLASH_SIZE> = Flash::new(p.FLASH);
let flash: WatchdogFlash<'_, FLASH_SIZE> = WatchdogFlash::start(p.FLASH, p.WATCHDOG, Duration::from_secs(8));
let mut flash = BootFlash::<_, ERASE_SIZE>::new(flash);
let start = bl.prepare(&mut SingleFlashConfig::new(&mut flash));
core::mem::drop(flash);