nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-02-16 08:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address versioning and format issues raised by CI

Browse Source
This commit is contained in:
Karun 2024-04-22 12:36:17 -04:00
parent fd69247d70
commit 253f6c42ee
3 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,10 +101,10 @@ pub mod sai;
pub mod sdmmc;
#[cfg(spi)]
pub mod spi;
#[cfg(ucpd)]
pub mod ucpd;
#[cfg(tsc)]
pub mod tsc;
#[cfg(ucpd)]
pub mod ucpd;
#[cfg(uid)]
pub mod uid;
#[cfg(usart)]

16
embassy-stm32/src/tsc/enums.rs
View File

@ -27,13 +27,21 @@ pub enum TscIOPin {
Group6Io2,
Group6Io3,
Group6Io4,
#[cfg(any(tsc_v2, tsc_v3))]
Group7Io1,
#[cfg(any(tsc_v2, tsc_v3))]
Group7Io2,
#[cfg(any(tsc_v2, tsc_v3))]
Group7Io3,
#[cfg(any(tsc_v2, tsc_v3))]
Group7Io4,
#[cfg(tsc_v3)]
Group8Io1,
#[cfg(tsc_v3)]
Group8Io2,
#[cfg(tsc_v3)]
Group8Io3,
#[cfg(tsc_v3)]
Group8Io4,
}
@ -78,13 +86,21 @@ impl Into<u32> for TscIOPin {
TscIOPin::Group6Io2 => 0x00200000,
TscIOPin::Group6Io3 => 0x00400000,
TscIOPin::Group6Io4 => 0x00800000,
#[cfg(any(tsc_v2, tsc_v3))]
TscIOPin::Group7Io1 => 0x01000000,
#[cfg(any(tsc_v2, tsc_v3))]
TscIOPin::Group7Io2 => 0x02000000,
#[cfg(any(tsc_v2, tsc_v3))]
TscIOPin::Group7Io3 => 0x04000000,
#[cfg(any(tsc_v2, tsc_v3))]
TscIOPin::Group7Io4 => 0x08000000,
#[cfg(tsc_v3)]
TscIOPin::Group8Io1 => 0x10000000,
#[cfg(tsc_v3)]
TscIOPin::Group8Io2 => 0x20000000,
#[cfg(tsc_v3)]
TscIOPin::Group8Io3 => 0x40000000,
#[cfg(tsc_v3)]
TscIOPin::Group8Io4 => 0x80000000,
}
}

38
embassy-stm32/src/tsc/mod.rs
View File

@ -5,13 +5,14 @@
/// Enums defined for peripheral parameters
pub mod enums;
use crate::gpio::{low_level::AFType, AnyPin, Pull};
use crate::{pac::tsc::Tsc as Regs, rcc::RccPeripheral};
pub use enums::*;
use crate::gpio::{AFType, AnyPin, Pull};
use crate::pac::tsc::Tsc as Regs;
use crate::rcc::RccPeripheral;
use crate::{peripherals, Peripheral};
use embassy_hal_internal::{into_ref, PeripheralRef};
pub use enums::*;
const TSC_NUM_GROUPS: u32 = 8;
/// Error type defined for TSC
@ -68,7 +69,9 @@ pub enum Group {
Four,
Five,
Six,
#[cfg(any(tsc_v2, tsc_v3))]
Seven,
#[cfg(tsc_v3)]
Eight,
}
@ -81,7 +84,9 @@ impl Into<usize> for Group {
Group::Four => 3,
Group::Five => 4,
Group::Six => 5,
#[cfg(any(tsc_v2, tsc_v3))]
Group::Seven => 6,
#[cfg(tsc_v3)]
Group::Eight => 7,
}
}
@ -175,7 +180,9 @@ pub struct Tsc<'d, T: Instance> {
g4: Option<PinGroup<'d, AnyPin>>,
g5: Option<PinGroup<'d, AnyPin>>,
g6: Option<PinGroup<'d, AnyPin>>,
#[cfg(any(tsc_v2, tsc_v3))]
g7: Option<PinGroup<'d, AnyPin>>,
#[cfg(tsc_v3)]
g8: Option<PinGroup<'d, AnyPin>>,
state: State,
config: Config,
@ -310,7 +317,20 @@ impl<'d, T: Instance> Tsc<'d, T> {
};
// Need to check valid pin configuration input
Self::new_inner(peri, Some(g1), Some(g2), None, Some(g4), None, None, None, None, config)
Self::new_inner(
peri,
Some(g1),
Some(g2),
None,
Some(g4),
None,
None,
#[cfg(any(tsc_v2, tsc_v3))]
None,
#[cfg(tsc_v3)]
None,
config,
)
}
// fn configure_pin<'b, G: Pin>(pin: PeripheralRef<'b, G>, role: PinType) {
@ -340,8 +360,8 @@ impl<'d, T: Instance> Tsc<'d, T> {
g4: Option<PinGroup<'d, AnyPin>>,
g5: Option<PinGroup<'d, AnyPin>>,
g6: Option<PinGroup<'d, AnyPin>>,
g7: Option<PinGroup<'d, AnyPin>>,
g8: Option<PinGroup<'d, AnyPin>>,
#[cfg(any(tsc_v2, tsc_v3))] g7: Option<PinGroup<'d, AnyPin>>,
#[cfg(tsc_v3)] g8: Option<PinGroup<'d, AnyPin>>,
config: Config,
) -> Self {
into_ref!(peri);
@ -411,7 +431,9 @@ impl<'d, T: Instance> Tsc<'d, T> {
g4,
g5,
g6,
#[cfg(any(tsc_v2, tsc_v3))]
g7,
#[cfg(tsc_v3)]
g8,
state: State::Ready,
config,
@ -548,7 +570,9 @@ impl<'d, T: Instance> Tsc<'d, T> {
Group::Four => T::REGS.iogcsr().read().g4s(),
Group::Five => T::REGS.iogcsr().read().g5s(),
Group::Six => T::REGS.iogcsr().read().g6s(),
#[cfg(any(tsc_v2, tsc_v3))]
Group::Seven => T::REGS.iogcsr().read().g7s(),
#[cfg(tsc_v3)]
Group::Eight => T::REGS.iogcsr().read().g8s(),
};
match status {