Merge pull request #312 from timokroeger/en-exti-clock

Enable SYSCFG clock in `exti::init()`
This commit is contained in:
Dario Nieuwenhuis 2021-07-24 11:18:46 +02:00 committed by GitHub
commit 4899168534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 6 additions and 39 deletions

View File

@ -108,4 +108,7 @@ pub(crate) unsafe fn init() {
use embassy::interrupt::InterruptExt; use embassy::interrupt::InterruptExt;
foreach_exti_irq!(enable_irq); foreach_exti_irq!(enable_irq);
#[cfg(not(rcc_wb55))]
<crate::peripherals::SYSCFG as crate::rcc::sealed::RccPeripheral>::enable();
} }

View File

@ -17,7 +17,6 @@ use embassy_traits::gpio::{WaitForFallingEdge, WaitForRisingEdge};
use example_common::*; use example_common::*;
use cortex_m_rt::entry; use cortex_m_rt::entry;
use embassy_stm32::pac;
#[embassy::task] #[embassy::task]
async fn main_task() { async fn main_task() {
@ -42,14 +41,7 @@ static EXECUTOR: Forever<Executor> = Forever::new();
fn main() -> ! { fn main() -> ! {
info!("Hello World!"); info!("Hello World!");
unsafe { unsafe { Dbgmcu::enable_all() }
Dbgmcu::enable_all();
// EXTI clock
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
}
let executor = EXECUTOR.put(Executor::new()); let executor = EXECUTOR.put(Executor::new());

View File

@ -24,10 +24,6 @@ fn main() -> ! {
w.set_dbg_standby(true); w.set_dbg_standby(true);
w.set_dbg_stop(true); w.set_dbg_stop(true);
}); });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
} }
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());

View File

@ -55,10 +55,6 @@ fn main() -> ! {
w.set_dbg_standby(true); w.set_dbg_standby(true);
w.set_dbg_stop(true); w.set_dbg_stop(true);
}); });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
} }
unsafe { embassy::time::set_clock(&ZeroClock) }; unsafe { embassy::time::set_clock(&ZeroClock) };

View File

@ -10,6 +10,7 @@
mod example_common; mod example_common;
use cortex_m_rt::entry; use cortex_m_rt::entry;
use embassy_stm32::dma::NoDma;
use embassy_stm32::gpio::{Level, Output, Speed}; use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_stm32::pac; use embassy_stm32::pac;
use embassy_stm32::spi::{Config, Spi}; use embassy_stm32::spi::{Config, Spi};
@ -17,7 +18,6 @@ use embassy_stm32::time::Hertz;
use embedded_hal::blocking::spi::Transfer; use embedded_hal::blocking::spi::Transfer;
use embedded_hal::digital::v2::OutputPin; use embedded_hal::digital::v2::OutputPin;
use example_common::*; use example_common::*;
use embassy_stm32::dma::NoDma;
#[entry] #[entry]
fn main() -> ! { fn main() -> ! {
@ -29,10 +29,6 @@ fn main() -> ! {
w.set_dbg_standby(true); w.set_dbg_standby(true);
w.set_dbg_stop(true); w.set_dbg_stop(true);
}); });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
} }
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());

View File

@ -82,14 +82,6 @@ fn main() -> ! {
w.set_dbg_stop(true); w.set_dbg_stop(true);
}); });
//pac::RCC.apbenr().modify(|w| {
//w.set_spi3en(true);
// });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
pac::RCC.ahb1enr().modify(|w| { pac::RCC.ahb1enr().modify(|w| {
w.set_dmamux1en(true); w.set_dmamux1en(true);
w.set_dma1en(true); w.set_dma1en(true);

View File

@ -63,10 +63,6 @@ fn main() -> ! {
pac::RCC.apb1enr1().modify(|w| { pac::RCC.apb1enr1().modify(|w| {
w.set_uart4en(true); w.set_uart4en(true);
}); });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
} }
unsafe { embassy::time::set_clock(&ZeroClock) }; unsafe { embassy::time::set_clock(&ZeroClock) };

View File

@ -57,11 +57,7 @@ fn main() -> ! {
w.set_dbg_standby(true); w.set_dbg_standby(true);
w.set_dbg_stop(true); w.set_dbg_stop(true);
}); });
pac::RCC.apb2enr().modify(|w| {
w.set_syscfgen(true);
});
pac::RCC.ahb1enr().modify(|w| { pac::RCC.ahb1enr().modify(|w| {
w.set_dmamux1en(true); w.set_dmamux1en(true);
w.set_dma1en(true); w.set_dma1en(true);