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

Reexport unborrow macro in HALs

Browse Source
This commit is contained in:
Matous Hybl 2022-03-27 19:29:29 +02:00
parent fee0aef076
commit eb6910fa86
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embassy-nrf/src/lib.rs
View File

@ -115,6 +115,9 @@ pub use chip::pac;
#[cfg(not(feature = "unstable-pac"))] #[cfg(not(feature = "unstable-pac"))]
pub(crate) use chip::pac; pub(crate) use chip::pac;
pub use embassy::util::Unborrow;
pub use embassy_hal_common::unborrow;
pub use chip::{peripherals, Peripherals}; pub use chip::{peripherals, Peripherals};
pub mod interrupt { pub mod interrupt {

3
embassy-rp/src/lib.rs
View File

@ -7,6 +7,9 @@ pub use rp2040_pac2 as pac;
#[cfg(not(feature = "unstable-pac"))] #[cfg(not(feature = "unstable-pac"))]
pub(crate) use rp2040_pac2 as pac; pub(crate) use rp2040_pac2 as pac;
pub use embassy::util::Unborrow;
pub use embassy_hal_common::unborrow;
// This mod MUST go first, so that the others see its macros. // This mod MUST go first, so that the others see its macros.
pub(crate) mod fmt; pub(crate) mod fmt;

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

@ -9,6 +9,9 @@ pub use stm32_metapac as pac;
#[cfg(not(feature = "unstable-pac"))] #[cfg(not(feature = "unstable-pac"))]
pub(crate) use stm32_metapac as pac; pub(crate) use stm32_metapac as pac;
pub use embassy::util::Unborrow;
pub use embassy_hal_common::unborrow;
// 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"));

1
examples/stm32h7/Cargo.toml
View File

@ -11,7 +11,6 @@ resolver = "2"
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] }
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "net", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "net", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] }
embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] }
embassy-hal-common = { path = "../../embassy-hal-common", default-features = false, features = ["defmt"] }
defmt = "0.3" defmt = "0.3"
defmt-rtt = "0.3" defmt-rtt = "0.3"

2
examples/stm32h7/src/bin/low_level_timer_api.rs
View File

@ -10,11 +10,11 @@ use defmt::*;
use embassy::executor::Spawner; use embassy::executor::Spawner;
use embassy::time::{Duration, Timer}; use embassy::time::{Duration, Timer};
use embassy::util::Unborrow; use embassy::util::Unborrow;
use embassy_hal_common::unborrow;
use embassy_stm32::gpio::low_level::AFType; use embassy_stm32::gpio::low_level::AFType;
use embassy_stm32::gpio::Speed; use embassy_stm32::gpio::Speed;
use embassy_stm32::pwm::*; use embassy_stm32::pwm::*;
use embassy_stm32::time::{Hertz, U32Ext}; use embassy_stm32::time::{Hertz, U32Ext};
use embassy_stm32::unborrow;
use embassy_stm32::{Config, Peripherals}; use embassy_stm32::{Config, Peripherals};
pub fn config() -> Config { pub fn config() -> Config {