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

Enhance Rcc configuration to be more fluentish.

Browse Source 
Clean up H7 examples to remove all vegan HALs and PACs.
This commit is contained in:
Bob McWhirter
2021-08-03 13:57:18 -04:00
parent ad62900a40
commit d7409d63e8
8 changed files with 153 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
examples/stm32h7/src/bin/spi_dma.rs
View File

@ -11,34 +11,22 @@ mod example_common;
use core::fmt::Write;
use embassy::executor::Executor;
use embassy::time::Clock;
use embassy_stm32::time::U32Ext;
use embassy::util::Forever;
use example_common::*;
use embassy_traits::spi::FullDuplex;
use hal::prelude::*;
use stm32h7xx_hal as hal;
use cortex_m_rt::entry;
use stm32h7::stm32h743 as pac;
use heapless::String;
use embassy_stm32::spi::{Spi, Config};
use embassy_stm32::time::Hertz;
use embassy_stm32::spi;
use embassy_stm32::Config;
use core::str::from_utf8;
use embassy_stm32::dbgmcu::Dbgmcu;
use embassy_stm32::rcc;
use embassy_stm32::peripherals::{DMA1_CH4, DMA1_CH3, SPI3};
#[embassy::task]
async fn main_task() {
let p = embassy_stm32::init(Default::default());
let mut spi = Spi::new(
p.SPI3,
p.PB3,
p.PB5,
p.PB4,
p.DMA1_CH3,
p.DMA1_CH4,
Hertz(1_000_000),
Config::default(),
);
async fn main_task(mut spi: spi::Spi<'static, SPI3, DMA1_CH3, DMA1_CH4>) {
for n in 0u32.. {
let mut write: String<128> = String::new();
@ -61,49 +49,36 @@ impl Clock for ZeroClock {
static EXECUTOR: Forever<Executor> = Forever::new();
#[entry]
fn main() -> ! {
info!("Hello World!");
let pp = pac::Peripherals::take().unwrap();
unsafe {
Dbgmcu::enable_all();
}
let pwrcfg = pp.PWR.constrain().freeze();
let p = embassy_stm32::init(Config::default().rcc(
rcc::Config::default()
.sys_ck(400.mhz())
.pll1_q(100.mhz())
));
let rcc = pp.RCC.constrain();
rcc.sys_ck(96.mhz())
.pclk1(48.mhz())
.pclk2(48.mhz())
.pclk3(48.mhz())
.pclk4(48.mhz())
.pll1_q_ck(48.mhz())
.freeze(pwrcfg, &pp.SYSCFG);
let pp = unsafe { pac::Peripherals::steal() };
pp.DBGMCU.cr.modify(|_, w| {
w.dbgsleep_d1().set_bit();
w.dbgstby_d1().set_bit();
w.dbgstop_d1().set_bit();
w.d1dbgcken().set_bit();
w
});
pp.RCC.ahb4enr.modify(|_, w| {
w.gpioaen().set_bit();
w.gpioben().set_bit();
w.gpiocen().set_bit();
w.gpioden().set_bit();
w.gpioeen().set_bit();
w.gpiofen().set_bit();
w
});
let spi = spi::Spi::new(
p.SPI3,
p.PB3,
p.PB5,
p.PB4,
p.DMA1_CH3,
p.DMA1_CH4,
1.mhz(),
spi::Config::default(),
);
unsafe { embassy::time::set_clock(&ZeroClock) };
let executor = EXECUTOR.put(Executor::new());
executor.run(|spawner| {
unwrap!(spawner.spawn(main_task()));
unwrap!(spawner.spawn(main_task(spi)));
})
}