Merge branch 'stm32-rs:master' into master

Author: zyma98

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+ - move gpio, dma impls, adc pins in subdir, remove unused `From` impls [#658] [#664]
+ - Bump `embedded-hal` to `1.0.0-alpha.10`. See [their changelog][embedded-hal-1.0.0-alpha.10] for further details. Note that this included breaking changes to the previous alpha APIs. [#663]
+
+[#658]: https://github.com/stm32-rs/stm32f4xx-hal/pull/658
+[#663]: https://github.com/stm32-rs/stm32f4xx-hal/pull/663
+[#664]: https://github.com/stm32-rs/stm32f4xx-hal/pull/664
+[embedded-hal-1.0.0-alpha.10]: https://github.com/rust-embedded/embedded-hal/blob/v1.0.0-alpha.10/embedded-hal/CHANGELOG.md
+
 ## [v0.16.2] - 2023-06-27
 
 ### Changed

Cargo.toml

@@ -40,6 +40,7 @@ embedded-dma = "0.2.0"
 bare-metal = { version = "1" }
 void = { default-features = false, version = "1.0.2" }
 embedded-hal = { features = ["unproven"], version = "0.2.7" }
+embedded-hal-nb = "1.0.0-alpha.2"
 display-interface = { version = "0.4.1", optional = true }
 fugit = "0.3.6"
 fugit-timer = "0.1.3"
@@ -53,7 +54,7 @@ version = "0.3.14"
 default-features = false
 
 [dependencies.embedded-hal-one]
-version = "=1.0.0-alpha.8"
+version = "=1.0.0-alpha.10"
 package = "embedded-hal"
 
 [dependencies.stm32_i2s_v12x]
@@ -99,20 +100,20 @@ rt = [] # deprecated
 stm32f401 = ["stm32f4/stm32f401", "device-selected", "gpio-f401",]
 stm32f405 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
 stm32f407 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
-stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
-stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
+stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417", "cryp"]
+stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417", "cryp"]
 stm32f410 = ["stm32f4/stm32f410", "device-selected", "gpio-f410"]
 stm32f411 = ["stm32f4/stm32f411", "device-selected", "gpio-f411"]
 stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412"]
 stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
-stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
+stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413", "aes"]
 stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
 stm32f429 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
-stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
-stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
+stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc", "cryp"]
+stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc", "cryp"]
 stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446"]
 stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
-stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
+stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469", "cryp"]
 
 gpio-f401 = [
     "gpiod", "gpioe",
@@ -258,16 +259,20 @@ i2s = ["stm32_i2s_v12x"]
 fsmc_lcd = ["display-interface"]
 
 defmt = ["dep:defmt", "fugit/defmt", "nb/defmt-0-3"]
+dfsdm = []
+sai = []
 
 adc2 = []
 adc3 = []
+aes = []
 can1 = []
 can2 = []
 can3 = []
+cryp = []
 dac = []
 dcmi = []
-dfsdm1 = []
-dfsdm2 = []
+dfsdm1 = ["dfsdm"]
+dfsdm2 = ["dfsdm"]
 dsihost = []
 eth = []
 fmc = []
@@ -287,8 +292,8 @@ quadspi = []
 otg-fs = []
 otg-hs = []
 rng = []
-sai1 = []
-sai2 = []
+sai1 = ["sai"]
+sai2 = ["sai"]
 sdio = []
 spi3 = []
 spi4 = []

examples/rtc_alarm.rs

@@ -9,7 +9,7 @@ use panic_halt as _;
 use rtt_target::{rprintln, rtt_init_print};
 
 use crate::hal::prelude::*;
-use crate::hal::rtc::{Alarm, AlarmDay, Event, Rtc};
+use crate::hal::rtc::{Alarm, Event, Rtc};
 use cortex_m::interrupt::{free, Mutex};
 use time::{
     macros::{date, time},
@@ -40,7 +40,7 @@ fn main() -> ! {
         .unwrap();
 
     // Set alarm A for 1 minute
-    rtc.set_alarm(Alarm::AlarmA, AlarmDay::Date(today), time!(21:58:32))
+    rtc.set_alarm(Alarm::AlarmA, today, time!(21:58:32))
         .unwrap();
     rtc.enable_wakeup(8.secs());
     rtc.listen(&mut p.EXTI, Event::AlarmA);