Skip to content

Commit ebead1b

Browse files
committed
Use Generic Pair for ADC
1 parent 44c5646 commit ebead1b

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

testsuite/tests/adc.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ struct State {
2929
mod tests {
3030
use super::*;
3131
use defmt::{self, assert, unwrap};
32+
use testsuite::GenericPair;
3233

3334
#[init]
3435
fn init() -> State {
@@ -39,6 +40,13 @@ mod tests {
3940
let clocks = rcc.cfgr.freeze(&mut flash.acr);
4041
let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
4142

43+
let pair = GenericPair {
44+
0: gpioc.pc0.into_analog(&mut gpioc.moder, &mut gpioc.pupdr),
45+
1: gpioc
46+
.pc1
47+
.into_push_pull_output(&mut gpioc.moder, &mut gpioc.otyper),
48+
};
49+
4250
State {
4351
adc: Some(adc::Adc::adc1(
4452
dp.ADC1,
@@ -47,10 +55,8 @@ mod tests {
4755
adc::CkMode::default(),
4856
clocks,
4957
)),
50-
analog: gpioc.pc0.into_analog(&mut gpioc.moder, &mut gpioc.pupdr),
51-
output: gpioc
52-
.pc1
53-
.into_push_pull_output(&mut gpioc.moder, &mut gpioc.otyper),
58+
analog: pair.0,
59+
output: pair.1,
5460
ahb: rcc.ahb,
5561
clocks,
5662
adc1_2: dp.ADC1_2,

0 commit comments

Comments
 (0)