diff options
| author | Kaitlyn Kenwell <[email protected]> | 2023-12-14 10:34:22 -0500 |
|---|---|---|
| committer | Kaitlyn Kenwell <[email protected]> | 2023-12-14 10:34:22 -0500 |
| commit | 27d054aa6875d977efc5f5c3554c57fd1245bdb9 (patch) | |
| tree | 41a1027db3484c1ac7180c8b36472a2bad9f8d32 /examples | |
| parent | a34abd849f09187edea48713538403ebf44d6576 (diff) | |
Adjust toml files, fix application example
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/boot/application/stm32wb-dfu/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/application/stm32wb-dfu/src/main.rs | 10 | ||||
| -rw-r--r-- | examples/boot/bootloader/stm32wb-dfu/Cargo.toml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/boot/application/stm32wb-dfu/Cargo.toml b/examples/boot/application/stm32wb-dfu/Cargo.toml index 57d51de02..0ed0b75e0 100644 --- a/examples/boot/application/stm32wb-dfu/Cargo.toml +++ b/examples/boot/application/stm32wb-dfu/Cargo.toml | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | edition = "2021" | 2 | edition = "2021" |
| 3 | name = "embassy-boot-stm32wl-examples" | 3 | name = "embassy-boot-stm32wb-dfu-examples" |
| 4 | version = "0.1.0" | 4 | version = "0.1.0" |
| 5 | license = "MIT OR Apache-2.0" | 5 | license = "MIT OR Apache-2.0" |
| 6 | 6 | ||
diff --git a/examples/boot/application/stm32wb-dfu/src/main.rs b/examples/boot/application/stm32wb-dfu/src/main.rs index f03003ffe..cdac903b5 100644 --- a/examples/boot/application/stm32wb-dfu/src/main.rs +++ b/examples/boot/application/stm32wb-dfu/src/main.rs | |||
| @@ -6,7 +6,7 @@ use core::cell::RefCell; | |||
| 6 | 6 | ||
| 7 | #[cfg(feature = "defmt-rtt")] | 7 | #[cfg(feature = "defmt-rtt")] |
| 8 | use defmt_rtt::*; | 8 | use defmt_rtt::*; |
| 9 | use embassy_boot_stm32::{AlignedBuffer, BlockingFirmwareUpdater, FirmwareUpdaterConfig}; | 9 | use embassy_boot_stm32::{AlignedBuffer, BlockingFirmwareState, FirmwareUpdaterConfig}; |
| 10 | use embassy_executor::Spawner; | 10 | use embassy_executor::Spawner; |
| 11 | use embassy_stm32::flash::{Flash, WRITE_SIZE}; | 11 | use embassy_stm32::flash::{Flash, WRITE_SIZE}; |
| 12 | use embassy_stm32::rcc::WPAN_DEFAULT; | 12 | use embassy_stm32::rcc::WPAN_DEFAULT; |
| @@ -33,8 +33,8 @@ async fn main(_spawner: Spawner) { | |||
| 33 | 33 | ||
| 34 | let config = FirmwareUpdaterConfig::from_linkerfile_blocking(&flash); | 34 | let config = FirmwareUpdaterConfig::from_linkerfile_blocking(&flash); |
| 35 | let mut magic = AlignedBuffer([0; WRITE_SIZE]); | 35 | let mut magic = AlignedBuffer([0; WRITE_SIZE]); |
| 36 | let mut updater = BlockingFirmwareUpdater::new(config, &mut magic.0); | 36 | let mut firmware_state = BlockingFirmwareState::from_config(config, &mut magic.0); |
| 37 | updater.mark_booted().expect("Failed to mark booted"); | 37 | firmware_state.mark_booted().expect("Failed to mark booted"); |
| 38 | 38 | ||
| 39 | let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); | 39 | let driver = Driver::new(p.USB, Irqs, p.PA12, p.PA11); |
| 40 | let mut config = embassy_usb::Config::new(0xc0de, 0xcafe); | 40 | let mut config = embassy_usb::Config::new(0xc0de, 0xcafe); |
| @@ -46,7 +46,7 @@ async fn main(_spawner: Spawner) { | |||
| 46 | let mut config_descriptor = [0; 256]; | 46 | let mut config_descriptor = [0; 256]; |
| 47 | let mut bos_descriptor = [0; 256]; | 47 | let mut bos_descriptor = [0; 256]; |
| 48 | let mut control_buf = [0; 64]; | 48 | let mut control_buf = [0; 64]; |
| 49 | let mut state = Control::new(updater, DfuAttributes::CAN_DOWNLOAD); | 49 | let mut state = Control::new(firmware_state, DfuAttributes::CAN_DOWNLOAD); |
| 50 | let mut builder = Builder::new( | 50 | let mut builder = Builder::new( |
| 51 | driver, | 51 | driver, |
| 52 | config, | 52 | config, |
| @@ -57,7 +57,7 @@ async fn main(_spawner: Spawner) { | |||
| 57 | &mut control_buf, | 57 | &mut control_buf, |
| 58 | ); | 58 | ); |
| 59 | 59 | ||
| 60 | usb_dfu::<_, _, _>(&mut builder, &mut state, Duration::from_millis(2500)); | 60 | usb_dfu::<_, _>(&mut builder, &mut state, Duration::from_millis(2500)); |
| 61 | 61 | ||
| 62 | let mut dev = builder.build(); | 62 | let mut dev = builder.build(); |
| 63 | dev.run().await | 63 | dev.run().await |
diff --git a/examples/boot/bootloader/stm32wb-dfu/Cargo.toml b/examples/boot/bootloader/stm32wb-dfu/Cargo.toml index 774a8223d..fde9eb57d 100644 --- a/examples/boot/bootloader/stm32wb-dfu/Cargo.toml +++ b/examples/boot/bootloader/stm32wb-dfu/Cargo.toml | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | [package] | 1 | [package] |
| 2 | edition = "2021" | 2 | edition = "2021" |
| 3 | name = "stm32-bootloader-example" | 3 | name = "stm32wb-dfu-bootloader-example" |
| 4 | version = "0.1.0" | 4 | version = "0.1.0" |
| 5 | description = "Example bootloader for STM32 chips" | 5 | description = "Example USB DFUbootloader for the STM32WB series of chips" |
| 6 | license = "MIT OR Apache-2.0" | 6 | license = "MIT OR Apache-2.0" |
| 7 | 7 | ||
| 8 | [dependencies] | 8 | [dependencies] |
