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

No longer depend on embassy-time (#1092)

Browse Source 
* No longer depend on `embassy-time`

* Update `CHANGELOG.md`
This commit is contained in:
Jesse Braham 2024-01-17 16:45:11 +00:00 committed by GitHub
parent ebe4149c39
commit 0e927d25cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 38 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Set up interrupts for the DMA and async enabled peripherals only when `async` feature is provided (#1042)
- Update to `1.0.0` releases of the `embedded-hal-*` packages (#1068)
- Update `embassy-time` to `0.3.0` and embassy-executor to `0.5.0` release due to the release of the `embedded-hal-*` packages (#1075)
- No longer depend on `embassy-time` (#1092)
### Fixed

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

@ -46,7 +46,6 @@ embassy-executor = { version = "0.5.0", optional = true }
embassy-futures = { version = "0.1.1", optional = true }
embassy-sync = { version = "0.5.0", optional = true }
embassy-time-driver = { version = "0.1.0", optional = true }
embassy-time = { version = "0.3.0", optional = true }
# RISC-V
riscv = { version = "0.10.1", optional = true }
@ -142,22 +141,16 @@ async = [
]
# Embassy support
embassy = ["embassy-time", "embassy-time-driver", "procmacros/embassy"]
embassy = ["embassy-time-driver", "procmacros/embassy"]
embassy-executor-interrupt = ["embassy", "embassy-executor"]
embassy-executor-thread = ["embassy", "embassy-executor"]
embassy-integrated-timers = ["embassy-executor?/integrated-timers"]
embassy-time-systick = []
embassy-time-timg0 = []
# Prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["embassy-executor?/integrated-timers"]
embassy-generic-queue-8 = ["embassy-time/generic-queue-8"]
embassy-generic-queue-16 = ["embassy-time/generic-queue-16"]
embassy-generic-queue-32 = ["embassy-time/generic-queue-32"]
embassy-generic-queue-64 = ["embassy-time/generic-queue-64"]
embassy-generic-queue-128 = ["embassy-time/generic-queue-128"]
# Architecture-specific features (intended for internal use)
riscv = ["dep:riscv", "critical-section/restore-state-u8"]
xtensa = ["critical-section/restore-state-u32"]
@ -184,7 +177,6 @@ defmt = [
"embassy-executor?/defmt",
"embassy-futures?/defmt",
"embassy-sync?/defmt",
# "embassy-time?/defmt",
"embedded-hal-1?/defmt-03",
"embedded-io/defmt-03",
"embedded-io-async?/defmt-03",

15
esp32-hal/Cargo.toml
View File

@ -29,6 +29,7 @@ critical-section = "1.1.2"
crypto-bigint = { version = "0.5.5", default-features = false }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
embedded-hal-async = "1.0.0"
@ -44,7 +45,6 @@ sha2 = { version = "0.10.8", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
embassy-time = { version = "0.3.0" }
[features]
default = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"]
@ -63,17 +63,10 @@ xtal-40mhz = ["esp-hal-common/xtal-40mhz"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
# PSRAM support
psram = []
@ -142,4 +135,4 @@ required-features = ["embassy", "async"]
[[example]]
name = "embassy_i2s_read"
required-features = ["embassy", "async"]
required-features = ["embassy", "async"]

17
esp32c2-hal/Cargo.toml
View File

@ -29,6 +29,7 @@ crypto-bigint = { version = "0.5.5", default-features = false }
elliptic-curve = { version = "0.13.8", default-features = false, features = ["sec1"] }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
embedded-hal-async = "1.0.0"
@ -44,7 +45,6 @@ p256 = { version = "0.13.2", default-features = false, features =
sha2 = { version = "0.10.8", default-features = false}
ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
embassy-time = { version = "0.3.0" }
[features]
default = ["rt", "vectored", "xtal-40mhz", "embassy-integrated-timers"]
@ -64,18 +64,11 @@ xtal-40mhz = ["esp-hal-common/xtal-40mhz"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
[profile.release]
debug = true
@ -118,4 +111,4 @@ required-features = ["embassy", "async", "embassy-executor-thread"]
[[example]]
name = "direct-vectoring"
required-features = ["direct-vectoring"]
required-features = ["direct-vectoring"]

17
esp32c3-hal/Cargo.toml
View File

@ -30,6 +30,7 @@ critical-section = "1.1.2"
crypto-bigint = { version = "0.5.5", default-features = false }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-can = "0.4.1"
embedded-graphics = "0.8.1"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
@ -47,7 +48,6 @@ sha2 = { version = "0.10.8", default-features = false }
smart-leds = "0.3.0"
ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
embassy-time = { version = "0.3.0" }
[features]
@ -71,18 +71,11 @@ init-rtc-data = ["esp-hal-common/rv-init-rtc-data"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
[profile.release]
debug = true
@ -145,4 +138,4 @@ required-features = ["embassy", "async", "embassy-executor-thread"]
[[example]]
name = "direct-vectoring"
required-features = ["direct-vectoring"]
required-features = ["direct-vectoring"]

17
esp32c6-hal/Cargo.toml
View File

@ -30,6 +30,7 @@ crypto-bigint = { version = "0.5.5", default-features = false}
elliptic-curve = { version = "0.13.8", default-features = false, features = ["sec1"] }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
embedded-hal-async = "1.0.0"
@ -49,7 +50,6 @@ sha2 = { version = "0.10.8", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
embassy-time = { version = "0.3.0" }
[features]
default = ["rt", "vectored", "zero-rtc-bss", "embassy-integrated-timers"]
@ -73,18 +73,11 @@ init-rtc-data = ["esp-hal-common/rv-init-rtc-data"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
[profile.release]
debug = true
@ -155,4 +148,4 @@ required-features = ["embassy", "async", "embassy-executor-thread"]
[[example]]
name = "embassy_usb_serial_jtag"
required-features = ["embassy", "async", "embassy-executor-thread"]
required-features = ["embassy", "async", "embassy-executor-thread"]

17
esp32h2-hal/Cargo.toml
View File

@ -30,6 +30,7 @@ crypto-bigint = { version = "0.5.5", default-features = false }
elliptic-curve = { version = "0.13.8", default-features = false, features = ["sec1"] }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
embedded-hal-async = "1.0.0"
@ -49,7 +50,6 @@ sha2 = { version = "0.10.8", default-features = false}
smart-leds = "0.3.0"
ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
embassy-time = { version = "0.3.0"}
[features]
default = ["rt", "vectored", "zero-rtc-bss", "embassy-integrated-timers"]
@ -73,18 +73,11 @@ init-rtc-data = ["esp-hal-common/rv-init-rtc-data"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
[profile.release]
debug = true
@ -155,4 +148,4 @@ required-features = ["embassy", "async", "embassy-executor-thread"]
[[example]]
name = "embassy_usb_serial_jtag"
required-features = ["embassy", "async", "embassy-executor-thread"]
required-features = ["embassy", "async", "embassy-executor-thread"]

17
esp32s2-hal/Cargo.toml
View File

@ -29,6 +29,7 @@ critical-section = "1.1.2"
crypto-bigint = { version = "0.5.5", default-features = false }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
embedded-hal-async = "1.0.0"
@ -50,7 +51,6 @@ ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
usb-device = "0.3.1"
usbd-serial = "0.2.0"
embassy-time = { version = "0.3.0" }
[features]
default = ["rt", "vectored", "embassy-integrated-timers"]
@ -66,18 +66,11 @@ vectored = ["esp-hal-common/vectored"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-80_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-80_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
# PSRAM support
psram = []
@ -138,4 +131,4 @@ required-features = ["embassy", "async"]
[[example]]
name = "embassy_i2s_read"
required-features = ["embassy", "async"]
required-features = ["embassy", "async"]

17
esp32s3-hal/Cargo.toml
View File

@ -30,6 +30,7 @@ critical-section = "1.1.2"
crypto-bigint = { version = "0.5.5", default-features = false }
embassy-executor = { version = "0.5.0", features = ["nightly"] }
embassy-sync = "0.5.0"
embassy-time = "0.3.0"
embedded-graphics = "0.8.1"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
embedded-hal-1 = { version = "1.0.0", package = "embedded-hal" }
@ -50,7 +51,6 @@ ssd1306 = "0.8.4"
static_cell = { version = "2.0.0", features = ["nightly"] }
usb-device = "0.3.1"
usbd-serial = "0.2.0"
embassy-time = { version = "0.3.0" }
[features]
default = ["rt", "vectored", "embassy-integrated-timers"]
@ -66,18 +66,11 @@ vectored = ["esp-hal-common/vectored"]
# Embassy support
embassy = ["esp-hal-common/embassy"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
embassy-executor-interrupt = ["esp-hal-common/embassy-executor-interrupt"]
embassy-executor-thread = ["esp-hal-common/embassy-executor-thread"]
# prefer integrated timers, but allow using the generic queue if needed
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-generic-queue-8 = ["esp-hal-common/embassy-generic-queue-8"]
embassy-generic-queue-16 = ["esp-hal-common/embassy-generic-queue-16"]
embassy-generic-queue-32 = ["esp-hal-common/embassy-generic-queue-32"]
embassy-generic-queue-64 = ["esp-hal-common/embassy-generic-queue-64"]
embassy-generic-queue-128 = ["esp-hal-common/embassy-generic-queue-128"]
embassy-integrated-timers = ["esp-hal-common/embassy-integrated-timers"]
embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-16_000_000"]
embassy-time-timg0 = ["esp-hal-common/embassy-time-timg0", "embassy-time/tick-hz-1_000_000"]
# PSRAM support
psram = []
@ -163,4 +156,4 @@ required-features = ["embassy", "async"]
[[example]]
name = "embassy_usb_serial_jtag"
required-features = ["embassy", "async"]
required-features = ["embassy", "async"]