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

Merge remote-tracking branch 'origin/main' into adding_eeprom

Browse Source
This commit is contained in:
okhsunrog 2025-05-21 09:28:31 +03:00
commit aa951e7fd6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-mspm0/src/gpio.rs
View File

@ -10,7 +10,7 @@ use embassy_sync::waitqueue::AtomicWaker;
use crate::pac::gpio::vals::*; use crate::pac::gpio::vals::*;
use crate::pac::gpio::{self}; use crate::pac::gpio::{self};
#[cfg(all(feature = "rt", mspm0c110x))] #[cfg(all(feature = "rt", any(mspm0c110x, mspm0l110x)))]
use crate::pac::interrupt; use crate::pac::interrupt;
use crate::pac::{self}; use crate::pac::{self};
@ -1120,7 +1120,7 @@ impl Iterator for BitIter {
} }
// C110x has a dedicated interrupt just for GPIOA, as it does not have a GROUP1 interrupt. // C110x has a dedicated interrupt just for GPIOA, as it does not have a GROUP1 interrupt.
#[cfg(all(feature = "rt", mspm0c110x))] #[cfg(all(feature = "rt", any(mspm0c110x, mspm0l110x)))]
#[interrupt] #[interrupt]
fn GPIOA() { fn GPIOA() {
gpioa_interrupt(); gpioa_interrupt();

4
embassy-mspm0/src/int_group/l12xx.rs
View File

@ -41,9 +41,9 @@ fn GROUP1() {
match group { match group {
Group1::GPIOA => crate::gpio::gpioa_interrupt(), Group1::GPIOA => crate::gpio::gpioa_interrupt(),
Group1::GPIOB => todo!("implement GPIOB"), Group1::GPIOB => crate::gpio::gpiob_interrupt(),
Group1::COMP0 => todo!("implement COMP0"), Group1::COMP0 => todo!("implement COMP0"),
Group1::TRNG => todo!("implement TRNG"), Group1::TRNG => todo!("implement TRNG"),
Group1::GPIOC => todo!("implement GPIOC"), Group1::GPIOC => crate::gpio::gpioc_interrupt(),
} }
} }