diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-03-25 21:31:14 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-03-25 21:31:14 +0000 |
| commit | 4f250f399513319220853bfa0e13b9a588de8000 (patch) | |
| tree | a24154b18817b34cbb80b3b253fe3b7a1bc7cb6f /tests | |
| parent | 17cce79807ff978270b96ba081a4ee2ed5604dcd (diff) | |
| parent | a592acb8068011787453944963b384fd43a52e65 (diff) | |
Merge pull request #4005 from embassy-rs/no-nodma
stm32: remove DMA generic params, remove NoDma.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/stm32/src/bin/dac.rs | 3 | ||||
| -rw-r--r-- | tests/stm32/src/bin/dac_l1.rs | 3 | ||||
| -rw-r--r-- | tests/stm32/src/bin/hash.rs | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/stm32/src/bin/dac.rs b/tests/stm32/src/bin/dac.rs index 88e661525..d34bbb255 100644 --- a/tests/stm32/src/bin/dac.rs +++ b/tests/stm32/src/bin/dac.rs | |||
| @@ -12,7 +12,6 @@ use defmt::assert; | |||
| 12 | use embassy_executor::Spawner; | 12 | use embassy_executor::Spawner; |
| 13 | use embassy_stm32::adc::Adc; | 13 | use embassy_stm32::adc::Adc; |
| 14 | use embassy_stm32::dac::{DacCh1, Value}; | 14 | use embassy_stm32::dac::{DacCh1, Value}; |
| 15 | use embassy_stm32::dma::NoDma; | ||
| 16 | use embassy_time::Timer; | 15 | use embassy_time::Timer; |
| 17 | use micromath::F32Ext; | 16 | use micromath::F32Ext; |
| 18 | use {defmt_rtt as _, panic_probe as _}; | 17 | use {defmt_rtt as _, panic_probe as _}; |
| @@ -27,7 +26,7 @@ async fn main(_spawner: Spawner) { | |||
| 27 | let dac_pin = peri!(p, DAC_PIN); | 26 | let dac_pin = peri!(p, DAC_PIN); |
| 28 | let mut adc_pin = unsafe { core::ptr::read(&dac_pin) }; | 27 | let mut adc_pin = unsafe { core::ptr::read(&dac_pin) }; |
| 29 | 28 | ||
| 30 | let mut dac = DacCh1::new(dac, NoDma, dac_pin); | 29 | let mut dac = DacCh1::new_blocking(dac, dac_pin); |
| 31 | let mut adc = Adc::new(adc); | 30 | let mut adc = Adc::new(adc); |
| 32 | 31 | ||
| 33 | #[cfg(feature = "stm32h755zi")] | 32 | #[cfg(feature = "stm32h755zi")] |
diff --git a/tests/stm32/src/bin/dac_l1.rs b/tests/stm32/src/bin/dac_l1.rs index 925db617d..e6400f28e 100644 --- a/tests/stm32/src/bin/dac_l1.rs +++ b/tests/stm32/src/bin/dac_l1.rs | |||
| @@ -12,7 +12,6 @@ use defmt::assert; | |||
| 12 | use embassy_executor::Spawner; | 12 | use embassy_executor::Spawner; |
| 13 | use embassy_stm32::adc::Adc; | 13 | use embassy_stm32::adc::Adc; |
| 14 | use embassy_stm32::dac::{DacCh1, Value}; | 14 | use embassy_stm32::dac::{DacCh1, Value}; |
| 15 | use embassy_stm32::dma::NoDma; | ||
| 16 | use embassy_stm32::{bind_interrupts, peripherals}; | 15 | use embassy_stm32::{bind_interrupts, peripherals}; |
| 17 | use embassy_time::Timer; | 16 | use embassy_time::Timer; |
| 18 | use micromath::F32Ext; | 17 | use micromath::F32Ext; |
| @@ -32,7 +31,7 @@ async fn main(_spawner: Spawner) { | |||
| 32 | let dac_pin = peri!(p, DAC_PIN); | 31 | let dac_pin = peri!(p, DAC_PIN); |
| 33 | let mut adc_pin = unsafe { core::ptr::read(&dac_pin) }; | 32 | let mut adc_pin = unsafe { core::ptr::read(&dac_pin) }; |
| 34 | 33 | ||
| 35 | let mut dac = DacCh1::new(dac, NoDma, dac_pin); | 34 | let mut dac = DacCh1::new_blocking(dac, dac_pin); |
| 36 | let mut adc = Adc::new(adc, Irqs); | 35 | let mut adc = Adc::new(adc, Irqs); |
| 37 | 36 | ||
| 38 | #[cfg(feature = "stm32h755zi")] | 37 | #[cfg(feature = "stm32h755zi")] |
diff --git a/tests/stm32/src/bin/hash.rs b/tests/stm32/src/bin/hash.rs index bdb3c9a69..52b84a499 100644 --- a/tests/stm32/src/bin/hash.rs +++ b/tests/stm32/src/bin/hash.rs | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | mod common; | 6 | mod common; |
| 7 | use common::*; | 7 | use common::*; |
| 8 | use embassy_executor::Spawner; | 8 | use embassy_executor::Spawner; |
| 9 | use embassy_stm32::dma::NoDma; | ||
| 10 | use embassy_stm32::hash::*; | 9 | use embassy_stm32::hash::*; |
| 11 | use embassy_stm32::{bind_interrupts, hash, peripherals}; | 10 | use embassy_stm32::{bind_interrupts, hash, peripherals}; |
| 12 | use hmac::{Hmac, Mac}; | 11 | use hmac::{Hmac, Mac}; |
| @@ -36,7 +35,7 @@ bind_interrupts!(struct Irqs { | |||
| 36 | #[embassy_executor::main] | 35 | #[embassy_executor::main] |
| 37 | async fn main(_spawner: Spawner) { | 36 | async fn main(_spawner: Spawner) { |
| 38 | let p: embassy_stm32::Peripherals = init(); | 37 | let p: embassy_stm32::Peripherals = init(); |
| 39 | let mut hw_hasher = Hash::new(p.HASH, NoDma, Irqs); | 38 | let mut hw_hasher = Hash::new_blocking(p.HASH, Irqs); |
| 40 | 39 | ||
| 41 | let test_1: &[u8] = b"as;dfhaslfhas;oifvnasd;nifvnhasd;nifvhndlkfghsd;nvfnahssdfgsdafgsasdfasdfasdfasdfasdfghjklmnbvcalskdjghalskdjgfbaslkdjfgbalskdjgbalskdjbdfhsdfhsfghsfghfgh"; | 40 | let test_1: &[u8] = b"as;dfhaslfhas;oifvnasd;nifvnhasd;nifvhndlkfghsd;nvfnahssdfgsdafgsasdfasdfasdfasdfasdfghjklmnbvcalskdjghalskdjgfbaslkdjfgbalskdjgbalskdjbdfhsdfhsfghsfghfgh"; |
| 42 | let test_2: &[u8] = b"fdhalksdjfhlasdjkfhalskdjfhgal;skdjfgalskdhfjgalskdjfglafgadfgdfgdafgaadsfgfgdfgadrgsyfthxfgjfhklhjkfgukhulkvhlvhukgfhfsrghzdhxyfufynufyuszeradrtydyytserr"; | 41 | let test_2: &[u8] = b"fdhalksdjfhlasdjkfhalskdjfhgal;skdjfgalskdhfjgalskdjfglafgadfgdfgdafgaadsfgfgdfgadrgsyfthxfgjfhklhjkfgukhulkvhlvhukgfhfsrghzdhxyfufynufyuszeradrtydyytserr"; |
