guangzong/stm32-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
Adin Ackerman 2024-01-30 15:58:05 -08:00
commit 78fba3e52c
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -97,7 +97,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chiptool" name = "chiptool"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/embassy-rs/chiptool?rev=67c6adc50306696e664ba5f71cd4db9d6dd9c46b#67c6adc50306696e664ba5f71cd4db9d6dd9c46b" source = "git+https://github.com/embassy-rs/chiptool?rev=02386dc0f5cc9fc24ab6278054f05755266af59e#02386dc0f5cc9fc24ab6278054f05755266af59e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -711,8 +711,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]] [[package]]
name = "svd-parser" name = "svd-parser"
version = "0.14.5" version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Dirbaio/svd.git?rev=43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf#43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf"
checksum = "3d17a2c2ef5aa450e80d714232a5932e7d8a39cac092e9e9ef8411bc833de3c4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"roxmltree", "roxmltree",
@ -723,8 +722,7 @@ dependencies = [
[[package]] [[package]]
name = "svd-rs" name = "svd-rs"
version = "0.14.7" version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Dirbaio/svd.git?rev=43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf#43f95cec2f7ec987c6e7e2c3613bcbb8d4f9efdf"
checksum = "1c82f375efa1d0145467e6cc98fa0e4e1a3f3d497cece4bcdda247f4904a77d4"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"regex", "regex",

2
stm32-data-gen/Cargo.toml
View File

@ -17,7 +17,7 @@ quick-xml = { version = "0.26.0", features = ["serialize"] }
regex = "1.7.1" regex = "1.7.1"
serde = { version = "1.0.157", features = ["derive"] } serde = { version = "1.0.157", features = ["derive"] }
serde_yaml = "0.9.19" serde_yaml = "0.9.19"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "67c6adc50306696e664ba5f71cd4db9d6dd9c46b" } chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "02386dc0f5cc9fc24ab6278054f05755266af59e" }
serde_json = "1.0.94" serde_json = "1.0.94"
rayon = { version = "1.7.0", optional = true } rayon = { version = "1.7.0", optional = true }
stm32-data-serde = { version = "0.1.0", path = "../stm32-data-serde" } stm32-data-serde = { version = "0.1.0", path = "../stm32-data-serde" }

3
stm32-data-gen/src/chips.rs
View File

@ -401,8 +401,7 @@ impl PeriMatcher {
("STM32F107.*:ETH:.*", ("eth", "v1a", "ETH")), ("STM32F107.*:ETH:.*", ("eth", "v1a", "ETH")),
("STM32F[24].*:ETH:.*", ("eth", "v1b", "ETH")), ("STM32F[24].*:ETH:.*", ("eth", "v1b", "ETH")),
("STM32F7.*:ETH:.*", ("eth", "v1c", "ETH")), ("STM32F7.*:ETH:.*", ("eth", "v1c", "ETH")),
(".*ETH:ethermac110_v3_0", ("eth", "v2", "ETH")), ("STM32H.*:ETH:.*", ("eth", "v2", "ETH")),
(".*ETH:ethermac110_v3_0_1", ("eth", "v2", "ETH")),
("STM32F4[23][79].*:FMC:.*", ("fmc", "v1x3", "FMC")), ("STM32F4[23][79].*:FMC:.*", ("fmc", "v1x3", "FMC")),
("STM32F446.*:FMC:.*", ("fmc", "v2x1", "FMC")), ("STM32F446.*:FMC:.*", ("fmc", "v2x1", "FMC")),
("STM32F469.*:FMC:.*", ("fmc", "v2x1", "FMC")), ("STM32F469.*:FMC:.*", ("fmc", "v2x1", "FMC")),

2
stm32-metapac-gen/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies] [dependencies]
regex = "1.7.1" regex = "1.7.1"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "67c6adc50306696e664ba5f71cd4db9d6dd9c46b" } chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "02386dc0f5cc9fc24ab6278054f05755266af59e" }
serde = { version = "1.0.157", features = [ "derive" ] } serde = { version = "1.0.157", features = [ "derive" ] }
serde_json = "1.0.94" serde_json = "1.0.94"
proc-macro2 = "1.0.52" proc-macro2 = "1.0.52"