Fix atsame54_xpro mcan example

atsamd-rs · Nov 25, 2024 · 82dca2f · 82dca2f
1 parent a5ef645
commit 82dca2f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/boards/atsame54_xpro/examples/mcan.rs b/boards/atsame54_xpro/examples/mcan.rs
@@ -22,7 +22,7 @@
 use atsame54_xpro as bsp;
 use bsp::hal;
 use hal::clock::v2 as clock;
-use hal::eic::pin::*;
+use hal::eic::{Ch15, Eic, ExtInt, Sense};
 use hal::gpio::{Interrupt as GpioInterrupt, *};
 use hal::prelude::*;
 
@@ -87,7 +87,7 @@ type Aux = mcan::bus::Aux<
         bsp::pac::Can1,
     >,
 >;
-type Button = ExtInt15<Pin<PB31, GpioInterrupt<PullUp>>>;
+type Button = ExtInt<Pin<PB31, GpioInterrupt<PullUp>>, Ch15>;
 
 #[rtic::app(device = hal::pac, peripherals = true, dispatchers = [FREQM])]
 mod app {
@@ -140,9 +140,8 @@ mod app {
 
         let (pclk_eic, gclk0) = clock::pclk::Pclk::enable(tokens.pclks.eic, clocks.gclk0);
 
-        let mut eic =
-            hal::eic::init_with_ulp32k(&mut mclk, pclk_eic.into(), ctx.device.eic).finalize();
-        let mut button = bsp::pin_alias!(pins.button).into_pull_up_ei(&mut eic);
+        let eic_channels = Eic::new(&mut mclk, pclk_eic.into(), ctx.device.eic).split();
+        let mut button = bsp::pin_alias!(pins.button).into_pull_up_ei(eic_channels.15);
         button.sense(Sense::Fall);
         button.debounce();
         button.enable_interrupt();

diff --git a/hal/src/peripherals/eic.rs b/hal/src/peripherals/eic.rs
@@ -1,6 +1,7 @@
 use core::marker::PhantomData;
 
 use atsamd_hal_macros::{hal_cfg, hal_module};
+use seq_macro::seq;
 
 use crate::{
     clock::EicClock,
@@ -79,7 +80,9 @@ where
     }
 }
 
-/// EIC channel. Use this struct to create an [`ExtInt`](pins::ExtInt)
+/// EIC channel.
+///
+/// Use this struct to create an [`ExtInt`](pins::ExtInt) by calling [`with_pin`](Self::with_pin).
 pub struct Channel<Id: ChId, F = NoneT> {
     eic: core::mem::ManuallyDrop<pac::Eic>,
     _id: PhantomData<Id>,
@@ -193,7 +196,7 @@ pub const NUM_CHANNELS: usize = with_num_channels!(get);
 
 macro_rules! define_channels_struct {
     ($num_channels:literal) => {
-        seq_macro::seq!(N in 0..$num_channels {
+        seq!(N in 0..$num_channels {
             #(
                 /// Type alias for a channel number
                 pub struct Ch~N;
@@ -218,7 +221,7 @@ with_num_channels!(define_channels_struct);
 #[cfg(feature = "async")]
 macro_rules! define_channels_struct_future {
     ($num_channels:literal) => {
-        seq_macro::seq!(N in 0..$num_channels {
+        seq!(N in 0..$num_channels {
             /// Struct generating individual handles to each EXTINT channel for `async` operation
             pub struct FutureChannels(
                 #(
@@ -234,7 +237,7 @@ with_num_channels!(define_channels_struct_future);
 
 macro_rules! define_split {
     ($num_channels:literal) => {
-        seq_macro::seq!(N in 0..$num_channels {
+        seq!(N in 0..$num_channels {
             /// Split the EIC into individual channels.
             #[inline]
             pub fn split(self) -> Channels {
@@ -256,7 +259,7 @@ impl Eic {
 #[cfg(feature = "async")]
 macro_rules! define_split_future {
     ($num_channels:literal) => {
-        seq_macro::seq!(N in 0..$num_channels {
+        seq!(N in 0..$num_channels {
             /// Split the EIC into individual channels
             #[inline]
             pub fn split(self) -> FutureChannels {