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

Merge #652 #653

Browse Source 
652: Use new stm32-data registers and fix AHB clock calculation r=Dirbaio a=msamsonoff

This is the follow-on to my PR against stm32-data that added new register enums for the G0. I have updated the G0 RCC module to use those new enums.

I have also fixed an issue with the calculation of the AHB clock rate. 32 is not available as an AHB prescaler. The sequence jumps from 16 to 64. The original bit shifting math did not account for this gap. I have replaced it with a `match` instead.

653: Fixes for rustdoc building. r=Dirbaio a=Dirbaio



Co-authored-by: Matthew W. Samsonoff <matt.samsonoff@gmail.com>
Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2022-03-04 17:07:04 +00:00 committed by GitHub
commit 9ebf7eee6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 136 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embassy-nrf/Cargo.toml
View File

@ -4,6 +4,14 @@ version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"] authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018" edition = "2018"
[package.metadata.embassy_docs]
features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "gpiote", "time-driver-rtc1"]
flavors = [
{ regex_feature = "nrf52.*", target = "thumbv7em-none-eabihf" },
{ regex_feature = "nrf53.*", target = "thumbv8m.main-none-eabihf" },
{ regex_feature = "nrf91.*", target = "thumbv8m.main-none-eabihf" },
]
[features] [features]
# Enable nightly-only features # Enable nightly-only features

3
embassy-nrf/src/chips/nrf5340_app.rs
View File

@ -4,6 +4,7 @@ pub mod pac {
// The nRF5340 has a secure and non-secure (NS) mode. // The nRF5340 has a secure and non-secure (NS) mode.
// To avoid cfg spam, we remove _ns or _s suffixes here. // To avoid cfg spam, we remove _ns or _s suffixes here.
#[doc(no_inline)]
pub use nrf5340_app_pac::{ pub use nrf5340_app_pac::{
interrupt, interrupt,
Interrupt, Interrupt,
@ -57,6 +58,7 @@ pub mod pac {
}; };
#[cfg(feature = "nrf5340-app-ns")] #[cfg(feature = "nrf5340-app-ns")]
#[doc(no_inline)]
pub use nrf5340_app_pac::{ pub use nrf5340_app_pac::{
CLOCK_NS as CLOCK, CLOCK_NS as CLOCK,
COMP_NS as COMP, COMP_NS as COMP,
@ -127,6 +129,7 @@ pub mod pac {
}; };
#[cfg(feature = "nrf5340-app-s")] #[cfg(feature = "nrf5340-app-s")]
#[doc(no_inline)]
pub use nrf5340_app_pac::{ pub use nrf5340_app_pac::{
CACHEDATA_S as CACHEDATA, CACHEDATA_S as CACHEDATA,
CACHEINFO_S as CACHEINFO, CACHEINFO_S as CACHEINFO,

1
embassy-nrf/src/chips/nrf5340_net.rs
View File

@ -4,6 +4,7 @@ pub mod pac {
// The nRF5340 has a secure and non-secure (NS) mode. // The nRF5340 has a secure and non-secure (NS) mode.
// To avoid cfg spam, we remove _ns or _s suffixes here. // To avoid cfg spam, we remove _ns or _s suffixes here.
#[doc(no_inline)]
pub use nrf5340_net_pac::{ pub use nrf5340_net_pac::{
interrupt, interrupt,
Interrupt, Interrupt,

3
embassy-nrf/src/chips/nrf9160.rs
View File

@ -4,6 +4,7 @@ pub mod pac {
// The nRF9160 has a secure and non-secure (NS) mode. // The nRF9160 has a secure and non-secure (NS) mode.
// To avoid cfg spam, we remove _ns or _s suffixes here. // To avoid cfg spam, we remove _ns or _s suffixes here.
#[doc(no_inline)]
pub use nrf9160_pac::{ pub use nrf9160_pac::{
interrupt, interrupt,
Interrupt, Interrupt,
@ -42,6 +43,7 @@ pub mod pac {
}; };
#[cfg(feature = "nrf9160-ns")] #[cfg(feature = "nrf9160-ns")]
#[doc(no_inline)]
pub use nrf9160_pac::{ pub use nrf9160_pac::{
CLOCK_NS as CLOCK, CLOCK_NS as CLOCK,
DPPIC_NS as DPPIC, DPPIC_NS as DPPIC,
@ -96,6 +98,7 @@ pub mod pac {
}; };
#[cfg(feature = "nrf9160-s")] #[cfg(feature = "nrf9160-s")]
#[doc(no_inline)]
pub use nrf9160_pac::{ pub use nrf9160_pac::{
CC_HOST_RGF_S as CC_HOST_RGF, CC_HOST_RGF_S as CC_HOST_RGF,
CLOCK_S as CLOCK, CLOCK_S as CLOCK,

23
embassy-stm32/Cargo.toml
View File

@ -5,6 +5,29 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018" edition = "2018"
resolver = "2" resolver = "2"
[package.metadata.embassy_docs]
# TODO: sdmmc
# TODO: net
# TODO: subghz
features = ["nightly", "defmt", "unstable-pac", "unstable-traits", "exti", "time-driver-any"]
flavors = [
{ regex_feature = "stm32f0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32f1.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32f2.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32f3.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32f42.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32f7.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32g0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32g4.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32h7.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32l0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32l1.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32l4.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32u5.*", target = "thumbv8m.main-none-eabihf" },
{ regex_feature = "stm32wb.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32wl.*", target = "thumbv7em-none-eabi" },
]
[dependencies] [dependencies]
embassy = { version = "0.1.0", path = "../embassy" } embassy = { version = "0.1.0", path = "../embassy" }
embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["stm32"] } embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["stm32"] }

6
embassy-stm32/build.rs
View File

@ -646,13 +646,13 @@ fn main() {
make_table(&mut m, "foreach_dma_channel", &dma_channels_table); make_table(&mut m, "foreach_dma_channel", &dma_channels_table);
let out_dir = &PathBuf::from(env::var_os("OUT_DIR").unwrap()); let out_dir = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
let out_file = out_dir.join("macros.rs").to_string_lossy().to_string(); let out_file = out_dir.join("_macros.rs").to_string_lossy().to_string();
fs::write(out_file, m).unwrap(); fs::write(out_file, m).unwrap();
// ======== // ========
// Write generated.rs // Write generated.rs
let out_file = out_dir.join("generated.rs").to_string_lossy().to_string(); let out_file = out_dir.join("_generated.rs").to_string_lossy().to_string();
fs::write(out_file, g.to_string()).unwrap(); fs::write(out_file, g.to_string()).unwrap();
// ======== // ========
@ -773,7 +773,7 @@ impl<T: Iterator> IteratorExt for T {
fn make_table(out: &mut String, name: &str, data: &Vec<Vec<String>>) { fn make_table(out: &mut String, name: &str, data: &Vec<Vec<String>>) {
write!( write!(
out, out,
"#[macro_export] "#[allow(unused)]
macro_rules! {} {{ macro_rules! {} {{
($($pat:tt => $code:tt;)*) => {{ ($($pat:tt => $code:tt;)*) => {{
macro_rules! __{}_inner {{ macro_rules! __{}_inner {{

1
embassy-stm32/src/can/bxcan.rs
View File

@ -7,6 +7,7 @@ use embassy_hal_common::unborrow;
use crate::gpio::sealed::AFType; use crate::gpio::sealed::AFType;
use crate::{peripherals, rcc::RccPeripheral}; use crate::{peripherals, rcc::RccPeripheral};
#[doc(no_inline)]
pub use bxcan::*; pub use bxcan::*;
pub struct Can<'d, T: Instance + bxcan::Instance> { pub struct Can<'d, T: Instance + bxcan::Instance> {

4
embassy-stm32/src/dma/bdma.rs
View File

@ -6,8 +6,8 @@ use core::task::Waker;
use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::interrupt::{Interrupt, InterruptExt};
use embassy::waitqueue::AtomicWaker; use embassy::waitqueue::AtomicWaker;
use crate::_generated::BDMA_CHANNEL_COUNT;
use crate::dma::Request; use crate::dma::Request;
use crate::generated::BDMA_CHANNEL_COUNT;
use crate::pac; use crate::pac;
use crate::pac::bdma::vals; use crate::pac::bdma::vals;
@ -65,7 +65,7 @@ pub(crate) unsafe fn init() {
crate::interrupt::$irq::steal().enable(); crate::interrupt::$irq::steal().enable();
}; };
} }
crate::generated::init_bdma(); crate::_generated::init_bdma();
} }
foreach_dma_channel! { foreach_dma_channel! {

4
embassy-stm32/src/dma/dma.rs
View File

@ -4,7 +4,7 @@ use core::task::Waker;
use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::interrupt::{Interrupt, InterruptExt};
use embassy::waitqueue::AtomicWaker; use embassy::waitqueue::AtomicWaker;
use crate::generated::DMA_CHANNEL_COUNT; use crate::_generated::DMA_CHANNEL_COUNT;
use crate::interrupt; use crate::interrupt;
use crate::pac; use crate::pac;
use crate::pac::dma::{regs, vals}; use crate::pac::dma::{regs, vals};
@ -59,7 +59,7 @@ pub(crate) unsafe fn init() {
interrupt::$irq::steal().enable(); interrupt::$irq::steal().enable();
}; };
} }
crate::generated::init_dma(); crate::_generated::init_dma();
} }
foreach_dma_channel! { foreach_dma_channel! {

2
embassy-stm32/src/dma/dmamux.rs
View File

@ -49,5 +49,5 @@ foreach_dma_channel! {
/// safety: must be called only once /// safety: must be called only once
pub(crate) unsafe fn init() { pub(crate) unsafe fn init() {
crate::generated::init_dmamux(); crate::_generated::init_dmamux();
} }

2
embassy-stm32/src/gpio.rs
View File

@ -574,7 +574,7 @@ foreach_pin!(
); );
pub(crate) unsafe fn init() { pub(crate) unsafe fn init() {
crate::generated::init_gpio(); crate::_generated::init_gpio();
} }
mod eh02 { mod eh02 {

2
embassy-stm32/src/interrupt.rs
View File

@ -3,4 +3,4 @@ pub use critical_section::CriticalSection;
pub use embassy::interrupt::{take, Interrupt}; pub use embassy::interrupt::{take, Interrupt};
pub use embassy_hal_common::interrupt::Priority4 as Priority; pub use embassy_hal_common::interrupt::Priority4 as Priority;
pub use crate::generated::interrupt::*; pub use crate::_generated::interrupt::*;

9
embassy-stm32/src/lib.rs
View File

@ -11,7 +11,7 @@ pub(crate) use stm32_metapac as pac;
// This must go FIRST so that all the other modules see its macros. // This must go FIRST so that all the other modules see its macros.
pub mod fmt; pub mod fmt;
include!(concat!(env!("OUT_DIR"), "/macros.rs")); include!(concat!(env!("OUT_DIR"), "/_macros.rs"));
// Utilities // Utilities
pub mod interrupt; pub mod interrupt;
@ -63,16 +63,15 @@ pub mod usb_otg;
pub mod subghz; pub mod subghz;
// This must go last, so that it sees all the impl_foo! macros defined earlier. // This must go last, so that it sees all the impl_foo! macros defined earlier.
pub(crate) mod generated { pub(crate) mod _generated {
#![allow(dead_code)] #![allow(dead_code)]
#![allow(unused_imports)] #![allow(unused_imports)]
#![allow(non_snake_case)] #![allow(non_snake_case)]
include!(concat!(env!("OUT_DIR"), "/generated.rs")); include!(concat!(env!("OUT_DIR"), "/_generated.rs"));
} }
pub use _generated::{peripherals, Peripherals};
pub use embassy_macros::interrupt; pub use embassy_macros::interrupt;
pub use generated::{peripherals, Peripherals};
#[non_exhaustive] #[non_exhaustive]
pub struct Config { pub struct Config {

87
embassy-stm32/src/rcc/g0.rs
View File

@ -1,3 +1,4 @@
use crate::pac::rcc::vals::{Hpre, Hsidiv, Ppre, Sw};
use crate::pac::{PWR, RCC}; use crate::pac::{PWR, RCC};
use crate::rcc::{set_freqs, Clocks}; use crate::rcc::{set_freqs, Clocks};
use crate::time::Hertz; use crate::time::Hertz;
@ -29,17 +30,17 @@ pub enum HSI16Prescaler {
Div128, Div128,
} }
impl Into<u8> for HSI16Prescaler { impl Into<Hsidiv> for HSI16Prescaler {
fn into(self) -> u8 { fn into(self) -> Hsidiv {
match self { match self {
HSI16Prescaler::NotDivided => 0x00, HSI16Prescaler::NotDivided => Hsidiv::DIV1,
HSI16Prescaler::Div2 => 0x01, HSI16Prescaler::Div2 => Hsidiv::DIV2,
HSI16Prescaler::Div4 => 0x02, HSI16Prescaler::Div4 => Hsidiv::DIV4,
HSI16Prescaler::Div8 => 0x03, HSI16Prescaler::Div8 => Hsidiv::DIV8,
HSI16Prescaler::Div16 => 0x04, HSI16Prescaler::Div16 => Hsidiv::DIV16,
HSI16Prescaler::Div32 => 0x05, HSI16Prescaler::Div32 => Hsidiv::DIV32,
HSI16Prescaler::Div64 => 0x06, HSI16Prescaler::Div64 => Hsidiv::DIV64,
HSI16Prescaler::Div128 => 0x07, HSI16Prescaler::Div128 => Hsidiv::DIV128,
} }
} }
} }
@ -68,30 +69,30 @@ pub enum APBPrescaler {
Div16, Div16,
} }
impl Into<u8> for APBPrescaler { impl Into<Ppre> for APBPrescaler {
fn into(self) -> u8 { fn into(self) -> Ppre {
match self { match self {
APBPrescaler::NotDivided => 1, APBPrescaler::NotDivided => Ppre::DIV1,
APBPrescaler::Div2 => 0x04, APBPrescaler::Div2 => Ppre::DIV2,
APBPrescaler::Div4 => 0x05, APBPrescaler::Div4 => Ppre::DIV4,
APBPrescaler::Div8 => 0x06, APBPrescaler::Div8 => Ppre::DIV8,
APBPrescaler::Div16 => 0x07, APBPrescaler::Div16 => Ppre::DIV16,
} }
} }
} }
impl Into<u8> for AHBPrescaler { impl Into<Hpre> for AHBPrescaler {
fn into(self) -> u8 { fn into(self) -> Hpre {
match self { match self {
AHBPrescaler::NotDivided => 1, AHBPrescaler::NotDivided => Hpre::DIV1,
AHBPrescaler::Div2 => 0x08, AHBPrescaler::Div2 => Hpre::DIV2,
AHBPrescaler::Div4 => 0x09, AHBPrescaler::Div4 => Hpre::DIV4,
AHBPrescaler::Div8 => 0x0a, AHBPrescaler::Div8 => Hpre::DIV8,
AHBPrescaler::Div16 => 0x0b, AHBPrescaler::Div16 => Hpre::DIV16,
AHBPrescaler::Div64 => 0x0c, AHBPrescaler::Div64 => Hpre::DIV64,
AHBPrescaler::Div128 => 0x0d, AHBPrescaler::Div128 => Hpre::DIV128,
AHBPrescaler::Div256 => 0x0e, AHBPrescaler::Div256 => Hpre::DIV256,
AHBPrescaler::Div512 => 0x0f, AHBPrescaler::Div512 => Hpre::DIV512,
} }
} }
} }
@ -120,27 +121,27 @@ pub(crate) unsafe fn init(config: Config) {
let (sys_clk, sw) = match config.mux { let (sys_clk, sw) = match config.mux {
ClockSrc::HSI16(div) => { ClockSrc::HSI16(div) => {
// Enable HSI16 // Enable HSI16
let div: u8 = div.into(); let div: Hsidiv = div.into();
RCC.cr().write(|w| { RCC.cr().write(|w| {
w.set_hsidiv(div); w.set_hsidiv(div);
w.set_hsion(true) w.set_hsion(true)
}); });
while !RCC.cr().read().hsirdy() {} while !RCC.cr().read().hsirdy() {}
(HSI_FREQ >> div, 0x00) (HSI_FREQ >> div.0, Sw::HSI)
} }
ClockSrc::HSE(freq) => { ClockSrc::HSE(freq) => {
// Enable HSE // Enable HSE
RCC.cr().write(|w| w.set_hseon(true)); RCC.cr().write(|w| w.set_hseon(true));
while !RCC.cr().read().hserdy() {} while !RCC.cr().read().hserdy() {}
(freq.0, 0x01) (freq.0, Sw::HSE)
} }
ClockSrc::LSI => { ClockSrc::LSI => {
// Enable LSI // Enable LSI
RCC.csr().write(|w| w.set_lsion(true)); RCC.csr().write(|w| w.set_lsion(true));
while !RCC.csr().read().lsirdy() {} while !RCC.csr().read().lsirdy() {}
(LSI_FREQ, 0x03) (LSI_FREQ, Sw::LSI)
} }
}; };
@ -150,20 +151,24 @@ pub(crate) unsafe fn init(config: Config) {
w.set_ppre(config.apb_pre.into()); w.set_ppre(config.apb_pre.into());
}); });
let ahb_freq: u32 = match config.ahb_pre { let ahb_div = match config.ahb_pre {
AHBPrescaler::NotDivided => sys_clk, AHBPrescaler::NotDivided => 1,
pre => { AHBPrescaler::Div2 => 2,
let pre: u8 = pre.into(); AHBPrescaler::Div4 => 4,
let pre = 1 << (pre as u32 - 7); AHBPrescaler::Div8 => 8,
sys_clk / pre AHBPrescaler::Div16 => 16,
} AHBPrescaler::Div64 => 64,
AHBPrescaler::Div128 => 128,
AHBPrescaler::Div256 => 256,
AHBPrescaler::Div512 => 512,
}; };
let ahb_freq = sys_clk / ahb_div;
let (apb_freq, apb_tim_freq) = match config.apb_pre { let (apb_freq, apb_tim_freq) = match config.apb_pre {
APBPrescaler::NotDivided => (ahb_freq, ahb_freq), APBPrescaler::NotDivided => (ahb_freq, ahb_freq),
pre => { pre => {
let pre: u8 = pre.into(); let pre: Ppre = pre.into();
let pre: u8 = 1 << (pre - 3); let pre: u8 = 1 << (pre.0 - 3);
let freq = ahb_freq / pre as u32; let freq = ahb_freq / pre as u32;
(freq, freq * 2) (freq, freq * 2)
} }

14
embassy/Cargo.toml
View File

@ -5,6 +5,20 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018" edition = "2018"
resolver = "2" resolver = "2"
[package.metadata.embassy_docs]
features = ["nightly", "defmt", "unstable-traits", "time", "time-tick-1mhz"]
flavors = [
{ name = "std", target = "x86_64-unknown-linux-gnu", features = ["std"] },
{ name = "wasm", target = "wasm32-unknown-unknown", features = ["wasm"] },
{ name = "thumbv6m-none-eabi", target = "thumbv6m-none-eabi", features = [] },
{ name = "thumbv7m-none-eabi", target = "thumbv7m-none-eabi", features = [] },
{ name = "thumbv7em-none-eabi", target = "thumbv7em-none-eabi", features = [] },
{ name = "thumbv7em-none-eabihf", target = "thumbv7em-none-eabihf", features = [] },
{ name = "thumbv8m.base-none-eabi", target = "thumbv8m.base-none-eabi", features = [] },
{ name = "thumbv8m.main-none-eabi", target = "thumbv8m.main-none-eabi", features = [] },
{ name = "thumbv8m.main-none-eabihf", target = "thumbv8m.main-none-eabihf", features = [] },
]
[features] [features]
default = [] default = []
std = ["futures/std", "time", "time-tick-1mhz", "embassy-macros/std"] std = ["futures/std", "time", "time-tick-1mhz", "embassy-macros/std"]

2
stm32-data

@ -1 +1 @@
Subproject commit 5fcc7795c880c7b19bb7b6226cd6d7db0b5cd953 Subproject commit ad77937fb81628b982d2a674a88d983ec020fec7

21
stm32-metapac/Cargo.toml
View File

@ -19,6 +19,27 @@ features = ["stm32h755zi-cm7", "pac", "metadata"]
default-target = "thumbv7em-none-eabihf" default-target = "thumbv7em-none-eabihf"
targets = [] targets = []
[package.metadata.embassy_docs]
features = ["pac", "metadata"]
flavors = [
{ regex_feature = "stm32f0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32f1.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32f2.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32f3.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32f4.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32f7.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32g0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32g4.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32h7.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32l0.*", target = "thumbv6m-none-eabi" },
{ regex_feature = "stm32l1.*", target = "thumbv7m-none-eabi" },
{ regex_feature = "stm32l4.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32l5.*", target = "thumbv8m.main-none-eabihf" },
{ regex_feature = "stm32u5.*", target = "thumbv8m.main-none-eabihf" },
{ regex_feature = "stm32wb.*", target = "thumbv7em-none-eabi" },
{ regex_feature = "stm32wl.*", target = "thumbv7em-none-eabi" },
]
[dependencies] [dependencies]
cortex-m = "0.7.3" cortex-m = "0.7.3"
cortex-m-rt = { version = ">=0.6.15,<0.8", optional = true } cortex-m-rt = { version = ">=0.6.15,<0.8", optional = true }

1
stm32-metapac/src/lib.rs
View File

@ -2,6 +2,7 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
#![allow(unused)] #![allow(unused)]
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
#![doc(html_no_source)]
pub mod common; pub mod common;