@@ -326,8 +326,9 @@ pub fn adc12(
326
326
prec : rec:: Adc12 ,
327
327
clocks : & CoreClocks ,
328
328
) -> ( 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) ;
331
332
332
333
// Check adc_ker_ck_input
333
334
check_clock ( & prec, clocks) ;
@@ -336,21 +337,21 @@ pub fn adc12(
336
337
let prec = prec. enable ( ) ;
337
338
338
339
// Power Down
339
- a1 . power_down ( ) ;
340
- a2 . power_down ( ) ;
340
+ adc1 . power_down ( ) ;
341
+ adc2 . power_down ( ) ;
341
342
342
343
// Reset peripheral
343
344
prec. reset ( ) ;
344
345
345
346
// 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 )
354
355
}
355
356
356
357
/// Freeing both the periperhal and PREC is possible for ADC3
@@ -395,7 +396,9 @@ macro_rules! adc_hal {
395
396
pub fn $adcX( adc: $ADC, delay: & mut Delay ,
396
397
prec: rec:: $Rec, clocks: & CoreClocks
397
398
) -> 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) ;
399
402
400
403
// Check adc_ker_ck_input
401
404
check_clock( & prec, clocks) ;
@@ -404,17 +407,17 @@ macro_rules! adc_hal {
404
407
let prec = prec. enable( ) ;
405
408
406
409
// Power Down
407
- a . power_down( ) ;
410
+ adc . power_down( ) ;
408
411
409
412
// Reset peripheral
410
413
prec. reset( ) ;
411
414
412
415
// 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( ) ;
416
419
417
- a
420
+ adc
418
421
}
419
422
/// Creates ADC with default settings
420
423
fn default_from_rb( rb: $ADC) -> Self {
0 commit comments