aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-08-10 15:45:21 +0000
committerGitHub <[email protected]>2023-08-10 15:45:21 +0000
commit3b43b00867d47105b94eef9eff118f406b0884de (patch)
treec83df1303cd624c7c5aa9a90e4cd703844a40a5e
parent95262ad5593bd421fc0a79f55bd48f7beb4bb1c9 (diff)
parentc3128846923718d94921617776008c1eadcd4fec (diff)
Merge pull request #1762 from dreilly1982/adc-f3-build-rs-updates
don't generate adc peripheral for f3 series
-rw-r--r--.vscode/settings.json1
-rw-r--r--embassy-stm32/Cargo.toml4
-rw-r--r--embassy-stm32/build.rs6
3 files changed, 8 insertions, 3 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 29e8812e3..139b432f4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -41,4 +41,5 @@
41 // "examples/stm32wl/Cargo.toml", 41 // "examples/stm32wl/Cargo.toml",
42 // "examples/wasm/Cargo.toml", 42 // "examples/wasm/Cargo.toml",
43 ], 43 ],
44 "rust-analyzer.showUnlinkedFileNotification": false,
44} \ No newline at end of file 45} \ No newline at end of file
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 0d713f60d..8f765e9d3 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -57,7 +57,7 @@ sdio-host = "0.5.0"
57embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } 57embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true }
58critical-section = "1.1" 58critical-section = "1.1"
59atomic-polyfill = "1.0.1" 59atomic-polyfill = "1.0.1"
60stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-82a24863823a3daf0ca664c7fdf008379d0a0d42" } 60stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7eddb78e705905af4c1dd2359900db3e78a3c500" }
61vcell = "0.1.3" 61vcell = "0.1.3"
62bxcan = "0.7.0" 62bxcan = "0.7.0"
63nb = "1.0.0" 63nb = "1.0.0"
@@ -76,7 +76,7 @@ critical-section = { version = "1.1", features = ["std"] }
76[build-dependencies] 76[build-dependencies]
77proc-macro2 = "1.0.36" 77proc-macro2 = "1.0.36"
78quote = "1.0.15" 78quote = "1.0.15"
79stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-82a24863823a3daf0ca664c7fdf008379d0a0d42", default-features = false, features = ["metadata"]} 79stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-7eddb78e705905af4c1dd2359900db3e78a3c500", default-features = false, features = ["metadata"]}
80 80
81[features] 81[features]
82default = ["rt"] 82default = ["rt"]
diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs
index 30e25aefd..8a731620f 100644
--- a/embassy-stm32/build.rs
+++ b/embassy-stm32/build.rs
@@ -310,7 +310,11 @@ fn main() {
310 310
311 for p in METADATA.peripherals { 311 for p in METADATA.peripherals {
312 // generating RccPeripheral impl for H7 ADC3 would result in bad frequency 312 // generating RccPeripheral impl for H7 ADC3 would result in bad frequency
313 if !singletons.contains(&p.name.to_string()) || (p.name == "ADC3" && METADATA.line.starts_with("STM32H7")) { 313 if !singletons.contains(&p.name.to_string())
314 || (p.name == "ADC3" && METADATA.line.starts_with("STM32H7"))
315 || (p.name.starts_with("ADC") && p.registers.as_ref().map_or(false, |r| r.version == "f3"))
316 || (p.name.starts_with("ADC") && p.registers.as_ref().map_or(false, |r| r.version == "v4"))
317 {
314 continue; 318 continue;
315 } 319 }
316 320