Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial WB55 support. #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Initial WB55 support. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ check-all:
DRONE_RUSTFLAGS='--cfg cortex_m_core="cortex_m4f_r0p1" --cfg stm32_mcu="stm32l4s7"' drone env thumbv7em-none-eabihf -- cargo check --package drone-stm32-map --features "{{features}}"
DRONE_RUSTFLAGS='--cfg cortex_m_core="cortex_m4f_r0p1" --cfg stm32_mcu="stm32l4r9"' drone env thumbv7em-none-eabihf -- cargo check --package drone-stm32-map --features "{{features}}"
DRONE_RUSTFLAGS='--cfg cortex_m_core="cortex_m4f_r0p1" --cfg stm32_mcu="stm32l4s9"' drone env thumbv7em-none-eabihf -- cargo check --package drone-stm32-map --features "{{features}}"
DRONE_RUSTFLAGS='--cfg cortex_m_core="cortex_m4f_r0p1" --cfg stm32_mcu="stm32wbx5"' drone env thumbv7em-none-eabihf -- cargo check --package drone-stm32-map --features "{{features}}"

# Generate the docs
doc:
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ a drop-in replacement for it.
| `stm32l4s7` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) | `adc` `dma` `exti` `gpio` `i2c` `rtc` `spi` `tim` `uart` |
| `stm32l4r9` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) | `adc` `dma` `exti` `gpio` `i2c` `rtc` `spi` `tim` `uart` |
| `stm32l4s9` | ARM® Cortex®-M4F r0p1 | [RM0432](https://www.st.com/resource/en/reference_manual/dm00310109.pdf) | `adc` `dma` `exti` `gpio` `i2c` `rtc` `spi` `tim` `uart` |
| `stm32wbx5` | ARM® Cortex®-M4F r0p1 | [RM0434](https://www.st.com/resource/en/reference_manual/dm00318631.pdf) | |

`stm32_mcu` config flag should be set at the application level according to
this table.
Expand Down
12 changes: 8 additions & 4 deletions src/periph/gpio/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ periph! {
stm32_mcu = "stm32l4r9",
stm32_mcu = "stm32l4s5",
stm32_mcu = "stm32l4s7",
stm32_mcu = "stm32l4s9"
stm32_mcu = "stm32l4s9",
stm32_mcu = "stm32wbx5"
))]
BUSSMENR {
0x20 RwRegBitBand Shared;
Expand Down Expand Up @@ -82,7 +83,8 @@ periph! {
stm32_mcu = "stm32l4r9",
stm32_mcu = "stm32l4s5",
stm32_mcu = "stm32l4s7",
stm32_mcu = "stm32l4s9"
stm32_mcu = "stm32l4s9",
stm32_mcu = "stm32wbx5"
))]
AFRL {
0x20 RwReg;
Expand Down Expand Up @@ -117,7 +119,8 @@ periph! {
stm32_mcu = "stm32l4r9",
stm32_mcu = "stm32l4s5",
stm32_mcu = "stm32l4s7",
stm32_mcu = "stm32l4s9"
stm32_mcu = "stm32l4s9",
stm32_mcu = "stm32wbx5"
))]
AFRH {
0x20 RwReg;
Expand All @@ -132,7 +135,8 @@ periph! {
}
#[cfg(any(
stm32_mcu = "stm32l4x5",
stm32_mcu = "stm32l4x6"
stm32_mcu = "stm32l4x6",
stm32_mcu = "stm32wbx5"
))]
ASCR {
0x20 RwReg Option;
Expand Down
12 changes: 12 additions & 0 deletions svd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,16 @@ fn svd_deserialize() -> Result<Device> {
"stm32l4s5" => patch_stm32l4plus(parse_svd("STM32L4S5.svd")?),
"stm32l4s7" => patch_stm32l4plus(parse_svd("STM32L4S7.svd")?),
"stm32l4s9" => patch_stm32l4plus(parse_svd("STM32L4S9.svd")?),
"stm32wbx5" => patch_stm32wbx5(parse_svd("STM32WBxx_CM4.svd")?),
_ => bail!("invalid `stm32_mcu` cfg flag"),
}
}

fn patch_stm32wbx5(mut dev: Device) -> Result<Device> {
fix_802154(&mut dev)?;
Ok(dev)
}

fn patch_stm32f102(mut dev: Device) -> Result<Device> {
spi::fix_spi2_1(&mut dev)?;
Ok(dev)
Expand Down Expand Up @@ -199,6 +205,12 @@ fn patch_stm32f413(mut dev: Device) -> Result<Device> {
Ok(dev)
}

fn fix_802154(dev: &mut Device) -> Result<()> {
dev.periph("PWR").reg("SR1").field("802WUF").name = "IEEE802WUF".to_string();
dev.periph("PWR").reg("C2CR1").field("802EWKUP").name = "IEEE802EWKUP".to_string();
Ok(())
}

fn patch_stm32f427(mut dev: Device) -> Result<Device> {
rcc::fix_3(&mut dev)?;
dma::fix_dma2_1(&mut dev)?;
Expand Down
Loading