diff options
| author | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-25 22:36:56 +0200 |
|---|---|---|
| committer | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-25 22:36:56 +0200 |
| commit | 8938d928f8c3920a5777b0537d5d9ab3fec94586 (patch) | |
| tree | b7c8bbbb34f8b2581fac7fac9123734ecb221f2e | |
| parent | b50d04336ee3608e36545908cbf45969e81c9807 (diff) | |
Fix examples
| -rw-r--r-- | examples/stm32f3/src/bin/flash.rs | 10 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/flash.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/flash.rs | 10 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/flash.rs | 10 | ||||
| -rw-r--r-- | examples/stm32l0/src/bin/flash.rs | 10 | ||||
| -rw-r--r-- | examples/stm32l1/src/bin/flash.rs | 10 | ||||
| -rw-r--r-- | examples/stm32wl/src/bin/flash.rs | 10 |
7 files changed, 32 insertions, 32 deletions
diff --git a/examples/stm32f3/src/bin/flash.rs b/examples/stm32f3/src/bin/flash.rs index 2432a29d2..236fb36c1 100644 --- a/examples/stm32f3/src/bin/flash.rs +++ b/examples/stm32f3/src/bin/flash.rs | |||
| @@ -18,23 +18,23 @@ async fn main(_spawner: Spawner) { | |||
| 18 | 18 | ||
| 19 | info!("Reading..."); | 19 | info!("Reading..."); |
| 20 | let mut buf = [0u8; 8]; | 20 | let mut buf = [0u8; 8]; |
| 21 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 21 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 22 | info!("Read: {=[u8]:x}", buf); | 22 | info!("Read: {=[u8]:x}", buf); |
| 23 | 23 | ||
| 24 | info!("Erasing..."); | 24 | info!("Erasing..."); |
| 25 | unwrap!(f.erase_blocking(ADDR, ADDR + 2048)); | 25 | unwrap!(f.blocking_erase(ADDR, ADDR + 2048)); |
| 26 | 26 | ||
| 27 | info!("Reading..."); | 27 | info!("Reading..."); |
| 28 | let mut buf = [0u8; 8]; | 28 | let mut buf = [0u8; 8]; |
| 29 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 29 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 30 | info!("Read after erase: {=[u8]:x}", buf); | 30 | info!("Read after erase: {=[u8]:x}", buf); |
| 31 | 31 | ||
| 32 | info!("Writing..."); | 32 | info!("Writing..."); |
| 33 | unwrap!(f.write_blocking(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); | 33 | unwrap!(f.blocking_write(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); |
| 34 | 34 | ||
| 35 | info!("Reading..."); | 35 | info!("Reading..."); |
| 36 | let mut buf = [0u8; 8]; | 36 | let mut buf = [0u8; 8]; |
| 37 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 37 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 38 | info!("Read: {=[u8]:x}", buf); | 38 | info!("Read: {=[u8]:x}", buf); |
| 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); | 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); |
| 40 | } | 40 | } |
diff --git a/examples/stm32f4/src/bin/flash.rs b/examples/stm32f4/src/bin/flash.rs index cadb0129d..4a77595cc 100644 --- a/examples/stm32f4/src/bin/flash.rs +++ b/examples/stm32f4/src/bin/flash.rs | |||
| @@ -35,7 +35,7 @@ fn test_flash(f: &mut Flash, offset: u32, size: u32) { | |||
| 35 | info!("Read: {=[u8]:x}", buf); | 35 | info!("Read: {=[u8]:x}", buf); |
| 36 | 36 | ||
| 37 | info!("Erasing..."); | 37 | info!("Erasing..."); |
| 38 | unwrap!(f.erase_blocking(offset, offset + size)); | 38 | unwrap!(f.blocking_erase(offset, offset + size)); |
| 39 | 39 | ||
| 40 | info!("Reading..."); | 40 | info!("Reading..."); |
| 41 | let mut buf = [0u8; 32]; | 41 | let mut buf = [0u8; 32]; |
| @@ -43,7 +43,7 @@ fn test_flash(f: &mut Flash, offset: u32, size: u32) { | |||
| 43 | info!("Read after erase: {=[u8]:x}", buf); | 43 | info!("Read after erase: {=[u8]:x}", buf); |
| 44 | 44 | ||
| 45 | info!("Writing..."); | 45 | info!("Writing..."); |
| 46 | unwrap!(f.write_blocking( | 46 | unwrap!(f.blocking_write( |
| 47 | offset, | 47 | offset, |
| 48 | &[ | 48 | &[ |
| 49 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, | 49 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, |
diff --git a/examples/stm32f7/src/bin/flash.rs b/examples/stm32f7/src/bin/flash.rs index f3b667555..35d3059be 100644 --- a/examples/stm32f7/src/bin/flash.rs +++ b/examples/stm32f7/src/bin/flash.rs | |||
| @@ -22,19 +22,19 @@ async fn main(_spawner: Spawner) { | |||
| 22 | 22 | ||
| 23 | info!("Reading..."); | 23 | info!("Reading..."); |
| 24 | let mut buf = [0u8; 32]; | 24 | let mut buf = [0u8; 32]; |
| 25 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 25 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 26 | info!("Read: {=[u8]:x}", buf); | 26 | info!("Read: {=[u8]:x}", buf); |
| 27 | 27 | ||
| 28 | info!("Erasing..."); | 28 | info!("Erasing..."); |
| 29 | unwrap!(f.erase_blocking(ADDR, ADDR + 256 * 1024)); | 29 | unwrap!(f.blocking_erase(ADDR, ADDR + 256 * 1024)); |
| 30 | 30 | ||
| 31 | info!("Reading..."); | 31 | info!("Reading..."); |
| 32 | let mut buf = [0u8; 32]; | 32 | let mut buf = [0u8; 32]; |
| 33 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 33 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 34 | info!("Read after erase: {=[u8]:x}", buf); | 34 | info!("Read after erase: {=[u8]:x}", buf); |
| 35 | 35 | ||
| 36 | info!("Writing..."); | 36 | info!("Writing..."); |
| 37 | unwrap!(f.write_blocking( | 37 | unwrap!(f.blocking_write( |
| 38 | ADDR, | 38 | ADDR, |
| 39 | &[ | 39 | &[ |
| 40 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, | 40 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, |
| @@ -44,7 +44,7 @@ async fn main(_spawner: Spawner) { | |||
| 44 | 44 | ||
| 45 | info!("Reading..."); | 45 | info!("Reading..."); |
| 46 | let mut buf = [0u8; 32]; | 46 | let mut buf = [0u8; 32]; |
| 47 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 47 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 48 | info!("Read: {=[u8]:x}", buf); | 48 | info!("Read: {=[u8]:x}", buf); |
| 49 | assert_eq!( | 49 | assert_eq!( |
| 50 | &buf[..], | 50 | &buf[..], |
diff --git a/examples/stm32h7/src/bin/flash.rs b/examples/stm32h7/src/bin/flash.rs index 982e24516..f66df770b 100644 --- a/examples/stm32h7/src/bin/flash.rs +++ b/examples/stm32h7/src/bin/flash.rs | |||
| @@ -22,19 +22,19 @@ async fn main(_spawner: Spawner) { | |||
| 22 | 22 | ||
| 23 | info!("Reading..."); | 23 | info!("Reading..."); |
| 24 | let mut buf = [0u8; 32]; | 24 | let mut buf = [0u8; 32]; |
| 25 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 25 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 26 | info!("Read: {=[u8]:x}", buf); | 26 | info!("Read: {=[u8]:x}", buf); |
| 27 | 27 | ||
| 28 | info!("Erasing..."); | 28 | info!("Erasing..."); |
| 29 | unwrap!(f.erase_blocking(ADDR, ADDR + 128 * 1024)); | 29 | unwrap!(f.blocking_erase(ADDR, ADDR + 128 * 1024)); |
| 30 | 30 | ||
| 31 | info!("Reading..."); | 31 | info!("Reading..."); |
| 32 | let mut buf = [0u8; 32]; | 32 | let mut buf = [0u8; 32]; |
| 33 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 33 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 34 | info!("Read after erase: {=[u8]:x}", buf); | 34 | info!("Read after erase: {=[u8]:x}", buf); |
| 35 | 35 | ||
| 36 | info!("Writing..."); | 36 | info!("Writing..."); |
| 37 | unwrap!(f.write_blocking( | 37 | unwrap!(f.blocking_write( |
| 38 | ADDR, | 38 | ADDR, |
| 39 | &[ | 39 | &[ |
| 40 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, | 40 | 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, |
| @@ -44,7 +44,7 @@ async fn main(_spawner: Spawner) { | |||
| 44 | 44 | ||
| 45 | info!("Reading..."); | 45 | info!("Reading..."); |
| 46 | let mut buf = [0u8; 32]; | 46 | let mut buf = [0u8; 32]; |
| 47 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 47 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 48 | info!("Read: {=[u8]:x}", buf); | 48 | info!("Read: {=[u8]:x}", buf); |
| 49 | assert_eq!( | 49 | assert_eq!( |
| 50 | &buf[..], | 50 | &buf[..], |
diff --git a/examples/stm32l0/src/bin/flash.rs b/examples/stm32l0/src/bin/flash.rs index f057421f8..86f6c70b9 100644 --- a/examples/stm32l0/src/bin/flash.rs +++ b/examples/stm32l0/src/bin/flash.rs | |||
| @@ -18,23 +18,23 @@ async fn main(_spawner: Spawner) { | |||
| 18 | 18 | ||
| 19 | info!("Reading..."); | 19 | info!("Reading..."); |
| 20 | let mut buf = [0u8; 8]; | 20 | let mut buf = [0u8; 8]; |
| 21 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 21 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 22 | info!("Read: {=[u8]:x}", buf); | 22 | info!("Read: {=[u8]:x}", buf); |
| 23 | 23 | ||
| 24 | info!("Erasing..."); | 24 | info!("Erasing..."); |
| 25 | unwrap!(f.erase_blocking(ADDR, ADDR + 128)); | 25 | unwrap!(f.blocking_erase(ADDR, ADDR + 128)); |
| 26 | 26 | ||
| 27 | info!("Reading..."); | 27 | info!("Reading..."); |
| 28 | let mut buf = [0u8; 8]; | 28 | let mut buf = [0u8; 8]; |
| 29 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 29 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 30 | info!("Read after erase: {=[u8]:x}", buf); | 30 | info!("Read after erase: {=[u8]:x}", buf); |
| 31 | 31 | ||
| 32 | info!("Writing..."); | 32 | info!("Writing..."); |
| 33 | unwrap!(f.write_blocking(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); | 33 | unwrap!(f.blocking_write(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); |
| 34 | 34 | ||
| 35 | info!("Reading..."); | 35 | info!("Reading..."); |
| 36 | let mut buf = [0u8; 8]; | 36 | let mut buf = [0u8; 8]; |
| 37 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 37 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 38 | info!("Read: {=[u8]:x}", buf); | 38 | info!("Read: {=[u8]:x}", buf); |
| 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); | 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); |
| 40 | } | 40 | } |
diff --git a/examples/stm32l1/src/bin/flash.rs b/examples/stm32l1/src/bin/flash.rs index 8046f16b9..aeb535cca 100644 --- a/examples/stm32l1/src/bin/flash.rs +++ b/examples/stm32l1/src/bin/flash.rs | |||
| @@ -18,23 +18,23 @@ async fn main(_spawner: Spawner) { | |||
| 18 | 18 | ||
| 19 | info!("Reading..."); | 19 | info!("Reading..."); |
| 20 | let mut buf = [0u8; 8]; | 20 | let mut buf = [0u8; 8]; |
| 21 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 21 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 22 | info!("Read: {=[u8]:x}", buf); | 22 | info!("Read: {=[u8]:x}", buf); |
| 23 | 23 | ||
| 24 | info!("Erasing..."); | 24 | info!("Erasing..."); |
| 25 | unwrap!(f.erase_blocking(ADDR, ADDR + 256)); | 25 | unwrap!(f.blocking_erase(ADDR, ADDR + 256)); |
| 26 | 26 | ||
| 27 | info!("Reading..."); | 27 | info!("Reading..."); |
| 28 | let mut buf = [0u8; 8]; | 28 | let mut buf = [0u8; 8]; |
| 29 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 29 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 30 | info!("Read after erase: {=[u8]:x}", buf); | 30 | info!("Read after erase: {=[u8]:x}", buf); |
| 31 | 31 | ||
| 32 | info!("Writing..."); | 32 | info!("Writing..."); |
| 33 | unwrap!(f.write_blocking(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); | 33 | unwrap!(f.blocking_write(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); |
| 34 | 34 | ||
| 35 | info!("Reading..."); | 35 | info!("Reading..."); |
| 36 | let mut buf = [0u8; 8]; | 36 | let mut buf = [0u8; 8]; |
| 37 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 37 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 38 | info!("Read: {=[u8]:x}", buf); | 38 | info!("Read: {=[u8]:x}", buf); |
| 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); | 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); |
| 40 | } | 40 | } |
diff --git a/examples/stm32wl/src/bin/flash.rs b/examples/stm32wl/src/bin/flash.rs index 81e365fbe..5e52d49ec 100644 --- a/examples/stm32wl/src/bin/flash.rs +++ b/examples/stm32wl/src/bin/flash.rs | |||
| @@ -18,23 +18,23 @@ async fn main(_spawner: Spawner) { | |||
| 18 | 18 | ||
| 19 | info!("Reading..."); | 19 | info!("Reading..."); |
| 20 | let mut buf = [0u8; 8]; | 20 | let mut buf = [0u8; 8]; |
| 21 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 21 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 22 | info!("Read: {=[u8]:x}", buf); | 22 | info!("Read: {=[u8]:x}", buf); |
| 23 | 23 | ||
| 24 | info!("Erasing..."); | 24 | info!("Erasing..."); |
| 25 | unwrap!(f.erase_blocking(ADDR, ADDR + 2048)); | 25 | unwrap!(f.blocking_erase(ADDR, ADDR + 2048)); |
| 26 | 26 | ||
| 27 | info!("Reading..."); | 27 | info!("Reading..."); |
| 28 | let mut buf = [0u8; 8]; | 28 | let mut buf = [0u8; 8]; |
| 29 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 29 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 30 | info!("Read: {=[u8]:x}", buf); | 30 | info!("Read: {=[u8]:x}", buf); |
| 31 | 31 | ||
| 32 | info!("Writing..."); | 32 | info!("Writing..."); |
| 33 | unwrap!(f.write_blocking(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); | 33 | unwrap!(f.blocking_write(ADDR, &[1, 2, 3, 4, 5, 6, 7, 8])); |
| 34 | 34 | ||
| 35 | info!("Reading..."); | 35 | info!("Reading..."); |
| 36 | let mut buf = [0u8; 8]; | 36 | let mut buf = [0u8; 8]; |
| 37 | unwrap!(f.read_blocking(ADDR, &mut buf)); | 37 | unwrap!(f.blocking_read(ADDR, &mut buf)); |
| 38 | info!("Read: {=[u8]:x}", buf); | 38 | info!("Read: {=[u8]:x}", buf); |
| 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); | 39 | assert_eq!(&buf[..], &[1, 2, 3, 4, 5, 6, 7, 8]); |
| 40 | } | 40 | } |
