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

Refactor TSC module: Remove redundant 'Tsc' prefixes for improved naming consistency

Browse Source
This commit is contained in:
michel
2024-10-10 15:14:53 +02:00
parent a5b34a7980
commit 31da5155e8
14 changed files with 379 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stm32f3/src/bin/tsc_blocking.rs
View File

@@ -64,9 +64,9 @@ async fn main(_spawner: embassy_executor::Spawner) {
let mut g: PinGroupWithRoles<peripherals::TSC, G4> = PinGroupWithRoles::default();
// D68 on the STM32F303ZE nucleo-board
g.set_io2::<tsc_pin_roles::Sample>(context.PA10);
g.set_io2::<tsc::pin_roles::Sample>(context.PA10);
// D69 on the STM32F303ZE nucleo-board
let tsc_sensor = g.set_io1::<tsc_pin_roles::Channel>(context.PA9);
let tsc_sensor = g.set_io1::<tsc::pin_roles::Channel>(context.PA9);
let pin_groups: PinGroups<peripherals::TSC> = PinGroups {
g4: Some(g.pin_group),
@@ -119,7 +119,7 @@ const MAX_GROUP_STATUS_READ_ATTEMPTS: usize = 10;
// attempt to read group status and delay when still ongoing
async fn read_touch_value(
touch_controller: &mut tsc::Tsc<'_, peripherals::TSC, mode::Blocking>,
sensor_pin: TscIOPin,
sensor_pin: tsc::IOPin,
) -> Option<u16> {
for _ in 0..MAX_GROUP_STATUS_READ_ATTEMPTS {
match touch_controller.group_get_status(sensor_pin.group()) {

4
examples/stm32l0/src/bin/tsc_async.rs
View File

@@ -58,8 +58,8 @@ async fn main(_spawner: embassy_executor::Spawner) {
let context = embassy_stm32::init(device_config);
let mut pin_group: PinGroupWithRoles<peripherals::TSC, G1> = PinGroupWithRoles::default();
pin_group.set_io1::<tsc_pin_roles::Sample>(context.PA0);
let sensor = pin_group.set_io2::<tsc_pin_roles::Channel>(context.PA1);
pin_group.set_io1::<tsc::pin_roles::Sample>(context.PA0);
let sensor = pin_group.set_io2::<tsc::pin_roles::Channel>(context.PA1);
let tsc_conf = Config {
ct_pulse_high_length: ChargeTransferPulseCycle::_4,

6
examples/stm32l0/src/bin/tsc_blocking.rs
View File

@@ -69,8 +69,8 @@ async fn main(_spawner: embassy_executor::Spawner) {
};
let mut g1: PinGroupWithRoles<peripherals::TSC, G1> = PinGroupWithRoles::default();
g1.set_io1::<tsc_pin_roles::Sample>(context.PA0);
let tsc_sensor = g1.set_io2::<tsc_pin_roles::Channel>(context.PA1);
g1.set_io1::<tsc::pin_roles::Sample>(context.PA0);
let tsc_sensor = g1.set_io2::<tsc::pin_roles::Channel>(context.PA1);
let pin_groups: PinGroups<peripherals::TSC> = PinGroups {
g1: Some(g1.pin_group),
@@ -123,7 +123,7 @@ const MAX_GROUP_STATUS_READ_ATTEMPTS: usize = 10;
// attempt to read group status and delay when still ongoing
async fn read_touch_value(
touch_controller: &mut tsc::Tsc<'_, peripherals::TSC, mode::Blocking>,
sensor_pin: TscIOPin,
sensor_pin: tsc::IOPin,
) -> Option<u16> {
for _ in 0..MAX_GROUP_STATUS_READ_ATTEMPTS {
match touch_controller.group_get_status(sensor_pin.group()) {

10
examples/stm32l0/src/bin/tsc_multipin.rs
View File

@@ -78,7 +78,7 @@ const SENSOR_THRESHOLD: u16 = 35;
async fn acquire_sensors(
touch_controller: &mut Tsc<'static, peripherals::TSC, mode::Async>,
tsc_acquisition_bank: &TscAcquisitionBank,
tsc_acquisition_bank: &AcquisitionBank,
) {
touch_controller.set_active_channels_mask(tsc_acquisition_bank.mask());
touch_controller.start();
@@ -95,11 +95,11 @@ async fn main(_spawner: embassy_executor::Spawner) {
// ---------- initial configuration of TSC ----------
let mut pin_group1: PinGroupWithRoles<peripherals::TSC, G1> = PinGroupWithRoles::default();
pin_group1.set_io1::<tsc_pin_roles::Sample>(context.PA0);
pin_group1.set_io1::<tsc::pin_roles::Sample>(context.PA0);
let tsc_sensor0 = pin_group1.set_io2(context.PA1);
let mut pin_group5: PinGroupWithRoles<peripherals::TSC, G5> = PinGroupWithRoles::default();
pin_group5.set_io1::<tsc_pin_roles::Sample>(context.PB3);
pin_group5.set_io1::<tsc::pin_roles::Sample>(context.PB3);
let tsc_sensor1 = pin_group5.set_io2(context.PB4);
let tsc_sensor2 = pin_group5.set_io3(context.PB6);
@@ -128,14 +128,14 @@ async fn main(_spawner: embassy_executor::Spawner) {
// ---------- setting up acquisition banks ----------
// sensor0 and sensor1 in this example belong to different TSC-groups,
// therefore we can acquire and read them both in one go.
let bank1 = touch_controller.create_acquisition_bank(TscAcquisitionBankPins {
let bank1 = touch_controller.create_acquisition_bank(AcquisitionBankPins {
g1_pin: Some(tsc_sensor0),
g5_pin: Some(tsc_sensor1),
..Default::default()
});
// `sensor1` and `sensor2` belongs to the same TSC-group, therefore we must make sure to
// acquire them one at the time. Therefore, we organize them into different acquisition banks.
let bank2 = touch_controller.create_acquisition_bank(TscAcquisitionBankPins {
let bank2 = touch_controller.create_acquisition_bank(AcquisitionBankPins {
g5_pin: Some(tsc_sensor2),
..Default::default()
});

4
examples/stm32l4/src/bin/tsc_async.rs
View File

@@ -50,9 +50,9 @@ async fn main(_spawner: embassy_executor::Spawner) {
let mut pin_group: PinGroupWithRoles<peripherals::TSC, G2> = PinGroupWithRoles::default();
// D25
pin_group.set_io1::<tsc_pin_roles::Sample>(context.PB4);
pin_group.set_io1::<tsc::pin_roles::Sample>(context.PB4);
// D21
let tsc_sensor = pin_group.set_io2::<tsc_pin_roles::Channel>(context.PB5);
let tsc_sensor = pin_group.set_io2::<tsc::pin_roles::Channel>(context.PB5);
let pin_groups: PinGroups<peripherals::TSC> = PinGroups {
g2: Some(pin_group.pin_group),

6
examples/stm32l4/src/bin/tsc_blocking.rs
View File

@@ -74,9 +74,9 @@ async fn main(_spawner: embassy_executor::Spawner) {
let mut g2: PinGroupWithRoles<peripherals::TSC, G2> = PinGroupWithRoles::default();
// D25
g2.set_io1::<tsc_pin_roles::Sample>(context.PB4);
g2.set_io1::<tsc::pin_roles::Sample>(context.PB4);
// D21
let tsc_sensor = g2.set_io2::<tsc_pin_roles::Channel>(context.PB5);
let tsc_sensor = g2.set_io2::<tsc::pin_roles::Channel>(context.PB5);
let pin_groups: PinGroups<peripherals::TSC> = PinGroups {
g2: Some(g2.pin_group),
@@ -128,7 +128,7 @@ const MAX_GROUP_STATUS_READ_ATTEMPTS: usize = 10;
// attempt to read group status and delay when still ongoing
async fn read_touch_value(
touch_controller: &mut tsc::Tsc<'_, peripherals::TSC, mode::Blocking>,
sensor_pin: TscIOPin,
sensor_pin: tsc::IOPin,
) -> Option<u16> {
for _ in 0..MAX_GROUP_STATUS_READ_ATTEMPTS {
match touch_controller.group_get_status(sensor_pin.group()) {

12
examples/stm32l4/src/bin/tsc_multipin.rs
View File

@@ -74,7 +74,7 @@ const SENSOR_THRESHOLD: u16 = 20;
async fn acquire_sensors(
touch_controller: &mut Tsc<'static, peripherals::TSC, mode::Async>,
tsc_acquisition_bank: &TscAcquisitionBank,
tsc_acquisition_bank: &AcquisitionBank,
) {
touch_controller.set_active_channels_mask(tsc_acquisition_bank.mask());
touch_controller.start();
@@ -91,11 +91,11 @@ async fn main(_spawner: embassy_executor::Spawner) {
// ---------- initial configuration of TSC ----------
let mut g1: PinGroupWithRoles<peripherals::TSC, G1> = PinGroupWithRoles::default();
g1.set_io1::<tsc_pin_roles::Sample>(context.PB12);
let sensor0 = g1.set_io2::<tsc_pin_roles::Channel>(context.PB13);
g1.set_io1::<tsc::pin_roles::Sample>(context.PB12);
let sensor0 = g1.set_io2::<tsc::pin_roles::Channel>(context.PB13);
let mut g2: PinGroupWithRoles<peripherals::TSC, G2> = PinGroupWithRoles::default();
g2.set_io1::<tsc_pin_roles::Sample>(context.PB4);
g2.set_io1::<tsc::pin_roles::Sample>(context.PB4);
let sensor1 = g2.set_io2(context.PB5);
let sensor2 = g2.set_io3(context.PB6);
@@ -124,14 +124,14 @@ async fn main(_spawner: embassy_executor::Spawner) {
// ---------- setting up acquisition banks ----------
// sensor0 and sensor1 belong to different TSC-groups, therefore we can acquire and
// read them both in one go.
let bank1 = touch_controller.create_acquisition_bank(TscAcquisitionBankPins {
let bank1 = touch_controller.create_acquisition_bank(AcquisitionBankPins {
g1_pin: Some(sensor0),
g2_pin: Some(sensor1),
..Default::default()
});
// `sensor1` and `sensor2` belongs to the same TSC-group, therefore we must make sure to
// acquire them one at the time. We do this by organizing them into different acquisition banks.
let bank2 = touch_controller.create_acquisition_bank(TscAcquisitionBankPins {
let bank2 = touch_controller.create_acquisition_bank(AcquisitionBankPins {
g2_pin: Some(sensor2),
..Default::default()
});

10
examples/stm32u5/src/bin/tsc.rs
View File

@@ -36,15 +36,15 @@ async fn main(_spawner: embassy_executor::Spawner) {
};
let mut g1: PinGroupWithRoles<peripherals::TSC, G1> = PinGroupWithRoles::default();
g1.set_io2::<tsc_pin_roles::Sample>(context.PB13);
g1.set_io3::<tsc_pin_roles::Shield>(context.PB14);
g1.set_io2::<tsc::pin_roles::Sample>(context.PB13);
g1.set_io3::<tsc::pin_roles::Shield>(context.PB14);
let mut g2: PinGroupWithRoles<peripherals::TSC, G2> = PinGroupWithRoles::default();
g2.set_io1::<tsc_pin_roles::Sample>(context.PB4);
g2.set_io1::<tsc::pin_roles::Sample>(context.PB4);
let sensor0 = g2.set_io2(context.PB5);
let mut g7: PinGroupWithRoles<peripherals::TSC, G7> = PinGroupWithRoles::default();
g7.set_io2::<tsc_pin_roles::Sample>(context.PE3);
g7.set_io2::<tsc::pin_roles::Sample>(context.PE3);
let sensor1 = g7.set_io3(context.PE4);
let pin_groups: PinGroups<peripherals::TSC> = PinGroups {
@@ -56,7 +56,7 @@ async fn main(_spawner: embassy_executor::Spawner) {
let mut touch_controller = tsc::Tsc::new_async(context.TSC, pin_groups, config, Irqs).unwrap();
let acquisition_bank = touch_controller.create_acquisition_bank(TscAcquisitionBankPins {
let acquisition_bank = touch_controller.create_acquisition_bank(AcquisitionBankPins {
g2_pin: Some(sensor0),
g7_pin: Some(sensor1),
..Default::default()