LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2247 from embassy-rs/update-embedded-storage

Browse Source 
update embedded-storage{,-async}, remove patch.
This commit is contained in:
Dario Nieuwenhuis 2023-12-04 13:57:03 +01:00 committed by GitHub
commit 2cba879afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cargo/config.toml
View File

@ -1,3 +0,0 @@
[patch.crates-io]
embedded-storage = { git = "https://github.com/rust-embedded-community/embedded-storage", rev = "634302740f8d676538c3890748e7d7dfe372a040" }
embedded-storage-async = { git = "https://github.com/rust-embedded-community/embedded-storage", rev = "634302740f8d676538c3890748e7d7dfe372a040" }

4
embassy-boot/boot/Cargo.toml
View File

@ -29,8 +29,8 @@ log = { version = "0.4", optional = true }
ed25519-dalek = { version = "1.0.1", default_features = false, features = ["u32_backend"], optional = true } ed25519-dalek = { version = "1.0.1", default_features = false, features = ["u32_backend"], optional = true }
embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" }
embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } embassy-sync = { version = "0.4.0", path = "../../embassy-sync" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true } salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true }
signature = { version = "1.6.4", default-features = false } signature = { version = "1.6.4", default-features = false }

4
embassy-boot/nrf/Cargo.toml
View File

@ -21,8 +21,8 @@ embassy-nrf = { path = "../../embassy-nrf" }
embassy-boot = { path = "../boot", default-features = false } embassy-boot = { path = "../boot", default-features = false }
cortex-m = { version = "0.7.6" } cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" } cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
cfg-if = "1.0.0" cfg-if = "1.0.0"
nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true } nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true }

4
embassy-boot/rp/Cargo.toml
View File

@ -24,8 +24,8 @@ embassy-time = { path = "../../embassy-time" }
cortex-m = { version = "0.7.6" } cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" } cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
cfg-if = "1.0.0" cfg-if = "1.0.0"
[features] [features]

4
embassy-boot/stm32/Cargo.toml
View File

@ -23,8 +23,8 @@ embassy-stm32 = { path = "../../embassy-stm32", default-features = false }
embassy-boot = { path = "../boot", default-features = false } embassy-boot = { path = "../boot", default-features = false }
cortex-m = { version = "0.7.6" } cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" } cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
cfg-if = "1.0.0" cfg-if = "1.0.0"
[features] [features]

4
embassy-embedded-hal/Cargo.toml
View File

@ -25,8 +25,8 @@ embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [
] } ] }
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.2" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
nb = "1.0.0" nb = "1.0.0"
defmt = { version = "0.3", optional = true } defmt = { version = "0.3", optional = true }

2
embassy-nrf/Cargo.toml
View File

@ -106,7 +106,7 @@ cortex-m = "0.7.6"
critical-section = "1.1" critical-section = "1.1"
rand_core = "0.6.3" rand_core = "0.6.3"
fixed = "1.10.0" fixed = "1.10.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0" embedded-storage-async = "0.4.0"
cfg-if = "1.0.0" cfg-if = "1.0.0"

2
embassy-rp/Cargo.toml
View File

@ -71,7 +71,7 @@ chrono = { version = "0.4", default-features = false, optional = true }
embedded-io = { version = "0.6.0" } embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }
embedded-storage = { version = "0.3" } embedded-storage = { version = "0.3" }
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
rand_core = "0.6.4" rand_core = "0.6.4"
fixed = "1.23.1" fixed = "1.23.1"

4
embassy-stm32/Cargo.toml
View File

@ -46,8 +46,8 @@ embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.2" }
embedded-hal-nb = { version = "=1.0.0-rc.2" } embedded-hal-nb = { version = "=1.0.0-rc.2" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.0" } embedded-storage-async = { version = "0.4.1" }
defmt = { version = "0.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }

2
examples/boot/application/rp/Cargo.toml
View File

@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.6" }
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
[features] [features]
default = ["panic-reset"] default = ["panic-reset"]

2
examples/boot/application/stm32f7/Cargo.toml
View File

@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true }
defmt-rtt = { version = "0.4", optional = true } defmt-rtt = { version = "0.4", optional = true }
panic-reset = { version = "0.1.1" } panic-reset = { version = "0.1.1" }
embedded-hal = { version = "0.2.6" } embedded-hal = { version = "0.2.6" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"

2
examples/boot/application/stm32h7/Cargo.toml
View File

@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true }
defmt-rtt = { version = "0.4", optional = true } defmt-rtt = { version = "0.4", optional = true }
panic-reset = { version = "0.1.1" } panic-reset = { version = "0.1.1" }
embedded-hal = { version = "0.2.6" } embedded-hal = { version = "0.2.6" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"

2
examples/boot/bootloader/rp/Cargo.toml
View File

@ -16,7 +16,7 @@ embassy-time = { path = "../../../../embassy-time", features = [] }
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = { version = "0.7" } cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0" embedded-storage-async = "0.4.0"
cfg-if = "1.0.0" cfg-if = "1.0.0"

2
examples/boot/bootloader/stm32/Cargo.toml
View File

@ -14,7 +14,7 @@ embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32" }
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" }
cortex-m-rt = { version = "0.7" } cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0" embedded-storage-async = "0.4.0"
cfg-if = "1.0.0" cfg-if = "1.0.0"

2
examples/nrf52840/Cargo.toml
View File

@ -33,7 +33,7 @@ cortex-m-rt = "0.7.0"
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand = { version = "0.8.4", default-features = false } rand = { version = "0.8.4", default-features = false }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
usbd-hid = "0.6.0" usbd-hid = "0.6.0"
serde = { version = "1.0.136", default-features = false } serde = { version = "1.0.136", default-features = false }
embedded-hal = { version = "1.0.0-rc.2" } embedded-hal = { version = "1.0.0-rc.2" }

2
examples/nrf5340/Cargo.toml
View File

@ -23,7 +23,7 @@ cortex-m-rt = "0.7.0"
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand = { version = "0.8.4", default-features = false } rand = { version = "0.8.4", default-features = false }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
usbd-hid = "0.6.0" usbd-hid = "0.6.0"
serde = { version = "1.0.136", default-features = false } serde = { version = "1.0.136", default-features = false }

2
examples/stm32f3/Cargo.toml
View File

@ -23,7 +23,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false } heapless = { version = "0.8", default-features = false }
nb = "1.0.0" nb = "1.0.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}
[profile.release] [profile.release]

2
examples/stm32f334/Cargo.toml
View File

@ -22,5 +22,5 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false } heapless = { version = "0.8", default-features = false }
nb = "1.0.0" nb = "1.0.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}

2
examples/stm32f4/Cargo.toml
View File

@ -25,7 +25,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false } heapless = { version = "0.8", default-features = false }
nb = "1.0.0" nb = "1.0.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
micromath = "2.0.0" micromath = "2.0.0"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}
chrono = { version = "^0.4", default-features = false} chrono = { version = "^0.4", default-features = false}

2
examples/stm32f7/Cargo.toml
View File

@ -26,7 +26,7 @@ heapless = { version = "0.8", default-features = false }
nb = "1.0.0" nb = "1.0.0"
rand_core = "0.6.3" rand_core = "0.6.3"
critical-section = "1.1" critical-section = "1.1"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}
[profile.release] [profile.release]

2
examples/stm32h5/Cargo.toml
View File

@ -30,7 +30,7 @@ rand_core = "0.6.3"
critical-section = "1.1" critical-section = "1.1"
micromath = "2.0.0" micromath = "2.0.0"
stm32-fmc = "0.3.0" stm32-fmc = "0.3.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}
# cargo build/run # cargo build/run

2
examples/stm32h7/Cargo.toml
View File

@ -30,7 +30,7 @@ rand_core = "0.6.3"
critical-section = "1.1" critical-section = "1.1"
micromath = "2.0.0" micromath = "2.0.0"
stm32-fmc = "0.3.0" stm32-fmc = "0.3.0"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}
chrono = { version = "^0.4", default-features = false } chrono = { version = "^0.4", default-features = false }

2
examples/stm32l0/Cargo.toml
View File

@ -18,7 +18,7 @@ embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["de
defmt = "0.3" defmt = "0.3"
defmt-rtt = "0.4" defmt-rtt = "0.4"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
embedded-io = { version = "0.6.0" } embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }

2
examples/stm32l1/Cargo.toml
View File

@ -19,7 +19,7 @@ embedded-hal = "0.2.6"
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false } heapless = { version = "0.8", default-features = false }
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
[profile.release] [profile.release]
debug = 2 debug = 2

2
examples/stm32wl/Cargo.toml
View File

@ -18,7 +18,7 @@ defmt-rtt = "0.4"
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-storage = "0.3.0" embedded-storage = "0.3.1"
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false } heapless = { version = "0.8", default-features = false }