diff options
| author | xoviat <[email protected]> | 2023-07-25 01:22:07 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-07-25 01:22:07 +0000 |
| commit | 77e34c5e8a7d31eac6fdc144a329027a0ce731a5 (patch) | |
| tree | 50bec8f49ee717b81997286dcb9a095f02bf78f6 /tests | |
| parent | 9f898c460fa926d201d3011f97261dcad399029c (diff) | |
| parent | 270d1d59a0b6ab2f180376bb193c2495f14632b8 (diff) | |
Merge pull request #1684 from xoviat/wpan
stm32/rcc: move rcc logic from ipcc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/stm32/src/bin/wpan_ble.rs | 6 | ||||
| -rw-r--r-- | tests/stm32/src/bin/wpan_mac.rs | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/stm32/src/bin/wpan_ble.rs b/tests/stm32/src/bin/wpan_ble.rs index 3ad8aca4e..452da77a4 100644 --- a/tests/stm32/src/bin/wpan_ble.rs +++ b/tests/stm32/src/bin/wpan_ble.rs | |||
| @@ -12,6 +12,7 @@ use common::*; | |||
| 12 | use embassy_executor::Spawner; | 12 | use embassy_executor::Spawner; |
| 13 | use embassy_stm32::bind_interrupts; | 13 | use embassy_stm32::bind_interrupts; |
| 14 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | 14 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; |
| 15 | use embassy_stm32::rcc::WPAN_DEFAULT; | ||
| 15 | use embassy_stm32_wpan::hci::host::uart::UartHci; | 16 | use embassy_stm32_wpan::hci::host::uart::UartHci; |
| 16 | use embassy_stm32_wpan::hci::host::{AdvertisingFilterPolicy, EncryptionKey, HostHci, OwnAddressType}; | 17 | use embassy_stm32_wpan::hci::host::{AdvertisingFilterPolicy, EncryptionKey, HostHci, OwnAddressType}; |
| 17 | use embassy_stm32_wpan::hci::types::AdvertisingType; | 18 | use embassy_stm32_wpan::hci::types::AdvertisingType; |
| @@ -40,7 +41,10 @@ async fn run_mm_queue(memory_manager: mm::MemoryManager) { | |||
| 40 | 41 | ||
| 41 | #[embassy_executor::main] | 42 | #[embassy_executor::main] |
| 42 | async fn main(spawner: Spawner) { | 43 | async fn main(spawner: Spawner) { |
| 43 | let p = embassy_stm32::init(config()); | 44 | let mut config = config(); |
| 45 | config.rcc = WPAN_DEFAULT; | ||
| 46 | |||
| 47 | let p = embassy_stm32::init(config); | ||
| 44 | info!("Hello World!"); | 48 | info!("Hello World!"); |
| 45 | 49 | ||
| 46 | let config = Config::default(); | 50 | let config = Config::default(); |
diff --git a/tests/stm32/src/bin/wpan_mac.rs b/tests/stm32/src/bin/wpan_mac.rs index b04a19ee9..7eab2fd38 100644 --- a/tests/stm32/src/bin/wpan_mac.rs +++ b/tests/stm32/src/bin/wpan_mac.rs | |||
| @@ -10,6 +10,7 @@ use common::*; | |||
| 10 | use embassy_executor::Spawner; | 10 | use embassy_executor::Spawner; |
| 11 | use embassy_stm32::bind_interrupts; | 11 | use embassy_stm32::bind_interrupts; |
| 12 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; | 12 | use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler}; |
| 13 | use embassy_stm32::rcc::WPAN_DEFAULT; | ||
| 13 | use embassy_stm32_wpan::mac::commands::{AssociateRequest, GetRequest, ResetRequest, SetRequest}; | 14 | use embassy_stm32_wpan::mac::commands::{AssociateRequest, GetRequest, ResetRequest, SetRequest}; |
| 14 | use embassy_stm32_wpan::mac::event::MacEvent; | 15 | use embassy_stm32_wpan::mac::event::MacEvent; |
| 15 | use embassy_stm32_wpan::mac::typedefs::{ | 16 | use embassy_stm32_wpan::mac::typedefs::{ |
| @@ -31,7 +32,10 @@ async fn run_mm_queue(memory_manager: mm::MemoryManager) { | |||
| 31 | 32 | ||
| 32 | #[embassy_executor::main] | 33 | #[embassy_executor::main] |
| 33 | async fn main(spawner: Spawner) { | 34 | async fn main(spawner: Spawner) { |
| 34 | let p = embassy_stm32::init(config()); | 35 | let mut config = config(); |
| 36 | config.rcc = WPAN_DEFAULT; | ||
| 37 | |||
| 38 | let p = embassy_stm32::init(config); | ||
| 35 | info!("Hello World!"); | 39 | info!("Hello World!"); |
| 36 | 40 | ||
| 37 | let config = Config::default(); | 41 | let config = Config::default(); |
