Skip to content

Commit

Permalink
Merge branch 'main' into usart/inversion
Browse files Browse the repository at this point in the history
  • Loading branch information
maximeborges authored Dec 4, 2023
2 parents d11118d + 302953f commit 7ddccb2
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 76 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ If no microcontroller is specified, the crate will not compile.
* `stm32f722`
* `stm32f723`
* `stm32f730`
* `stm32f730-lpc` ("low pin count" variant)
* `stm32f732`
* `stm32f733`
* `stm32f745`
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl SubFamily {
SubFamily::Stm32f722
} else if cfg!(feature = "stm32f723") {
SubFamily::Stm32f723
} else if cfg!(feature = "stm32f730") {
} else if cfg!(feature = "stm32f730") || cfg!(feature = "stm32f730-lpc") {
SubFamily::Stm32f730
} else if cfg!(feature = "stm32f732") {
SubFamily::Stm32f732
Expand Down
2 changes: 1 addition & 1 deletion src/flash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl<'a> EraseSequence<'a> {
flash.check_locked_or_busy()?;
flash.clear_errors();

flash.registers.cr.modify(|_, w| unsafe {
flash.registers.cr.modify(|_, w| {
#[cfg(any(
feature = "stm32f765",
feature = "stm32f767",
Expand Down
5 changes: 4 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ compile_error!(
stm32f722
stm32f723
stm32f730
stm32f730-lpc
stm32f732
stm32f733
stm32f745
Expand All @@ -31,7 +32,7 @@ pub use stm32f7::stm32f7x2 as pac;
#[cfg(feature = "stm32f723")]
pub use stm32f7::stm32f7x3 as pac;

#[cfg(feature = "stm32f730")]
#[cfg(any(feature = "stm32f730", feature = "stm32f730-lpc"))]
pub use stm32f7::stm32f730 as pac;

#[cfg(feature = "stm32f732")]
Expand Down Expand Up @@ -95,6 +96,7 @@ pub mod dac;
feature = "stm32f722",
feature = "stm32f723",
feature = "stm32f730",
feature = "stm32f730-lpc",
feature = "stm32f732",
feature = "stm32f733",
feature = "stm32f746",
Expand All @@ -109,6 +111,7 @@ pub mod otg_fs;
feature = "stm32f722",
feature = "stm32f723",
feature = "stm32f730",
feature = "stm32f730-lpc",
feature = "stm32f732",
feature = "stm32f733",
feature = "stm32f746",
Expand Down
Loading

0 comments on commit 7ddccb2

Please sign in to comment.