Support SysTimer as timebase on ESP32-S2

esp-rs · Sep 28, 2023 · 963c7fe · 963c7fe
1 parent 841830d
commit 963c7fe
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added `embassy-time-systick` to ESP32-S2 (#???)
 - Implement enabling/disabling BLE clock on ESP32-C6 (#784)
 - Async support for RMT (#787)
 - Implement `defmt::Format` for more types (#786)

diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml
@@ -38,7 +38,7 @@ embedded-hal-async = { version = "=1.0.0-rc.1", optional = true }
 embedded-io-async  = { version = "0.5.0", optional = true }
 embassy-executor   = { version = "0.3.0", features = ["integrated-timers"], optional = true }
 embassy-sync       = { version = "0.2.0", optional = true }
-embassy-time       = { version = "0.1.3", features = ["nightly"], optional = true }
+embassy-time       = { version = "0.1.4", features = ["nightly"], optional = true }
 embassy-futures    = { version = "0.1.0", optional = true }
 
 # RISC-V

diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
@@ -26,7 +26,7 @@ categories = [
 
 [dependencies]
 esp-hal-common = { version = "0.12.0", features = ["esp32"],   path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 
 [dev-dependencies]
 aes                = "0.8.3"

diff --git a/esp32c2-hal/Cargo.toml b/esp32c2-hal/Cargo.toml
@@ -26,7 +26,7 @@ categories = [
 
 [dependencies]
 esp-hal-common = { version = "0.12.0", features = ["esp32c2"], path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 
 [dev-dependencies]
 critical-section   = "1.1.2"

diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml
@@ -27,7 +27,7 @@ categories = [
 [dependencies]
 cfg-if         = "1.0.0"
 esp-hal-common = { version = "0.12.0", features = ["esp32c3"], path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 
 [dev-dependencies]
 aes                = "0.8.3"

diff --git a/esp32c6-hal/Cargo.toml b/esp32c6-hal/Cargo.toml
@@ -27,7 +27,7 @@ categories = [
 
 [dependencies]
 esp-hal-common = { version = "0.12.0", features = ["esp32c6"], path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 
 [dev-dependencies]
 aes                = "0.8.3"

diff --git a/esp32h2-hal/Cargo.toml b/esp32h2-hal/Cargo.toml
@@ -27,7 +27,7 @@ categories = [
 
 [dependencies]
 esp-hal-common = { version = "0.12.0", features = ["esp32h2"], path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 
 [dev-dependencies]
 aes                = "0.8.3"

diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml
@@ -26,7 +26,7 @@ categories = [
 
 [dependencies]
 esp-hal-common               = { version = "0.12.0", features = ["esp32s2"], path = "../esp-hal-common" }
-embassy-time                 = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time                 = { version = "0.1.4",  features = ["nightly"], optional = true }
 xtensa-atomic-emulation-trap = "0.4.0"
 
 [dev-dependencies]
@@ -66,10 +66,7 @@ vectored  = ["esp-hal-common/vectored"]
 
 # Embassy support
 embassy = ["esp-hal-common/embassy"]
-# FIXME:
-# - add 80_000_000 support to embassy time
-# - Fix https://github.com/esp-rs/esp-hal/issues/253
-# embassy-time-systick = ["esp-hal-common/embassy-time-systick", "embassy-time/tick-hz-1_000_000"] 
+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"]

diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml
@@ -26,7 +26,7 @@ categories = [
 
 [dependencies]
 esp-hal-common = { version = "0.12.0", features = ["esp32s3"], path = "../esp-hal-common" }
-embassy-time   = { version = "0.1.3",  features = ["nightly"], optional = true }
+embassy-time   = { version = "0.1.4",  features = ["nightly"], optional = true }
 r0             = { version = "1.0.0",  optional = true }
 
 [dev-dependencies]