GetLitFam/esp-hal
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove patches

Browse Source
This commit is contained in:
Dániel Buga 2025-01-06 08:47:15 +01:00
parent b04ba6227c
commit 72b35c40d8
No known key found for this signature in database
7 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp-hal-embassy/CHANGELOG.md
View File

@ -10,9 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- Added `ESP_HAL_EMBASSY_TIMER_QUEUE` (#2701)
- Added `ESP_HAL_EMBASSY_GENERIC_QUEUE_SIZE` (#2701)
### Changed ### Changed
- Bump MSRV to 1.83 (#2615) - Bump MSRV to 1.83 (#2615)
- Updated embassy-time to v0.4 (#2701)
- Config: Crate prefixes and configuration keys are now separated by `_CONFIG_` (#2848) - Config: Crate prefixes and configuration keys are now separated by `_CONFIG_` (#2848)

14
esp-hal-embassy/Cargo.toml
View File

@ -17,11 +17,11 @@ features = ["esp32c6"]
critical-section = "1.2.0" critical-section = "1.2.0"
defmt = { version = "0.3.8", optional = true } defmt = { version = "0.3.8", optional = true }
document-features = "0.2.10" document-features = "0.2.10"
embassy-executor = { version = "0.6.3", features = ["timer-item-payload-size-4"], optional = true } embassy-executor = { version = "0.7.0", features = ["timer-item-payload-size-4"], optional = true }
embassy-sync = { version = "0.6.1" } embassy-sync = { version = "0.6.1" }
embassy-time = { version = "0.3.0" } embassy-time = { version = "0.4.0" }
embassy-time-driver = { version = "0.1.0", features = [ "tick-hz-1_000_000" ] } embassy-time-driver = { version = "0.2.0", features = [ "tick-hz-1_000_000" ] }
embassy-time-queue-driver = { version = "0.1.0", features = ["_generic-queue"] } embassy-time-queue-utils = { version = "0.1.0", features = ["_generic-queue"] }
esp-config = { version = "0.2.0", path = "../esp-config" } esp-config = { version = "0.2.0", path = "../esp-config" }
esp-hal = { version = "0.22.0", path = "../esp-hal" } esp-hal = { version = "0.22.0", path = "../esp-hal" }
log = { version = "0.4.22", optional = true } log = { version = "0.4.22", optional = true }
@ -54,9 +54,3 @@ executors = ["dep:embassy-executor", "esp-hal/__esp_hal_embassy"]
[lints.rust] [lints.rust]
unexpected_cfgs = "allow" unexpected_cfgs = "allow"
[patch.crates-io]
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }

1
esp-hal/CHANGELOG.md
View File

@ -195,6 +195,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed `get_` prefixes from functions (#2528) - Removed `get_` prefixes from functions (#2528)
- The `Camera` and `I8080` drivers' constructors now only accepts blocking-mode DMA channels. (#2519) - The `Camera` and `I8080` drivers' constructors now only accepts blocking-mode DMA channels. (#2519)
- Many peripherals are now disabled by default and also get disabled when the driver is dropped (#2544) - Many peripherals are now disabled by default and also get disabled when the driver is dropped (#2544)
- Updated embassy-time to v0.4 (#2701)
- Config: Crate prefixes and configuration keys are now separated by `_CONFIG_` (#2848) - Config: Crate prefixes and configuration keys are now separated by `_CONFIG_` (#2848)

2
esp-hal/Cargo.toml
View File

@ -27,7 +27,7 @@ defmt = { version = "0.3.8", optional = true }
delegate = "0.13.1" delegate = "0.13.1"
digest = { version = "0.10.7", default-features = false, optional = true } digest = { version = "0.10.7", default-features = false, optional = true }
document-features = "0.2.10" document-features = "0.2.10"
embassy-embedded-hal = { version = "0.2.0", optional = true } embassy-embedded-hal = { version = "0.3.0", optional = true }
embassy-futures = "0.1.1" embassy-futures = "0.1.1"
embassy-sync = "0.6.1" embassy-sync = "0.6.1"
embassy-usb-driver = { version = "0.1.0", optional = true } embassy-usb-driver = { version = "0.1.0", optional = true }

6
examples/Cargo.toml
View File

@ -12,11 +12,11 @@ blocking-network-stack = { git = "https://github.com/bjoernQ/blocking-network-st
bt-hci = "0.1.1" bt-hci = "0.1.1"
cfg-if = "1.0.0" cfg-if = "1.0.0"
critical-section = "1.1.3" critical-section = "1.1.3"
embassy-executor = { version = "0.6.0", features = ["task-arena-size-20480"] } embassy-executor = { version = "0.7.0", features = ["task-arena-size-20480"] }
embassy-futures = "0.1.1" embassy-futures = "0.1.1"
embassy-net = { version = "0.5.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] } embassy-net = { version = "0.6.0", features = [ "tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-sync = "0.6.0" embassy-sync = "0.6.0"
embassy-time = "0.3.2" embassy-time = "0.4.0"
embassy-usb = { version = "0.2.0", default-features = false } embassy-usb = { version = "0.2.0", default-features = false }
embedded-can = "0.4.1" embedded-can = "0.4.1"
embedded-hal-async = "1.0.0" embedded-hal-async = "1.0.0"

8
hil-test/Cargo.toml
View File

@ -200,7 +200,7 @@ defmt-rtt = { version = "0.4.1", optional = true }
embassy-executor = "0.6.0" embassy-executor = "0.6.0"
embassy-futures = "0.1.1" embassy-futures = "0.1.1"
embassy-sync = "0.6.0" embassy-sync = "0.6.0"
embassy-time = "0.3.2" embassy-time = "0.4.0"
embedded-hal = "1.0.0" embedded-hal = "1.0.0"
embedded-can = "0.4.1" embedded-can = "0.4.1"
embedded-hal-async = "1.0.0" embedded-hal-async = "1.0.0"
@ -310,9 +310,3 @@ incremental = false
opt-level = 3 opt-level = 3
lto = false # LTO (thin or fat) miscompiles some tests on RISC-V lto = false # LTO (thin or fat) miscompiles some tests on RISC-V
overflow-checks = false overflow-checks = false
[patch.crates-io]
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }

12
qa-test/Cargo.toml
View File

@ -7,8 +7,10 @@ publish = false
[dependencies] [dependencies]
cfg-if = "1.0.0" cfg-if = "1.0.0"
embassy-executor = { version = "0.6.0", features = ["task-arena-size-12288"] } embassy-executor = { version = "0.7.0", features = ["task-arena-size-12288"] }
embassy-time = "0.3.2" embassy-time = "0.4.0"
embassy-futures = "0.1.1"
embassy-sync = "0.6.1"
embedded-graphics = "0.8.1" embedded-graphics = "0.8.1"
embedded-hal-async = "1.0.0" embedded-hal-async = "1.0.0"
esp-alloc = { path = "../esp-alloc" } esp-alloc = { path = "../esp-alloc" }
@ -33,9 +35,3 @@ debug = 2
debug-assertions = true debug-assertions = true
lto = "fat" lto = "fat"
codegen-units = 1 codegen-units = 1
[patch.crates-io]
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "0c245892c6812538f4f51b784ed8afa1ce47f25d" }