File tree Expand file tree Collapse file tree 2 files changed +9
-5
lines changed Expand file tree Collapse file tree 2 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ mod tests {
65
65
defmt:: debug!( "{}" , adc_level) ;
66
66
defmt:: unwrap!( state. output. set_low( ) ) ;
67
67
// Vref is 3V so output should reach the maximum.
68
- assert ! ( adc_level >= 3500 && adc_level <= 4100 ) ;
68
+ assert ! ( ( 3500 .. 4100 ) . contains ( & adc_level) ) ;
69
69
let adc_level: u16 = defmt:: unwrap!( adc. read( & mut state. analog) . ok( ) ) ;
70
70
defmt:: debug!( "{}" , adc_level) ;
71
71
// nearly zero (always zero can not be guaranteed)
Original file line number Diff line number Diff line change @@ -26,17 +26,21 @@ use hal::{
26
26
27
27
use hal:: interrupt;
28
28
29
- use core:: array:: IntoIter ;
30
29
use defmt:: { assert, assert_eq, unwrap} ;
31
30
31
+ use core:: array:: IntoIter ;
32
32
use core:: sync:: atomic:: { AtomicBool , Ordering } ;
33
33
34
34
static INTERRUPT_FIRED : AtomicBool = AtomicBool :: new ( false ) ;
35
35
36
+ type Serial1 = Serial < pac:: USART1 , ( PA9 < AF7 < PushPull > > , PA10 < AF7 < PushPull > > ) > ;
37
+ type SerialSlow = Serial < pac:: USART2 , ( PA2 < AF7 < PushPull > > , PA3 < AF7 < OpenDrain > > ) > ;
38
+ type SerialFast = Serial < pac:: USART3 , ( PB10 < AF7 < PushPull > > , PB11 < AF7 < OpenDrain > > ) > ;
39
+
36
40
struct State {
37
- serial1 : Option < Serial < pac :: USART1 , ( PA9 < AF7 < PushPull > > , PA10 < AF7 < PushPull > > ) > > ,
38
- serial_slow : Option < Serial < pac :: USART2 , ( PA2 < AF7 < PushPull > > , PA3 < AF7 < OpenDrain > > ) > > ,
39
- serial_fast : Option < Serial < pac :: USART3 , ( PB10 < AF7 < PushPull > > , PB11 < AF7 < OpenDrain > > ) > > ,
41
+ serial1 : Option < Serial1 > ,
42
+ serial_slow : Option < SerialSlow > ,
43
+ serial_fast : Option < SerialFast > ,
40
44
clocks : Clocks ,
41
45
apb1 : APB1 ,
42
46
apb2 : APB2 ,
You can’t perform that action at this time.
0 commit comments