@@ -31,12 +31,14 @@ fn main() -> ! {
3131 hrtim:: control:: HrControltExt ,
3232 hrtim:: output:: HrOutput ,
3333 hrtim:: HrPwmAdvExt ,
34- hrtim:: { control :: Adc13Trigger , Pscl4 } ,
34+ hrtim:: Pscl4 ,
3535 pwr:: PwrExt ,
3636 rcc:: { self , RccExt } ,
3737 stm32:: Peripherals ,
3838 } ;
3939
40+ const VREF : f32 = 3.3 ;
41+
4042 info ! ( "start" ) ;
4143
4244 let dp = Peripherals :: take ( ) . unwrap ( ) ;
@@ -109,14 +111,9 @@ fn main() -> ! {
109111 //out1 | | | |
110112 // | | | |
111113 // -------- ---------- --------
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 ( ) ;
118115 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
120117 . HRTIM_TIMA
121118 . pwm_advanced ( ( pin_a, pin_b) , & mut rcc)
122119 . prescaler ( prescaler)
@@ -126,6 +123,9 @@ fn main() -> ! {
126123 // as normal
127124 . finalize ( & mut hr_control) ;
128125
126+ hr_control. enable_adc_trigger1_source ( & cr3) ;
127+ hr_control. enable_adc_trigger1_source ( & cr4) ;
128+
129129 out1. enable_rst_event ( & cr1) ; // Set low on compare match with cr1
130130 out2. enable_rst_event ( & cr1) ;
131131
@@ -144,7 +144,11 @@ fn main() -> ! {
144144
145145 let millivolts = Vref :: sample_to_millivolts ( ( b[ 0 ] + b[ 2 ] ) / 2 ) ;
146146 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+ ) ;
148152 info ! ( "temp: {}℃C" , temp) ; // Note: Temperature seems quite low...
149153 }
150154}
0 commit comments