@@ -31,12 +31,14 @@ fn main() -> ! {
31
31
hrtim:: control:: HrControltExt ,
32
32
hrtim:: output:: HrOutput ,
33
33
hrtim:: HrPwmAdvExt ,
34
- hrtim:: { control :: Adc13Trigger , Pscl4 } ,
34
+ hrtim:: Pscl4 ,
35
35
pwr:: PwrExt ,
36
36
rcc:: { self , RccExt } ,
37
37
stm32:: Peripherals ,
38
38
} ;
39
39
40
+ const VREF : f32 = 3.3 ;
41
+
40
42
info ! ( "start" ) ;
41
43
42
44
let dp = Peripherals :: take ( ) . unwrap ( ) ;
@@ -109,14 +111,9 @@ fn main() -> ! {
109
111
//out1 | | | |
110
112
// | | | |
111
113
// -------- ---------- --------
112
- let ( hr_control, ..) = dp
113
- . HRTIM_COMMON
114
- . hr_control ( & mut rcc)
115
- . enable_adc_trigger1_source ( Adc13Trigger :: TimACmp3 )
116
- . enable_adc_trigger1_source ( Adc13Trigger :: TimACmp4 )
117
- . wait_for_calibration ( ) ;
114
+ let ( hr_control, ..) = dp. HRTIM_COMMON . hr_control ( & mut rcc) . wait_for_calibration ( ) ;
118
115
let mut hr_control = hr_control. constrain ( ) ;
119
- let ( timer, ( cr1, _cr2, _cr3 , _cr4 ) , ( mut out1, mut out2) ) = dp
116
+ let ( timer, ( cr1, _cr2, cr3 , cr4 ) , ( mut out1, mut out2) ) = dp
120
117
. HRTIM_TIMA
121
118
. pwm_advanced ( ( pin_a, pin_b) , & mut rcc)
122
119
. prescaler ( prescaler)
@@ -126,6 +123,9 @@ fn main() -> ! {
126
123
// as normal
127
124
. finalize ( & mut hr_control) ;
128
125
126
+ hr_control. enable_adc_trigger1_source ( & cr3) ;
127
+ hr_control. enable_adc_trigger1_source ( & cr4) ;
128
+
129
129
out1. enable_rst_event ( & cr1) ; // Set low on compare match with cr1
130
130
out2. enable_rst_event ( & cr1) ;
131
131
@@ -144,7 +144,11 @@ fn main() -> ! {
144
144
145
145
let millivolts = Vref :: sample_to_millivolts ( ( b[ 0 ] + b[ 2 ] ) / 2 ) ;
146
146
info ! ( "pa3: {}mV" , millivolts) ;
147
- let temp = Temperature :: temperature_to_degrees_centigrade ( ( b[ 1 ] + b[ 3 ] ) / 2 ) ;
147
+ let temp = Temperature :: temperature_to_degrees_centigrade (
148
+ ( b[ 1 ] + b[ 3 ] ) / 2 ,
149
+ VREF ,
150
+ adc:: config:: Resolution :: Twelve ,
151
+ ) ;
148
152
info ! ( "temp: {}℃C" , temp) ; // Note: Temperature seems quite low...
149
153
}
150
154
}
0 commit comments