From f0335ade5396c077c234ea6430cedb980f492907 Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Fri, 19 Aug 2022 10:45:32 -0700 Subject: [PATCH] Use the published version of the PACs --- esp-hal-common/Cargo.toml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml index 692bf062242..4554a0ee2b8 100644 --- a/esp-hal-common/Cargo.toml +++ b/esp-hal-common/Cargo.toml @@ -38,10 +38,12 @@ smart-leds-trait = { version = "0.2.1", optional = true } # Each supported device MUST have its PAC included below along with a # corresponding feature. We rename the PAC packages because we cannot # have dependencies and features with the same names. -esp32_pac = { package = "esp32", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true } -esp32c3_pac = { package = "esp32c3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true } -esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true } -esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true } +# NOTE: If we ever raise our MSRV to 1.60.0+ we can use the optional +# dependency syntax in the features instead of aliasing these packages. +esp32_pac = { package = "esp32", version = "0.13.0", optional = true } +esp32c3_pac = { package = "esp32c3", version = "0.5.0", optional = true } +esp32s2_pac = { package = "esp32s2", version = "0.3.0", optional = true } +esp32s3_pac = { package = "esp32s3", version = "0.3.0", optional = true } [features] esp32 = ["esp32_pac/rt" , "procmacros/xtensa", "multi_core" , "xtensa-lx-rt/esp32", "xtensa-lx/esp32"] @@ -49,7 +51,6 @@ esp32c3 = ["esp32c3_pac/rt", "procmacros/riscv" , "single_core", "riscv", "riscv esp32s2 = ["esp32s2_pac/rt", "procmacros/xtensa", "single_core", "xtensa-lx-rt/esp32s2", "xtensa-lx/esp32s2"] esp32s3 = ["esp32s3_pac/rt", "procmacros/xtensa", "multi_core" , "xtensa-lx-rt/esp32s3", "xtensa-lx/esp32s3"] - # Core Count (should not be enabled directly, but instead by a PAC's feature) single_core = [] multi_core = [] @@ -62,5 +63,6 @@ smartled = ["smart-leds-trait"] # Implement the `embedded-hal==1.0.0-alpha.x` traits eh1 = ["embedded-hal-1"] + # To use vectored interrupts (calling the handlers defined in the PAC) vectored = ["procmacros/interrupt"]