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

More fixes

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-05-31 03:21:44 +02:00
parent f4700e072d
commit d24b67512f
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
embassy-stm32/src/i2c/v2.rs
View File

@ -1,7 +1,4 @@
use crate::gpio::AnyPin; use core::cmp;
use crate::gpio::Pin;
use crate::i2c::{Error, Instance, SclPin, SdaPin};
use crate::time::Hertz;
use core::marker::PhantomData; use core::marker::PhantomData;
use embassy::util::Unborrow; use embassy::util::Unborrow;
use embassy_extras::unborrow; use embassy_extras::unborrow;
@ -9,13 +6,14 @@ use embedded_hal::blocking::i2c::Read;
use embedded_hal::blocking::i2c::Write; use embedded_hal::blocking::i2c::Write;
use embedded_hal::blocking::i2c::WriteRead; use embedded_hal::blocking::i2c::WriteRead;
use crate::pac::i2c; use crate::gpio::AnyPin;
use crate::pac::i2c::I2c as I2cTrait; use crate::gpio::Pin;
use core::cmp; use crate::i2c::{Error, Instance, SclPin, SdaPin};
use crate::pac::gpio::vals::{Afr, Moder, Ot}; use crate::pac::gpio::vals::{Afr, Moder, Ot};
use crate::pac::gpio::Gpio; use crate::pac::gpio::Gpio;
use crate::pac::regs::gpio_v1::vals::Cnf; use crate::pac::i2c;
use crate::pac::i2c::I2c as I2cTrait;
use crate::time::Hertz;
pub struct I2c<'d, T: Instance> { pub struct I2c<'d, T: Instance> {
//peri: T, //peri: T,

2
embassy-stm32/src/pwr/h7.rs
View File

@ -1,5 +1,5 @@
use crate::pac::peripherals;
use crate::pac::{PWR, RCC, SYSCFG}; use crate::pac::{PWR, RCC, SYSCFG};
use crate::peripherals;
/// Voltage Scale /// Voltage Scale
/// ///

2
embassy-stm32/src/rcc/h7/mod.rs
View File

@ -3,9 +3,9 @@ use core::marker::PhantomData;
use embassy::util::Unborrow; use embassy::util::Unborrow;
use crate::fmt::{assert, panic}; use crate::fmt::{assert, panic};
use crate::pac::peripherals;
use crate::pac::rcc::vals::Timpre; use crate::pac::rcc::vals::Timpre;
use crate::pac::{DBGMCU, RCC, SYSCFG}; use crate::pac::{DBGMCU, RCC, SYSCFG};
use crate::peripherals;
use crate::pwr::{Power, VoltageScale}; use crate::pwr::{Power, VoltageScale};
use crate::time::Hertz; use crate::time::Hertz;

2
embassy-stm32/src/rcc/l0/mod.rs
View File

@ -1,5 +1,5 @@
use crate::pac; use crate::pac;
use crate::pac::peripherals::{self, RCC}; use crate::peripherals::{self, RCC};
use crate::rcc::{set_freqs, Clocks}; use crate::rcc::{set_freqs, Clocks};
use crate::time::Hertz; use crate::time::Hertz;
use crate::time::U32Ext; use crate::time::U32Ext;

6
embassy-stm32/src/sdmmc/v2.rs
View File

@ -11,9 +11,9 @@ use futures::future::poll_fn;
use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR}; use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR};
use crate::fmt::*; use crate::fmt::*;
use crate::interrupt::Interrupt;
use crate::pac; use crate::pac;
use crate::pac::gpio::Gpio; use crate::pac::gpio::Gpio;
use crate::pac::interrupt::Interrupt;
use crate::pac::sdmmc::Sdmmc as RegBlock; use crate::pac::sdmmc::Sdmmc as RegBlock;
use crate::time::Hertz; use crate::time::Hertz;
@ -1472,10 +1472,10 @@ where
macro_rules! impl_sdmmc { macro_rules! impl_sdmmc {
($inst:ident) => { ($inst:ident) => {
impl crate::sdmmc::sealed::Instance for peripherals::$inst { impl crate::sdmmc::sealed::Instance for peripherals::$inst {
type Interrupt = interrupt::$inst; type Interrupt = crate::interrupt::$inst;
fn inner() -> crate::sdmmc::SdmmcInner { fn inner() -> crate::sdmmc::SdmmcInner {
const INNER: crate::sdmmc::SdmmcInner = crate::sdmmc::SdmmcInner($inst); const INNER: crate::sdmmc::SdmmcInner = crate::sdmmc::SdmmcInner(crate::pac::$inst);
INNER INNER
} }

2
stm32-data

@ -1 +1 @@
Subproject commit c5db875ec2ce8568cfac018ecbdf288fc4b63ba0 Subproject commit 64220ffdbf55b802f063ab209cdd7a788c95ca57