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

Make cargo manifests consistent and bump dependencies

Browse Source
This commit is contained in:
Jesse Braham 2022-05-05 11:56:43 +02:00
parent e745e84869
commit 67bd5837cd
6 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,14 +19,12 @@ procmacros = { path = "../esp-hal-procmacros", package = "esp-hal-procmacros"
void = { version = "1.0", default-features = false } void = { version = "1.0", default-features = false }
# RISC-V # RISC-V
riscv = { version = "0.8.0", optional = true } riscv = { version = "0.8", optional = true }
riscv-atomic-emulation-trap = { version = "0.1", optional = true } riscv-atomic-emulation-trap = { version = "0.1", optional = true }
# Xtensa # Xtensa
xtensa-lx = { version = "0.7.0", optional = true } xtensa-lx = { version = "0.7", optional = true }
xtensa-lx-rt = { version = "0.11", optional = true }
# Xtensa Runtime
xtensa-lx-rt = { version = "0.11.0", optional = true }
# Part of `ufmt` containing only `uWrite` trait # Part of `ufmt` containing only `uWrite` trait
ufmt-write = { version = "0.1", optional = true } ufmt-write = { version = "0.1", optional = true }
@ -41,7 +39,7 @@ esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.g
esp32s3_pac = { package = "esp32s3", 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 }
[features] [features]
esp32 = [ "esp32_pac/rt", "xtensa", "dual_core", "xtensa-lx-rt/esp32", "xtensa-lx/esp32"] esp32 = [ "esp32_pac/rt", "xtensa", "dual_core", "xtensa-lx-rt/esp32", "xtensa-lx/esp32"]
esp32c3 = ["esp32c3_pac/rt", "risc_v", "single_core"] esp32c3 = ["esp32c3_pac/rt", "risc_v", "single_core"]
esp32s2 = ["esp32s2_pac/rt", "xtensa", "single_core", "xtensa-lx-rt/esp32s2", "xtensa-lx/esp32s2"] esp32s2 = ["esp32s2_pac/rt", "xtensa", "single_core", "xtensa-lx-rt/esp32s2", "xtensa-lx/esp32s2"]
esp32s3 = ["esp32s3_pac/rt", "xtensa", "dual_core", "xtensa-lx-rt/esp32s3", "xtensa-lx/esp32s3"] esp32s3 = ["esp32s3_pac/rt", "xtensa", "dual_core", "xtensa-lx-rt/esp32s3", "xtensa-lx/esp32s3"]

2
esp-hal-procmacros/Cargo.toml
View File

@ -16,7 +16,7 @@ proc-macro = true
[dependencies] [dependencies]
quote = "1.0" quote = "1.0"
proc-macro2 = "1.0" proc-macro2 = "1.0"
darling = "0.10" darling = "0.14"
syn = {version = "1.0", features = ["extra-traits", "full"]} syn = {version = "1.0", features = ["extra-traits", "full"]}
proc-macro-error = "1.0.4" proc-macro-error = "1.0.4"

14
esp32-hal/Cargo.toml
View File

@ -25,20 +25,20 @@ categories = [
[dependencies] [dependencies]
bare-metal = "1.0" bare-metal = "1.0"
embedded-hal = { version = "0.2", features = ["unproven"] } embedded-hal = { version = "0.2", features = ["unproven"] }
nb = "1.0" nb = "1.0"
void = { version = "1.0", default-features = false } void = { version = "1.0", default-features = false }
xtensa-lx = { version = "0.7.0", features = ["esp32"] } xtensa-lx = { version = "0.7", features = ["esp32"] }
xtensa-lx-rt = { version = "0.11.0", features = ["esp32"], optional = true } xtensa-lx-rt = { version = "0.11", features = ["esp32"], optional = true }
[dependencies.esp-hal-common] [dependencies.esp-hal-common]
path = "../esp-hal-common" path = "../esp-hal-common"
features = ["esp32"] features = ["esp32"]
[dev-dependencies] [dev-dependencies]
panic-halt = "0.2" embedded-graphics = "0.7"
ssd1306 = "0.7.0" panic-halt = "0.2"
embedded-graphics = "0.7.1" ssd1306 = "0.7"
[features] [features]
default = ["rt"] default = ["rt"]

21
esp32c3-hal/Cargo.toml
View File

@ -24,23 +24,22 @@ categories = [
] ]
[dependencies] [dependencies]
bare-metal = "1.0" bare-metal = "1.0"
embedded-hal = { version = "0.2", features = ["unproven"] } embedded-hal = { version = "0.2", features = ["unproven"] }
nb = "1.0" nb = "1.0"
riscv = "0.8.0" r0 = "1.0.0"
riscv-rt = { version = "0.8.1", optional = true } riscv = "0.8.0"
void = { version = "1.0", default-features = false } riscv-rt = { version = "0.8", optional = true }
r0 = "1.0.0" void = { version = "1.0", default-features = false }
riscv-atomic-emulation-trap = "0.1.0"
[dependencies.esp-hal-common] [dependencies.esp-hal-common]
path = "../esp-hal-common" path = "../esp-hal-common"
features = ["esp32c3"] features = ["esp32c3"]
[dev-dependencies] [dev-dependencies]
panic-halt = "0.2" embedded-graphics = "0.7"
ssd1306 = "0.7.0" panic-halt = "0.2"
embedded-graphics = "0.7.1" ssd1306 = "0.7"
[features] [features]
default = ["rt"] default = ["rt"]

14
esp32s2-hal/Cargo.toml
View File

@ -25,20 +25,20 @@ categories = [
[dependencies] [dependencies]
bare-metal = "1.0" bare-metal = "1.0"
embedded-hal = { version = "0.2", features = ["unproven"] } embedded-hal = { version = "0.2", features = ["unproven"] }
nb = "1.0" nb = "1.0"
void = { version = "1.0", default-features = false } void = { version = "1.0", default-features = false }
xtensa-lx = { version = "0.7.0", features = ["esp32s2"] } xtensa-lx = { version = "0.7", features = ["esp32s2"] }
xtensa-lx-rt = { version = "0.11.0", features = ["esp32s2"], optional = true } xtensa-lx-rt = { version = "0.11", features = ["esp32s2"], optional = true }
[dependencies.esp-hal-common] [dependencies.esp-hal-common]
path = "../esp-hal-common" path = "../esp-hal-common"
features = ["esp32s2"] features = ["esp32s2"]
[dev-dependencies] [dev-dependencies]
panic-halt = "0.2" embedded-graphics = "0.7"
ssd1306 = "0.7.0" panic-halt = "0.2"
embedded-graphics = "0.7.1" ssd1306 = "0.7"
[features] [features]
default = ["rt"] default = ["rt"]

14
esp32s3-hal/Cargo.toml
View File

@ -25,20 +25,20 @@ categories = [
[dependencies] [dependencies]
bare-metal = "1.0" bare-metal = "1.0"
embedded-hal = { version = "0.2", features = ["unproven"] } embedded-hal = { version = "0.2", features = ["unproven"] }
nb = "1.0" nb = "1.0"
void = { version = "1.0", default-features = false } void = { version = "1.0", default-features = false }
xtensa-lx = { version = "0.7.0", features = ["esp32s3"] } xtensa-lx = { version = "0.7", features = ["esp32s3"] }
xtensa-lx-rt = { version = "0.11.0", features = ["esp32s3"], optional = true } xtensa-lx-rt = { version = "0.11", features = ["esp32s3"], optional = true }
[dependencies.esp-hal-common] [dependencies.esp-hal-common]
path = "../esp-hal-common" path = "../esp-hal-common"
features = ["esp32s3"] features = ["esp32s3"]
[dev-dependencies] [dev-dependencies]
panic-halt = "0.2" embedded-graphics = "0.7"
ssd1306 = "0.7.0" panic-halt = "0.2"
embedded-graphics = "0.7.1" ssd1306 = "0.7"
[features] [features]
default = ["rt"] default = ["rt"]