Merge #481

481: pac 0.15.1 r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

.github/workflows/ci.yml

@@ -46,9 +46,9 @@ jobs:
           override: true
 
       - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          key: pac-v0.14-${{ matrix.mcu }}
+          key: pac-v0.15.1-${{ matrix.mcu }}
 
       - uses: actions-rs/cargo@v1
         with:

.github/workflows/clippy.yml

@@ -19,9 +19,9 @@ jobs:
           components: clippy
 
       - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
+        uses: Swatinem/rust-cache@v2
         with:
-          key: pac-v0.14
+          key: pac-v0.15.1
 
       - uses: actions-rs/clippy-check@v1
         with:

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#507]: https://github.com/stm32-rs/stm32f4xx-hal/pull/507
 
 ### Changed
+ - update `stm32f4` to 0.15.1
  - use `stm32_i2s_v12x` version 0.3, reexport it, and implements requirement for it
  - i2s module don't reuse marker from spi module and define its own.
  - `i2s-audio-out` example updated and now use pcm5102 dac module instead one from discovery board.

Cargo.toml

@@ -33,7 +33,7 @@ cortex-m = "0.7.4"
 cortex-m-rt = "0.7"
 nb = "1"
 rand_core = "0.6"
-stm32f4 = "0.14.0"
+stm32f4 = "0.15.1"
 synopsys-usb-otg = { version = "0.3.0", features = ["cortex-m"], optional = true }
 sdio-host = { version = "0.6.0", optional = true }
 embedded-dma = "0.2.0"

examples/blinky-timer-irq.rs

@@ -58,7 +58,7 @@ fn TIM2() {
         })
     });
 
-    let _ = led.toggle();
+    led.toggle();
     let _ = tim.wait();
 }
 
@@ -72,7 +72,7 @@ fn main() -> ! {
     // Configure PA5 pin to blink LED
     let gpioa = dp.GPIOA.split();
     let mut led = gpioa.pa5.into_push_pull_output();
-    let _ = led.set_high(); // Turn off
+    led.set_high(); // Turn off
 
     // Move the pin into our global storage
     cortex_m::interrupt::free(|cs| *G_LED.borrow(cs).borrow_mut() = Some(led));

src/adc.rs

@@ -836,10 +836,24 @@ macro_rules! adc {
                 /// Sets which external trigger to use and if it is disabled, rising, falling or both
                 pub fn set_external_trigger(&mut self, (edge, extsel): (config::TriggerMode, config::ExternalTrigger)) {
                     self.config.external_trigger = (edge, extsel);
+                    #[cfg(any(
+                        feature = "stm32f401",
+                        feature = "stm32f410",
+                        feature = "stm32f411",
+                    ))] // TODO: fix pac
                     self.adc_reg.cr2.modify(|_, w| unsafe { w
                         .extsel().bits(extsel.into())
                         .exten().bits(edge.into())
                     });
+                    #[cfg(not(any(
+                        feature = "stm32f401",
+                        feature = "stm32f410",
+                        feature = "stm32f411",
+                    )))]
+                    self.adc_reg.cr2.modify(|_, w| w
+                        .extsel().bits(extsel.into())
+                        .exten().bits(edge.into())
+                    );
                 }
 
                 /// Enables and disables continuous mode

src/crc32.rs

@@ -47,7 +47,7 @@ impl Crc32 {
     pub fn update(&mut self, data: &[u32]) -> u32 {
         // Feed each word into the engine
         for word in data {
-            self.periph.dr.write(|w| unsafe { w.bits(*word) });
+            self.periph.dr.write(|w| w.bits(*word));
         }
         // Retrieve the resulting CRC
         self.periph.dr.read().bits()
@@ -112,7 +112,7 @@ impl Crc32 {
             scratch[..remainder.len()].copy_from_slice(remainder);
             self.periph
                 .dr
-                .write(|w| unsafe { w.bits(u32::from_ne_bytes(scratch)) });
+                .write(|w| w.bits(u32::from_ne_bytes(scratch)));
         }
 
         self.periph.dr.read().bits()

src/dma/traits.rs

@@ -245,7 +245,6 @@ impl MonoTimer {
         dwt.enable_cycle_counter();
 
         // now the CYCCNT counter can't be stopped or reset
-        drop(dwt);
 
         MonoTimer {
             frequency: clocks.hclk(),

src/dwt.rs

@@ -99,10 +99,7 @@ macro_rules! hal {
                             .cc2p()
                             .clear_bit()
                     });
-                    #[cfg(not(feature = "stm32f410"))]
                     self.smcr.write(|w| w.sms().encoder_mode_3());
-                    #[cfg(feature = "stm32f410")]
-                    self.smcr.write(|w| unsafe { w.sms().bits(3) });
                     self.set_auto_reload(<$TIM as General>::Width::MAX as u32).unwrap();
                     self.cr1.write(|w| w.cen().set_bit());
                 }