Skip to content

Commit 72a778e

Browse files
committed
Rename a/a1/a2 to adc/adc1/adc2, clarifies that rb was consumed
1 parent 1024b61 commit 72a778e

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

src/adc.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,9 @@ pub fn adc12(
326326
prec: rec::Adc12,
327327
clocks: &CoreClocks,
328328
) -> (Adc<ADC1, Disabled>, Adc<ADC2, Disabled>) {
329-
let mut a1 = Adc::<ADC1, Disabled>::default_from_rb(adc1);
330-
let mut a2 = Adc::<ADC2, Disabled>::default_from_rb(adc2);
329+
// Consume ADC register block, produce ADC1/2 with default settings
330+
let mut adc1 = Adc::<ADC1, Disabled>::default_from_rb(adc1);
331+
let mut adc2 = Adc::<ADC2, Disabled>::default_from_rb(adc2);
331332

332333
// Check adc_ker_ck_input
333334
check_clock(&prec, clocks);
@@ -336,21 +337,21 @@ pub fn adc12(
336337
let prec = prec.enable();
337338

338339
// Power Down
339-
a1.power_down();
340-
a2.power_down();
340+
adc1.power_down();
341+
adc2.power_down();
341342

342343
// Reset peripheral
343344
prec.reset();
344345

345346
// Power Up, Preconfigure and Calibrate
346-
a1.power_up(delay);
347-
a2.power_up(delay);
348-
a1.preconfigure();
349-
a2.preconfigure();
350-
a1.calibrate();
351-
a2.calibrate();
352-
353-
(a1, a2)
347+
adc1.power_up(delay);
348+
adc2.power_up(delay);
349+
adc1.preconfigure();
350+
adc2.preconfigure();
351+
adc1.calibrate();
352+
adc2.calibrate();
353+
354+
(adc1, adc2)
354355
}
355356

356357
/// Freeing both the periperhal and PREC is possible for ADC3
@@ -395,7 +396,9 @@ macro_rules! adc_hal {
395396
pub fn $adcX(adc: $ADC, delay: &mut Delay,
396397
prec: rec::$Rec, clocks: &CoreClocks
397398
) -> Self {
398-
let mut a = Self::default_from_rb(adc);
399+
// Consume ADC register block, produce Self with default
400+
// settings
401+
let mut adc = Self::default_from_rb(adc);
399402

400403
// Check adc_ker_ck_input
401404
check_clock(&prec, clocks);
@@ -404,17 +407,17 @@ macro_rules! adc_hal {
404407
let prec = prec.enable();
405408

406409
// Power Down
407-
a.power_down();
410+
adc.power_down();
408411

409412
// Reset peripheral
410413
prec.reset();
411414

412415
// Power Up, Preconfigure and Calibrate
413-
a.power_up(delay);
414-
a.preconfigure();
415-
a.calibrate();
416+
adc.power_up(delay);
417+
adc.preconfigure();
418+
adc.calibrate();
416419

417-
a
420+
adc
418421
}
419422
/// Creates ADC with default settings
420423
fn default_from_rb(rb: $ADC) -> Self {

0 commit comments

Comments
 (0)