Sync upstream, update LPUART implementation.

Author: romixlab

.cargo/config

@@ -27,7 +27,5 @@ rustflags = [
 
 [build]
 # Pick ONE of these compilation targets
-# target = "thumbv6m-none-eabi"    # Cortex-M0 and Cortex-M0+
-# target = "thumbv7m-none-eabi"    # Cortex-M3
-target = "thumbv7em-none-eabi"   # Cortex-M4 and Cortex-M7 (no FPU)
-# target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
+# target = "thumbv7em-none-eabi"   # Cortex-M4 and Cortex-M7 (no FPU)
+target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 
 name: Continuous integration
@@ -9,15 +9,56 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     strategy:
-      matrix:                   # All permutations of {rust, mcu}
+      matrix: # All permutations of {rust, mcu}
+        rust:
+          - stable
+        mcu: # Note leading comma is required if any additional fetures are specified
+          - { id: stm32l412, additional-features: ",stm32-usbd" }
+          - { id: stm32l422, additional-features: ",stm32-usbd" }
+          - { id: stm32l431, additional-features: "" }
+          - { id: stm32l432, additional-features: ",stm32-usbd" }
+          - { id: stm32l433, additional-features: ",stm32-usbd" }
+          - { id: stm32l442, additional-features: ",stm32-usbd" }
+          - { id: stm32l443, additional-features: ",stm32-usbd" }
+          - { id: stm32l451, additional-features: "" }
+          - { id: stm32l452, additional-features: ",stm32-usbd" }
+          - { id: stm32l462, additional-features: ",stm32-usbd" }
+          - { id: stm32l471, additional-features: "" }
+          - { id: stm32l475, additional-features: "" } # USB_OTG not supported by PAC
+          - { id: stm32l476, additional-features: ",otg_fs" }
+          - { id: stm32l486, additional-features: ",otg_fs" }
+          - { id: stm32l496, additional-features: ",otg_fs" }
+          - { id: stm32l4a6, additional-features: ",otg_fs" }
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          target: thumbv7em-none-eabihf
+          override: true
+      - name: build
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --verbose --release --examples --target thumbv7em-none-eabihf --features rt,unproven,${{ matrix.mcu.id }}${{ matrix.mcu.additional-features }}
+      - name: test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --lib --target x86_64-unknown-linux-gnu --features rt,unproven,${{ matrix.mcu.id }}${{ matrix.mcu.additional-features }}
+
+  ci-r9:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
         rust:
           - stable
         mcu:
-          - stm32l4x1
-          - stm32l4x2
-          - stm32l4x3
-          - stm32l4x5
-          - stm32l4x6
+          - { id: stm32l4r9, additional-features: "" }
+          - { id: stm32l4s9, additional-features: "" }
 
     steps:
       - uses: actions/checkout@v2
@@ -27,12 +68,15 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: thumbv7em-none-eabihf
           override: true
-      - uses: actions-rs/cargo@v1
+      - name: build
+        uses: actions-rs/cargo@v1
         with:
           use-cross: true
           command: build
-          args: --verbose --release --examples --target thumbv7em-none-eabihf --features rt,unproven,${{ matrix.mcu }}
-      - uses: actions-rs/cargo@v1
+          args: --verbose --release --target thumbv7em-none-eabihf --features rt,unproven,${{ matrix.mcu.id }}${{ matrix.mcu.additional-features }}
+      # note that examples were not built
+      - name: test
+        uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --lib --target x86_64-unknown-linux-gnu --features rt,unproven,${{ matrix.mcu }}
+          args: --lib --target x86_64-unknown-linux-gnu --features rt,unproven,${{ matrix.mcu.id }}${{ matrix.mcu.additional-features }}

.github/workflows/clippy.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --examples --target thumbv7em-none-eabihf --features=stm32l4x2,rt,unproven
+          args: --examples --target thumbv7em-none-eabihf --features=stm32l432,rt,unproven

CHANGELOG.md

@@ -3,7 +3,63 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+
+## [v0.7.1] - 2022-04-11
+
+### Fixed
+
+    - Shorten old buffer when we have extra characters in DMA buffer after a character match.
+## [v0.7.0] - 2022-04-04
+
+### Added
+
+    - Add delay implementation based on `cortex_m::asm::delay`.
+    - Implement `RngCore` and `CryptoRng` for the hardware RNG.
+    - Support analog to digital converters (ADC).
+    - Support SPI slave mode.
+    - Add DMA and interrupt support for SPI and ADC peripherals.
+    - Add support for measuring Vref, Vbat and temperature.
+    - Add alternate function 0 to GPIO.
+    - Add preliminary bxCAN support.
+    - Add more GPIO combinations for I2C and PWM peripherals.
+    - Add wakeup clock sources to RTC config.
+    - Support RTC domain backup registers.
+    - Support I2C on stm32l4x3 devices.
+    - Support I2C3 peripheral on stm32l4x6 devices.
+    - Experimental support for the Synopsis USB library.
+    - Experimental support for USB OTG FS for stm32l4x5 and stm32l4x6 devices.
+    - Support stm32l4r9 devices.
+
+### Changed
+
+    - Use device-specific features rather than by-peripheral features.
+    - Use `fugit` duration nd rate units instead of custom
+    - Use const-generics for GPIO (require Rust 1.51)
+    - Import I2C implementation from `stm32h7xx-hal` crate.
+    - Use a `Config` struct for initializing I2C peripherals.
+    - Check that the clock requested for the low-power timer is enabled.
+    - Take `clocks` argument by value when setting up low-power timer.
+    - Use sane low-power timer defaults (LSI, no prescaler).
+    - Make `LowPowerTimer<_>::set_autoreload()` public.
+    - Enable SPI2 for all stm32l4x2 devices as some of them have it.
+    - Target hardfp by default since stm32l4 cores are Cortex-M4F.
+    - Require typed input when converting from milliseconds to hertz.
+    - Rework alternate function typestates.
+    - Use MSI as default/fallback clock source for SYSCLK.
+    - Use specialized PAC for stm32l412 and stm32l422 devices.
+    - Add `toggeable` trait to GPIO pins.
+    - Update `stm32l4` dependency.
+
+### Fixed
+
+    - Fix TIM1 PWM frequency computation.
+    - Fix TIM5 counter width.
+    - Fix PSC computation off-by-one error.
+    - Change wait states values according to datasheet.
+    - Fix incorrect I2C2 on PC0/PC1 on stm32l4x3 devices.
+    - Swap QSPI pins and remove conflicting/wrong implementations.
+    - Add power on GPIOG pins.
+    - Support 0 byte writes on I2C.
 
 ## [v0.6.0] - 2020-12-11
 
@@ -192,7 +248,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[Unreleased]: https://github.com/stm32-rs/stm32l4xx-hal/compare/v0.6.0...HEAD
+[v0.7.0]: https://github.com/stm32-rs/stm32l4xx-hal/compare/v0.6.0...v0.7.0
 [v0.6.0]: https://github.com/stm32-rs/stm32l4xx-hal/compare/v0.5.0...v0.6.0
 [v0.5.0]: https://github.com/stm32-rs/stm32l4xx-hal/compare/v0.4.0...v0.5.0
 [v0.4.0]: https://github.com/stm32-rs/stm32l4xx-hal/compare/v0.3.6...v0.4.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stm32l4xx-hal"
-version = "0.6.0"
+version = "0.7.1"
 authors = ["Scott Mabin <[email protected]>"]
 description = "Hardware abstraction layer for the stm32l4xx chips"
 keywords = ["no-std", "stm32l4xx", "stm32l4", "embedded", "embedded-hal"]
@@ -21,9 +21,13 @@ 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.7"
+fugit = "0.3.5"
+bitfield = "0.13.2"
 
 [dependencies.rand_core]
 version = "0.6.2"
@@ -42,7 +46,7 @@ default-features = false
 version = "1.1"
 
 [dependencies.embedded-hal]
-version = "0.2.3"
+version = "0.2.6"
 features = ["unproven"]
 
 [dependencies.stm32-usbd]
@@ -54,28 +58,73 @@ version = "0.2.4"
 features = ["cortex-m", "fs"]
 optional = true
 
+[dependencies.time]
+version = "0.3"
+default-features = false
+
 [package.metadata.docs.rs]
-features = ["rt", "stm32l4x2", "stm32-usbd"]
+features = ["rt", "stm32l432", "stm32-usbd"]
 
 [features]
 rt = ["stm32l4/rt"]
-stm32l4x1 = ["stm32l4/stm32l4x1"]
-stm32l4x2 = ["stm32l4/stm32l4x2"]
-stm32l4x3 = ["stm32l4/stm32l4x3"]
-stm32l4x5 = ["stm32l4/stm32l4x5"]
-stm32l4x6 = ["stm32l4/stm32l4x6"]
 unproven = ["embedded-hal/unproven"]
 otg_fs = ["synopsys-usb-otg"]
 
+# L4x1
+stm32l431 = [ "stm32l4/stm32l4x1" ]
+stm32l451 = [ "stm32l4/stm32l4x1" ]
+stm32l471 = [ "stm32l4/stm32l4x1" ]
+
+# L412
+stm32l412 = [ "stm32l4/stm32l412" ]
+stm32l422 = [ "stm32l4/stm32l412" ]
+
+# L4x2
+stm32l432 = [ "stm32l4/stm32l4x2" ]
+stm32l442 = [ "stm32l4/stm32l4x2" ]
+stm32l452 = [ "stm32l4/stm32l4x2" ]
+stm32l462 = [ "stm32l4/stm32l4x2" ]
+
+# L4x3
+stm32l433 = [ "stm32l4/stm32l4x3" ]
+stm32l443 = [ "stm32l4/stm32l4x3" ]
+
+# L4x5
+stm32l475 = [ "stm32l4/stm32l4x5" ]
+
+# L4x6
+stm32l476 = [ "stm32l4/stm32l4x6" ]
+stm32l486 = [ "stm32l4/stm32l4x6" ]
+stm32l496 = [ "stm32l4/stm32l4x6" ]
+stm32l4a6 = [ "stm32l4/stm32l4x6" ]
+
+# L4+ series PAC support??
+#stm32l4p5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4q5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4r5 = [ "stm32l4/stm32l4x5" ]
+#stm32l4s5 = [ "stm32l4/stm32l4x5" ]
+
+# L4x7
+#stm32l4r7 = [ "stm32l4/stm32l4x7" ]
+#stm32l4s7 = [ "stm32l4/stm32l4x7" ]
+
+## L4x9
+stm32l4r9 = [ "stm32l4/stm32l4r9" ] # PAC has an L4r9 specific variation
+stm32l4s9 = [ "stm32l4/stm32l4r9" ]
+
 [dev-dependencies]
 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"
@@ -97,15 +146,19 @@ lto = true
 
 [[example]]
 name = "adc"
-required-features = ["rt", "stm32l4x3"]
+required-features = ["rt"]
+
+[[example]]
+name = "can-loopback"
+required-features = ["rt", "stm32l433" ] # CAN peripheral on ever series except L41/L42, gate so CI will pass
 
 [[example]]
 name = "irq_button"
 required-features = ["rt"]
 
 [[example]]
 name = "qspi"
-required-features = ["rt", "stm32l4x5"]
+required-features = ["rt", "stm32l476"] # L433/43 have no QSPI peripheral and are highly likely to be used
 
 [[example]]
 name = "rng"
@@ -117,25 +170,36 @@ required-features = ["rt"]
 
 [[example]]
 name = "rtic_frame_serial_dma"
-required-features = ["rt", "stm32l4x2"]
+required-features = ["rt"]
+
+[[example]]
+name = "spi_dma_rxtx"
+required-features = ["rt"]
 
 [[example]]
 name = "serial_echo_rtic"
-required-features = ["rt", "stm32l4x3"]
+required-features = ["rt"]
 
 [[example]]
 name = "timer"
 required-features = ["rt"]
 
 [[example]]
 name = "usb_serial"
-required-features = ["rt", "stm32l4x2", "stm32-usbd"]
+required-features = ["rt", "stm32-usbd"]
 
 [[example]]
 name = "otg_fs_serial"
-required-features = ["rt", "stm32l4x6", "otg_fs"]
+required-features = ["rt", "otg_fs"]
 
 [[example]]
 name = "i2c_write"
-required-features = ["stm32l4x1"]
+required-features = ["stm32l433"]
+
+[[example]]
+name = "lptim_rtic"
+required-features = ["rt"]
 
+[[example]]
+name = "adc_dma"
+required-features = ["rt"]

README.md

@@ -14,7 +14,7 @@ _formerly [MabezDev/stm32l4xx-hal](https://github.com/mabezdev/stm32l4xx-hal)_
 
 ## About
 
-    - Minimum rustc version 1.31
+    - Minimum rustc version 1.51
 
 ## License
 

examples/adc.rs

@@ -5,7 +5,12 @@ use panic_rtt_target as _;
 
 use cortex_m_rt::entry;
 use rtt_target::{rprint, rprintln};
-use stm32l4xx_hal::{adc::ADC, delay::Delay, pac, prelude::*};
+use stm32l4xx_hal::{
+    adc::{Adc, AdcCommon},
+    delay::Delay,
+    pac,
+    prelude::*,
+};
 
 #[entry]
 fn main() -> ! {
@@ -22,13 +27,8 @@ fn main() -> ! {
     let clocks = rcc.cfgr.freeze(&mut flash.acr, &mut pwr);
 
     let mut delay = Delay::new(cp.SYST, clocks);
-    let mut adc = ADC::new(
-        dp.ADC1,
-        dp.ADC_COMMON,
-        &mut rcc.ahb2,
-        &mut rcc.ccipr,
-        &mut delay,
-    );
+    let adc_common = AdcCommon::new(dp.ADC_COMMON, &mut rcc.ahb2);
+    let mut adc = Adc::adc1(dp.ADC1, adc_common, &mut rcc.ccipr, &mut delay);
 
     let mut gpioc = dp.GPIOC.split(&mut rcc.ahb2);
     let mut a1 = gpioc.pc0.into_analog(&mut gpioc.moder, &mut gpioc.pupdr);