Skip to content

Commit

Permalink
update embedded-storage{,-async}, remove patch.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dirbaio
Dirbaio committed Dec 4, 2023
1 parent 52fabbf commit 03325ea
Show file tree
Hide file tree
Showing 25 changed files with 30 additions and 33 deletions.
3 changes: 0 additions & 3 deletions .cargo/config.toml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions embassy-boot/boot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ log = { version = "0.4", 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-sync = { version = "0.4.0", path = "../../embassy-sync" }
embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }
salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true }
signature = { version = "1.6.4", default-features = false }

Expand Down
4 changes: 2 additions & 2 deletions embassy-boot/nrf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ embassy-nrf = { path = "../../embassy-nrf" }
embassy-boot = { path = "../boot", default-features = false }
cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }
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 }
Expand Down
4 changes: 2 additions & 2 deletions embassy-boot/rp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ embassy-time = { path = "../../embassy-time" }

cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }
cfg-if = "1.0.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions embassy-boot/stm32/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ embassy-stm32 = { path = "../../embassy-stm32", default-features = false }
embassy-boot = { path = "../boot", default-features = false }
cortex-m = { version = "0.7.6" }
cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }
cfg-if = "1.0.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions embassy-embedded-hal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-async = { version = "=1.0.0-rc.2" }
embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }
nb = "1.0.0"

defmt = { version = "0.3", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion embassy-nrf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cortex-m = "0.7.6"
critical-section = "1.1"
rand_core = "0.6.3"
fixed = "1.10.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0"
cfg-if = "1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion embassy-rp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ chrono = { version = "0.4", default-features = false, optional = true }
embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" }
embedded-storage = { version = "0.3" }
embedded-storage-async = { version = "0.4.0" }
embedded-storage-async = { version = "0.4.1" }
rand_core = "0.6.4"
fixed = "1.23.1"

Expand Down
4 changes: 2 additions & 2 deletions embassy-stm32/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-nb = { version = "=1.0.0-rc.2" }

embedded-storage = "0.3.0"
embedded-storage-async = { version = "0.4.0" }
embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" }

defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/boot/application/rp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-rt = "0.7.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"

[features]
default = ["panic-reset"]
Expand Down
2 changes: 1 addition & 1 deletion examples/boot/application/stm32f7/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true }
defmt-rtt = { version = "0.4", optional = true }
panic-reset = { version = "0.1.1" }
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-rt = "0.7.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/boot/application/stm32h7/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true }
defmt-rtt = { version = "0.4", optional = true }
panic-reset = { version = "0.1.1" }
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-rt = "0.7.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/boot/bootloader/rp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-rt = { version = "0.7" }
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0"
cfg-if = "1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/boot/bootloader/stm32/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32" }
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" }
cortex-m-rt = { version = "0.7" }
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
embedded-storage-async = "0.4.0"
cfg-if = "1.0.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/nrf52840/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ cortex-m-rt = "0.7.0"
panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand = { version = "0.8.4", default-features = false }
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
usbd-hid = "0.6.0"
serde = { version = "1.0.136", default-features = false }
embedded-hal = { version = "1.0.0-rc.2" }
Expand Down
2 changes: 1 addition & 1 deletion examples/nrf5340/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cortex-m-rt = "0.7.0"
panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand = { version = "0.8.4", default-features = false }
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
usbd-hid = "0.6.0"
serde = { version = "1.0.136", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion examples/stm32f3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false }
nb = "1.0.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]}

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32f334/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false }
nb = "1.0.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]}
2 changes: 1 addition & 1 deletion examples/stm32f4/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false }
nb = "1.0.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
micromath = "2.0.0"
static_cell = { version = "2", features = ["nightly"]}
chrono = { version = "^0.4", default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32f7/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ heapless = { version = "0.8", default-features = false }
nb = "1.0.0"
rand_core = "0.6.3"
critical-section = "1.1"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]}

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32h5/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rand_core = "0.6.3"
critical-section = "1.1"
micromath = "2.0.0"
stm32-fmc = "0.3.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]}

# cargo build/run
Expand Down
2 changes: 1 addition & 1 deletion examples/stm32h7/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rand_core = "0.6.3"
critical-section = "1.1"
micromath = "2.0.0"
stm32-fmc = "0.3.0"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
static_cell = { version = "2", features = ["nightly"]}
chrono = { version = "^0.4", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion examples/stm32l0/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["de
defmt = "0.3"
defmt-rtt = "0.4"

embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" }

Expand Down
2 changes: 1 addition & 1 deletion examples/stm32l1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ embedded-hal = "0.2.6"
panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false }
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"

[profile.release]
debug = 2
2 changes: 1 addition & 1 deletion examples/stm32wl/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ defmt-rtt = "0.4"
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6"
embedded-storage = "0.3.0"
embedded-storage = "0.3.1"
panic-probe = { version = "0.3", features = ["print-defmt"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
heapless = { version = "0.8", default-features = false }
Expand Down

0 comments on commit 03325ea

Please sign in to comment.