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

Add embassy_prefix attribute parameter to task and main macros

Browse Source 
This allows crates depending on embassy that wants to use a different
module path to do so for the 'task' and 'main' macros, by passing the
parameter 'embassy_prefix'. The prefix defaults to '::', which will
retain the existing behavior.
This commit is contained in:
Ulf Lilleengen
2021-04-14 09:25:10 +02:00
parent 8e040cc5d2
commit 37b3d8b22c
5 changed files with 122 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
embassy-macros/src/chip/nrf.rs
View File

@ -1,3 +1,4 @@
use crate::path::ModulePrefix;
use darling::FromMeta;
use proc_macro2::TokenStream;
use quote::{format_ident, quote};
@ -30,32 +31,37 @@ impl Default for LfclkSource {
}
}
#[derive(Debug, FromMeta)]
#[derive(Debug, FromMeta, Default)]
pub struct Args {
#[darling(default)]
pub embassy_prefix: ModulePrefix,
#[darling(default)]
pub hfclk_source: HfclkSource,
#[darling(default)]
pub lfclk_source: LfclkSource,
}
pub fn generate(args: Args) -> TokenStream {
pub fn generate(args: &Args) -> TokenStream {
let hfclk_source = format_ident!("{}", format!("{:?}", args.hfclk_source));
let lfclk_source = format_ident!("{}", format!("{:?}", args.lfclk_source));
let embassy_path = args.embassy_prefix.append("embassy").path();
let embassy_nrf_path = args.embassy_prefix.append("embassy_nrf").path();
quote!(
use embassy_nrf::{interrupt, peripherals, rtc};
use #embassy_nrf_path::{interrupt, peripherals, rtc};
let mut config = embassy_nrf::system::Config::default();
config.hfclk_source = embassy_nrf::system::HfclkSource::#hfclk_source;
config.lfclk_source = embassy_nrf::system::LfclkSource::#lfclk_source;
unsafe { embassy_nrf::system::configure(config) };
let mut config = #embassy_nrf_path::system::Config::default();
config.hfclk_source = #embassy_nrf_path::system::HfclkSource::#hfclk_source;
config.lfclk_source = #embassy_nrf_path::system::LfclkSource::#lfclk_source;
unsafe { #embassy_nrf_path::system::configure(config) };
let mut rtc = rtc::RTC::new(unsafe { <peripherals::RTC1 as embassy::util::Steal>::steal() }, interrupt::take!(RTC1));
let mut rtc = rtc::RTC::new(unsafe { <peripherals::RTC1 as #embassy_path::util::Steal>::steal() }, interrupt::take!(RTC1));
let rtc = unsafe { make_static(&mut rtc) };
rtc.start();
let mut alarm = rtc.alarm0();
unsafe { embassy::time::set_clock(rtc) };
unsafe { #embassy_path::time::set_clock(rtc) };
let alarm = unsafe { make_static(&mut alarm) };
executor.set_alarm(alarm);

17
embassy-macros/src/chip/rp.rs
View File

@ -1,15 +1,20 @@
use crate::path::ModulePrefix;
use darling::FromMeta;
use proc_macro2::TokenStream;
use quote::quote;
#[derive(Debug, FromMeta)]
pub struct Args {}
#[derive(Debug, FromMeta, Default)]
pub struct Args {
#[darling(default)]
pub embassy_prefix: ModulePrefix,
}
pub fn generate(_args: Args) -> TokenStream {
pub fn generate(args: &Args) -> TokenStream {
let embassy_rp_path = args.embassy_prefix.append("embassy_rp").path();
quote!(
use embassy_rp::{interrupt, peripherals};
use #embassy_rp_path::{interrupt, peripherals};
let mut config = embassy_rp::system::Config::default();
unsafe { embassy_rp::system::configure(config) };
let mut config = #embassy_rp_path::system::Config::default();
unsafe { #embassy_rp_path::system::configure(config) };
)
}

14
embassy-macros/src/chip/stm32.rs
View File

@ -1,10 +1,13 @@
use crate::path::ModulePrefix;
use darling::FromMeta;
use proc_macro2::TokenStream;
use quote::{format_ident, quote};
use syn::spanned::Spanned;
#[derive(Debug, FromMeta)]
#[derive(Debug, FromMeta, Default)]
pub struct Args {
#[darling(default)]
pub embassy_prefix: ModulePrefix,
#[darling(default)]
pub use_hse: Option<u32>,
#[darling(default)]
@ -15,7 +18,10 @@ pub struct Args {
pub require_pll48clk: bool,
}
pub fn generate(args: Args) -> TokenStream {
pub fn generate(args: &Args) -> TokenStream {
let embassy_path = args.embassy_prefix.append("embassy").path();
let embassy_stm32_path = args.embassy_prefix.append("embassy_stm32").path();
let mut clock_cfg_args = quote! {};
if args.use_hse.is_some() {
let mhz = args.use_hse.unwrap();
@ -37,7 +43,7 @@ pub fn generate(args: Args) -> TokenStream {
}
quote!(
use embassy_stm32::{rtc, interrupt, Peripherals, pac, hal::rcc::RccExt, hal::time::U32Ext};
use #embassy_stm32_path::{rtc, interrupt, Peripherals, pac, hal::rcc::RccExt, hal::time::U32Ext};
let dp = pac::Peripherals::take().unwrap();
let rcc = dp.RCC.constrain();
@ -50,7 +56,7 @@ pub fn generate(args: Args) -> TokenStream {
rtc.start();
let mut alarm = rtc.alarm1();
unsafe { embassy::time::set_clock(rtc) };
unsafe { #embassy_path::time::set_clock(rtc) };
let alarm = unsafe { make_static(&mut alarm) };
executor.set_alarm(alarm);