Merge pull request #256 from stm32-rs/stm32l4-v0.14

korken89 · web-flow · commit 1a56cfdd7952 · 2021-10-08T06:10:44.000+02:00
Updated stm32l4 to v0.14
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,9 +21,9 @@ exclude = [
 edition = "2018"
 
 [dependencies]
-cortex-m = "0.6.3"
+cortex-m = "0.7"
 nb = "0.1.1"
-stm32l4 = "0.13.0"
+stm32l4 = "0.14.0"
 embedded-dma = "0.1"
 bxcan = ">=0.4, <0.6"
 
@@ -73,11 +73,15 @@ otg_fs = ["synopsys-usb-otg"]
 panic-halt = "0.2.0"
 panic-semihosting = "0.5.0"
 cortex-m-semihosting = "0.3.5"
-cortex-m-rt = "0.6.12"
+cortex-m-rt = "0.7"
 usb-device = "0.2.3"
 usbd-serial = "0.1.0"
 heapless = "0.5"
-cortex-m-rtic = "0.5.5"
+
+[dev-dependencies.cortex-m-rtic]
+version = "0.5.9"
+default-features = false
+features = ["cortex-m-7"]
 
 [dev-dependencies.panic-rtt-target]
 version  = "0.1.1"
diff --git a/examples/blinky.rs b/examples/blinky.rs
@@ -1,7 +1,5 @@
 //! Blinks an LED
 
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_std]
 #![no_main]
 
@@ -62,6 +60,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/i2c_write.rs b/examples/i2c_write.rs
@@ -1,7 +1,5 @@
 //! Blinks an LED
 
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_std]
 #![no_main]
 
@@ -84,6 +82,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/pll_config.rs b/examples/pll_config.rs
@@ -1,7 +1,6 @@
 //! Test the serial interface
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
 #![deny(warnings)]
 #![no_main]
 #![no_std]
@@ -84,6 +83,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/qspi.rs b/examples/qspi.rs
@@ -1,8 +1,6 @@
 //! Test the Quad SPI interface
 //!
 //! The example wirtes a command over the QSPI interfaces and recives a 3 byte response.
-// #![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -94,6 +92,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/rtc.rs b/examples/rtc.rs
@@ -1,7 +1,5 @@
 //! Blinks an LED
 
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_std]
 #![no_main]
 
@@ -73,6 +71,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/rtc_alarm.rs b/examples/rtc_alarm.rs
@@ -91,6 +91,6 @@ fn RTC_WKUP() {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial.rs b/examples/serial.rs
@@ -1,7 +1,6 @@
 //! Test the serial interface
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
 #![deny(warnings)]
 #![no_main]
 #![no_std]
@@ -87,6 +86,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial_dma.rs b/examples/serial_dma.rs
@@ -1,8 +1,6 @@
 //! Test the serial interface with the DMA engine
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -146,6 +144,6 @@ fn send(tx: &mut impl embedded_hal::serial::Write<u8>, data: &[u8]) {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial_dma_us2.rs b/examples/serial_dma_us2.rs
@@ -1,8 +1,6 @@
 //! Test the serial interface with the DMA engine
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -91,6 +89,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial_half_duplex.rs b/examples/serial_half_duplex.rs
@@ -3,7 +3,6 @@
 //! This example requires you to hook-up a pullup resistor on the TX pin. RX pin is not used.
 //! Resistor value depends on the baurate and line caracteristics, 1KOhms works well in most cases.
 //! Half-Duplex mode internally connect TX to RX, meaning that bytes sent will also be received.
-#![deny(unsafe_code)]
 #![deny(warnings)]
 #![no_main]
 #![no_std]
@@ -83,6 +82,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial_hw_flow.rs b/examples/serial_hw_flow.rs
@@ -1,7 +1,6 @@
 //! Test the serial interface
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
 #![deny(warnings)]
 #![no_main]
 #![no_std]
@@ -94,6 +93,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/serial_vcom.rs b/examples/serial_vcom.rs
@@ -1,7 +1,5 @@
 //! Test the serial interface
 //!
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -85,6 +83,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/spi_slave.rs b/examples/spi_slave.rs
@@ -1,6 +1,4 @@
 //! Interfacing the on-board L3GD20 (gyroscope)
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -72,6 +70,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/spi_write.rs b/examples/spi_write.rs
@@ -1,6 +1,4 @@
 //! Interfacing the on-board L3GD20 (gyroscope)
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -94,6 +92,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/timer.rs b/examples/timer.rs
@@ -1,7 +1,5 @@
 //! Blinks an LED
 
-// #![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_std]
 #![no_main]
 
@@ -58,6 +56,6 @@ fn TIM7() {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/touch.rs b/examples/touch.rs
@@ -1,8 +1,6 @@
 //! Test the serial interface
 //!
 //! This example requires you to short (connect) the TX and RX pins.
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_main]
 #![no_std]
 
@@ -70,6 +68,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/examples/watchdog.rs b/examples/watchdog.rs
@@ -1,6 +1,4 @@
 //! Example of watchdog timer
-#![deny(unsafe_code)]
-// #![deny(warnings)]
 #![no_std]
 #![no_main]
 
@@ -57,6 +55,6 @@ fn main() -> ! {
 }
 
 #[exception]
-fn HardFault(ef: &ExceptionFrame) -> ! {
+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {
     panic!("{:#?}", ef);
 }
diff --git a/src/adc.rs b/src/adc.rs
@@ -333,42 +333,21 @@ impl ADC {
 
     /// Get the configured sequence length (= `actual sequence length - 1`)
     pub(crate) fn get_sequence_length(&self) -> u8 {
-        #[cfg(not(feature = "stm32l4x6"))]
-        {
-            self.adc.sqr1.read().l3().bits()
-        }
-        #[cfg(feature = "stm32l4x6")]
-        {
-            self.adc.sqr1.read().l().bits()
-        }
+        self.adc.sqr1.read().l().bits()
     }
 
     /// Private: length must be `actual sequence length - 1`, so not API-friendly.
     /// Use [`ADC::reset_sequence`] and [`ADC::configure_sequence`] instead
     fn set_sequence_length(&mut self, length: u8) {
-        #[cfg(not(feature = "stm32l4x6"))]
-        {
-            self.adc.sqr1.modify(|_, w| unsafe { w.l3().bits(length) });
-        }
-        #[cfg(feature = "stm32l4x6")]
-        {
-            self.adc.sqr1.modify(|_, w| unsafe { w.l().bits(length) });
-        }
+        self.adc.sqr1.modify(|_, w| unsafe { w.l().bits(length) });
     }
 
     /// Reset the sequence length to 1
     ///
     /// Does *not* erase previously configured sequence settings, only
     /// changes the sequence length
     pub fn reset_sequence(&mut self) {
-        #[cfg(not(feature = "stm32l4x6"))]
-        {
-            self.adc.sqr1.modify(|_, w| unsafe { w.l3().bits(0b0000) })
-        }
-        #[cfg(feature = "stm32l4x6")]
-        {
-            self.adc.sqr1.modify(|_, w| unsafe { w.l().bits(0b0000) })
-        }
+        self.adc.sqr1.modify(|_, w| unsafe { w.l().bits(0b0000) })
     }
 
     pub fn has_completed_conversion(&self) -> bool {
diff --git a/src/pwm.rs b/src/pwm.rs
diff --git a/src/spi.rs b/src/spi.rs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`//! Blinks an LED`
`2`	`2`
`3`		`-#![deny(unsafe_code)]`
`4`		`-// #![deny(warnings)]`
`5`	`3`	`#![no_std]`
`6`	`4`	`#![no_main]`
`7`	`5`
`@@ -62,6 +60,6 @@ fn main() -> ! {`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`#[exception]`
`65`		`-fn HardFault(ef: &ExceptionFrame) -> ! {`
	`63`	`+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {`
`66`	`64`	`panic!("{:#?}", ef);`
`67`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`//! Test the serial interface`
`2`	`2`	`//!`
`3`	`3`	`//! This example requires you to short (connect) the TX and RX pins.`
`4`		`-#![deny(unsafe_code)]`
`5`	`4`	`#![deny(warnings)]`
`6`	`5`	`#![no_main]`
`7`	`6`	`#![no_std]`
`@@ -84,6 +83,6 @@ fn main() -> ! {`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`#[exception]`
`87`		`-fn HardFault(ef: &ExceptionFrame) -> ! {`
	`86`	`+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {`
`88`	`87`	`panic!("{:#?}", ef);`
`89`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`//! Test the Quad SPI interface`
`2`	`2`	`//!`
`3`	`3`	`//! The example wirtes a command over the QSPI interfaces and recives a 3 byte response.`
`4`		`-// #![deny(unsafe_code)]`
`5`		`-// #![deny(warnings)]`
`6`	`4`	`#![no_main]`
`7`	`5`	`#![no_std]`
`8`	`6`
`@@ -94,6 +92,6 @@ fn main() -> ! {`
`94`	`92`	`}`
`95`	`93`
`96`	`94`	`#[exception]`
`97`		`-fn HardFault(ef: &ExceptionFrame) -> ! {`
	`95`	`+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {`
`98`	`96`	`panic!("{:#?}", ef);`
`99`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,6 @@ fn RTC_WKUP() {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`#[exception]`
`94`		`-fn HardFault(ef: &ExceptionFrame) -> ! {`
	`94`	`+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {`
`95`	`95`	`panic!("{:#?}", ef);`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`//! Test the serial interface with the DMA engine`
`2`	`2`	`//!`
`3`	`3`	`//! This example requires you to short (connect) the TX and RX pins.`
`4`		`-#![deny(unsafe_code)]`
`5`		`-// #![deny(warnings)]`
`6`	`4`	`#![no_main]`
`7`	`5`	`#![no_std]`
`8`	`6`
`@@ -146,6 +144,6 @@ fn send(tx: &mut impl embedded_hal::serial::Write<u8>, data: &[u8]) {`
`146`	`144`	`}`
`147`	`145`
`148`	`146`	`#[exception]`
`149`		`-fn HardFault(ef: &ExceptionFrame) -> ! {`
	`147`	`+unsafe fn HardFault(ef: &ExceptionFrame) -> ! {`
`150`	`148`	`panic!("{:#?}", ef);`
`151`	`149`	`}`