From 6180620b2302f868fdb4ffd41365ab37faa04437 Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Sat, 27 Jul 2019 12:58:09 +0300 Subject: [PATCH] bump stm32f1 --- CHANGELOG.md | 1 + Cargo.toml | 2 +- src/adc.rs | 24 ++++++++++++------------ src/gpio.rs | 1 + src/pwm.rs | 24 ++++++++++++------------ src/pwm_input.rs | 16 +++++----------- src/qei.rs | 3 +-- src/rcc.rs | 30 +++++++++++++++--------------- src/serial.rs | 14 +++++++------- src/spi.rs | 14 +++++++------- src/timer.rs | 4 ++-- 11 files changed, 64 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bb886f4..3da6f7de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Breaking changes +- Bump `stm32f1` dependency (`0.8.0`) - ADC now requires the clock configuration for intialisation - `disable_jtag` now transforms PA15, PB3 and PB4 to forbid their use without desactivating JTAG diff --git a/Cargo.toml b/Cargo.toml index 1719fcef..a9912c3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ required-features = ["rt"] cortex-m = "0.6.0" nb = "0.1.2" cortex-m-rt = "0.6.8" -stm32f1 = "0.7.0" +stm32f1 = "0.8.0" [dependencies.void] default-features = false diff --git a/src/adc.rs b/src/adc.rs index 389c354c..c1204d12 100644 --- a/src/adc.rs +++ b/src/adc.rs @@ -462,13 +462,13 @@ impl Adc { // so use the following approximate settings // to support all ADC frequencies let sample_time = match self.clocks.adcclk().0 { - 0 ... 1_200_000 => AdcSampleTime::T_1, - 1_200_001 ... 1_500_000 => AdcSampleTime::T_7, - 1_500_001 ... 2_400_000 => AdcSampleTime::T_13, - 2_400_001 ... 3_100_000 => AdcSampleTime::T_28, - 3_100_001 ... 4_000_000 => AdcSampleTime::T_41, - 4_000_001 ... 5_000_000 => AdcSampleTime::T_55, - 5_000_001 ... 14_000_000 => AdcSampleTime::T_71, + 0 ..= 1_200_000 => AdcSampleTime::T_1, + 1_200_001 ..= 1_500_000 => AdcSampleTime::T_7, + 1_500_001 ..= 2_400_000 => AdcSampleTime::T_13, + 2_400_001 ..= 3_100_000 => AdcSampleTime::T_28, + 3_100_001 ..= 4_000_000 => AdcSampleTime::T_41, + 4_000_001 ..= 5_000_000 => AdcSampleTime::T_55, + 5_000_001 ..= 14_000_000 => AdcSampleTime::T_71, _ => AdcSampleTime::T_239, }; @@ -598,8 +598,8 @@ where self.channel.ch().cr.modify(|_, w| { w .mem2mem() .clear_bit() .pl() .medium() - .msize() .bit16() - .psize() .bit16() + .msize() .bits16() + .psize() .bits16() .circ() .set_bit() .dir() .clear_bit() }); @@ -627,8 +627,8 @@ where self.channel.ch().cr.modify(|_, w| { w .mem2mem() .clear_bit() .pl() .medium() - .msize() .bit16() - .psize() .bit16() + .msize() .bits16() + .psize() .bits16() .circ() .clear_bit() .dir() .clear_bit() }); @@ -636,4 +636,4 @@ where Transfer::w(buffer, self) } -} \ No newline at end of file +} diff --git a/src/gpio.rs b/src/gpio.rs index 88e6018e..82ca0eec 100644 --- a/src/gpio.rs +++ b/src/gpio.rs @@ -199,6 +199,7 @@ macro_rules! gpio { /// Put the pin in an active state. The caller /// must enforce that the pin is really in this /// state in the hardware. + #[allow(dead_code)] pub(crate) unsafe fn activate(self) -> $PXi> { $PXi { _mode: PhantomData } } diff --git a/src/pwm.rs b/src/pwm.rs index 4c2c0132..24ea210d 100644 --- a/src/pwm.rs +++ b/src/pwm.rs @@ -309,33 +309,33 @@ macro_rules! hal { apb.rstr().modify(|_, w| w.$timXrst().clear_bit()); if PINS::C1 { - tim.ccmr1_output - .modify(|_, w| unsafe { w.oc1pe().set_bit().oc1m().bits(6) }); + tim.ccmr1_output() + .modify(|_, w| w.oc1pe().set_bit().oc1m().pwm_mode1() ); } if PINS::C2 { - tim.ccmr1_output - .modify(|_, w| unsafe { w.oc2pe().set_bit().oc2m().bits(6) }); + tim.ccmr1_output() + .modify(|_, w| w.oc2pe().set_bit().oc2m().pwm_mode1() ); } if PINS::C3 { - tim.ccmr2_output - .modify(|_, w| unsafe { w.oc3pe().set_bit().oc3m().bits(6) }); + tim.ccmr2_output() + .modify(|_, w| w.oc3pe().set_bit().oc3m().pwm_mode1() ); } if PINS::C4 { - tim.ccmr2_output - .modify(|_, w| unsafe { w.oc4pe().set_bit().oc4m().bits(6) }); + tim.ccmr2_output() + .modify(|_, w| w.oc4pe().set_bit().oc4m().pwm_mode1() ); } let clk = $TIMX::get_clk(&clocks).0; let freq = freq.0; let ticks = clk / freq; let psc = u16(ticks / (1 << 16)).unwrap(); - tim.psc.write(|w| unsafe { w.psc().bits(psc) }); + tim.psc.write(|w| w.psc().bits(psc) ); let arr = u16(ticks / u32(psc + 1)).unwrap(); - tim.arr.write(|w| { w.arr().bits(arr) }); + tim.arr.write(|w| w.arr().bits(arr)); - tim.cr1.write(|w| unsafe { + tim.cr1.write(|w| w.cms() .bits(0b00) .dir() @@ -344,7 +344,7 @@ macro_rules! hal { .clear_bit() .cen() .set_bit() - }); + ); unsafe { mem::uninitialized() } } diff --git a/src/pwm_input.rs b/src/pwm_input.rs index 2c34e018..8b2de818 100644 --- a/src/pwm_input.rs +++ b/src/pwm_input.rs @@ -211,13 +211,7 @@ macro_rules! hal { // Define the direction of the channel (input/output) // and the used input - // 01: CC1 channel is configured as input, IC1 is mapped on TI1. - // 10: CC1 channel is configured as input, IC1 is mapped on TI2. - tim.ccmr1_output.modify( |_,w| unsafe {w.cc1s().bits(0b01)}); - - // 01: CC2 channel is configured as input, IC2 is mapped on TI2 - // 10: CC2 channel is configured as input, IC2 is mapped on TI1 - tim.ccmr1_output.modify( |_,w| unsafe {w.cc2s().bits(0b10)}); + tim.ccmr1_input().modify( |_,w| w.cc1s().ti1().cc2s().ti1()); tim.dier.write(|w| w.cc1ie().set_bit()); @@ -236,7 +230,7 @@ macro_rules! hal { let max_freq = if freq > 5 {freq/5} else {1}; let (arr,presc) = compute_arr_presc(max_freq, $TIMX::get_clk(&clocks).0); tim.arr.write(|w| w.arr().bits(arr)); - tim.psc.write(|w| unsafe {w.psc().bits(presc)}); + tim.psc.write(|w| w.psc().bits(presc) ); }, DutyCycle(f) => { @@ -244,17 +238,17 @@ macro_rules! hal { let max_freq = if freq > 2 {freq/2 + freq/4 + freq/8} else {1}; let (arr,presc) = compute_arr_presc(max_freq, $TIMX::get_clk(&clocks).0); tim.arr.write(|w| w.arr().bits(arr)); - tim.psc.write(|w| unsafe {w.psc().bits(presc)}); + tim.psc.write(|w| w.psc().bits(presc) ); }, RawFrequency(f) => { let freq = f.into().0; let (arr,presc) = compute_arr_presc(freq, $TIMX::get_clk(&clocks).0); tim.arr.write(|w| w.arr().bits(arr)); - tim.psc.write(|w| unsafe {w.psc().bits(presc)}); + tim.psc.write(|w| w.psc().bits(presc) ); } RawValues{arr, presc} => { tim.arr.write(|w| w.arr().bits(arr)); - tim.psc.write(|w| unsafe {w.psc().bits(presc)}); + tim.psc.write(|w| w.psc().bits(presc) ); } } diff --git a/src/qei.rs b/src/qei.rs index f80bd4ee..c8b3be29 100644 --- a/src/qei.rs +++ b/src/qei.rs @@ -78,8 +78,7 @@ macro_rules! hal { apb.rstr().modify(|_, w| w.$timXrst().clear_bit()); // Configure TxC1 and TxC2 as captures - tim.ccmr1_output - .write(|w| unsafe { w.bits({ (0b01 << 0) | (0b01 << 8) }) }); + tim.ccmr1_input().write(|w| w.cc1s().ti1().cc2s().ti2()); // enable and configure to capture on rising edge tim.ccer.write(|w| { diff --git a/src/rcc.rs b/src/rcc.rs index d9bf8c78..13371f10 100644 --- a/src/rcc.rs +++ b/src/rcc.rs @@ -194,12 +194,12 @@ impl CFGR { 0 => unreachable!(), 1 => 0b0111, 2 => 0b1000, - 3...5 => 0b1001, - 6...11 => 0b1010, - 12...39 => 0b1011, - 40...95 => 0b1100, - 96...191 => 0b1101, - 192...383 => 0b1110, + 3..=5 => 0b1001, + 6..=11 => 0b1010, + 12..=39 => 0b1011, + 40..=95 => 0b1100, + 96..=191 => 0b1101, + 192..=383 => 0b1110, _ => 0b1111, }) .unwrap_or(0b0111); @@ -218,8 +218,8 @@ impl CFGR { 0 => unreachable!(), 1 => 0b011, 2 => 0b100, - 3...5 => 0b101, - 6...11 => 0b110, + 3..=5 => 0b101, + 6..=11 => 0b110, _ => 0b111, }) .unwrap_or(0b011); @@ -235,8 +235,8 @@ impl CFGR { 0 => unreachable!(), 1 => 0b011, 2 => 0b100, - 3...5 => 0b101, - 6...11 => 0b110, + 3..=5 => 0b101, + 6..=11 => 0b110, _ => 0b111, }) .unwrap_or(0b011); @@ -272,9 +272,9 @@ impl CFGR { let apre_bits = self .adcclk .map(|adcclk| match pclk2 / adcclk { - 0...2 => 0b00, - 3...4 => 0b01, - 5...7 => 0b10, + 0..=2 => 0b00, + 3..=4 => 0b01, + 5..=7 => 0b10, _ => 0b11, }) .unwrap_or(0b11); @@ -297,12 +297,12 @@ impl CFGR { if let Some(pllmul_bits) = pllmul_bits { // enable PLL and wait for it to be ready - rcc.cfgr.modify(|_, w| unsafe { + rcc.cfgr.modify(|_, w| w.pllmul() .bits(pllmul_bits) .pllsrc() .bit(if self.hse.is_some() { true } else { false }) - }); + ); rcc.cr.modify(|_, w| w.pllon().set_bit()); diff --git a/src/serial.rs b/src/serial.rs index 0fb8edc2..a61751a5 100644 --- a/src/serial.rs +++ b/src/serial.rs @@ -566,8 +566,8 @@ macro_rules! serialdma { self.channel.ch().cr.modify(|_, w| { w .mem2mem() .clear_bit() .pl() .medium() - .msize() .bit8() - .psize() .bit8() + .msize() .bits8() + .psize() .bits8() .circ() .set_bit() .dir() .clear_bit() }); @@ -593,8 +593,8 @@ macro_rules! serialdma { self.channel.ch().cr.modify(|_, w| { w .mem2mem() .clear_bit() .pl() .medium() - .msize() .bit8() - .psize() .bit8() + .msize() .bits8() + .psize() .bits8() .circ() .clear_bit() .dir() .clear_bit() }); @@ -622,8 +622,8 @@ macro_rules! serialdma { self.channel.ch().cr.modify(|_, w| { w .mem2mem() .clear_bit() .pl() .medium() - .msize() .bit8() - .psize() .bit8() + .msize() .bits8() + .psize() .bits8() .circ() .clear_bit() .dir() .set_bit() }); @@ -655,4 +655,4 @@ serialdma! { dma1::C3, dma1::C2, ), -} \ No newline at end of file +} diff --git a/src/spi.rs b/src/spi.rs index 87ab66b5..f79ce2f0 100644 --- a/src/spi.rs +++ b/src/spi.rs @@ -123,13 +123,13 @@ macro_rules! hal { let br = match clocks.pclk2().0 / freq.0 { 0 => unreachable!(), - 1...2 => 0b000, - 3...5 => 0b001, - 6...11 => 0b010, - 12...23 => 0b011, - 24...47 => 0b100, - 48...95 => 0b101, - 96...191 => 0b110, + 1..=2 => 0b000, + 3..=5 => 0b001, + 6..=11 => 0b010, + 12..=23 => 0b011, + 24..=47 => 0b100, + 48..=95 => 0b101, + 96..=191 => 0b110, _ => 0b111, }; diff --git a/src/timer.rs b/src/timer.rs index 3092917a..939446ad 100644 --- a/src/timer.rs +++ b/src/timer.rs @@ -177,11 +177,11 @@ macro_rules! hal { let ticks = timer_clock.0 / frequency; let psc = u16((ticks - 1) / (1 << 16)).unwrap(); - self.tim.psc.write(|w| unsafe { w.psc().bits(psc) }); + self.tim.psc.write(|w| w.psc().bits(psc) ); let arr = u16(ticks / u32(psc + 1)).unwrap(); - self.tim.arr.write(|w| unsafe { w.bits(u32(arr)) }); + self.tim.arr.write(|w| w.arr().bits(arr) ); // Trigger an update event to load the prescaler value to the clock self.tim.egr.write(|w| w.ug().set_bit());