diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-04-12 20:14:26 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-04-13 17:46:27 +0200 |
| commit | e5a843dc062bcbd27e2a0e6b34334046522a881f (patch) | |
| tree | 8c2cc6745084fa3e456b5090e826502a96a2be5c | |
| parent | 0d3758ad6bd290689c99eab029ef652176b538d7 (diff) | |
net: auto-enable defmt in smoltcp using namespaced features.
| -rw-r--r-- | embassy-net/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-stm32/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/std/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32f7/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/stm32h7/Cargo.toml | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index a85eea0cb..90e84d828 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml | |||
| @@ -14,9 +14,11 @@ flavors = [ | |||
| 14 | ] | 14 | ] |
| 15 | 15 | ||
| 16 | [features] | 16 | [features] |
| 17 | default = ["pool-4"] | 17 | default = [] |
| 18 | std = [] | 18 | std = [] |
| 19 | 19 | ||
| 20 | defmt = ["dep:defmt", "smoltcp/defmt"] | ||
| 21 | |||
| 20 | tcp = ["smoltcp/socket-tcp"] | 22 | tcp = ["smoltcp/socket-tcp"] |
| 21 | dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"] | 23 | dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"] |
| 22 | medium-ethernet = ["smoltcp/medium-ethernet"] | 24 | medium-ethernet = ["smoltcp/medium-ethernet"] |
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 037d32751..91a65193f 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml | |||
| @@ -36,7 +36,7 @@ flavors = [ | |||
| 36 | embassy = { version = "0.1.0", path = "../embassy" } | 36 | embassy = { version = "0.1.0", path = "../embassy" } |
| 37 | embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["stm32"] } | 37 | embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["stm32"] } |
| 38 | embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } | 38 | embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" } |
| 39 | embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true } | 39 | embassy-net = { version = "0.1.0", path = "../embassy-net", optional = true } |
| 40 | 40 | ||
| 41 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 41 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 42 | embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true} | 42 | embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-alpha.7", git = "https://github.com/embassy-rs/embedded-hal", branch = "embassy2", optional = true} |
diff --git a/examples/std/Cargo.toml b/examples/std/Cargo.toml index ef60fe992..0853c323e 100644 --- a/examples/std/Cargo.toml +++ b/examples/std/Cargo.toml | |||
| @@ -6,7 +6,7 @@ version = "0.1.0" | |||
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../embassy", features = ["log", "std", "time", "nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../embassy", features = ["log", "std", "time", "nightly"] } |
| 9 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features=["std", "log", "medium-ethernet", "tcp", "dhcpv4"] } | 9 | embassy-net = { version = "0.1.0", path = "../../embassy-net", features=["std", "log", "medium-ethernet", "tcp", "dhcpv4", "pool-16"] } |
| 10 | 10 | ||
| 11 | async-io = "1.6.0" | 11 | async-io = "1.6.0" |
| 12 | env_logger = "0.9.0" | 12 | env_logger = "0.9.0" |
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index 3703f551f..09a06aa7f 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml | |||
| @@ -8,7 +8,7 @@ resolver = "2" | |||
| 8 | [dependencies] | 8 | [dependencies] |
| 9 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } | 9 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime"] } |
| 10 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "net", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } | 10 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "net", "stm32f767zi", "unstable-pac", "time-driver-any", "exti"] } |
| 11 | embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } | 11 | embassy-net = { path = "../../embassy-net", features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } |
| 12 | 12 | ||
| 13 | defmt = "0.3" | 13 | defmt = "0.3" |
| 14 | defmt-rtt = "0.3" | 14 | defmt-rtt = "0.3" |
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index 64baad994..f237a8173 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml | |||
| @@ -10,7 +10,7 @@ resolver = "2" | |||
| 10 | [dependencies] | 10 | [dependencies] |
| 11 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } | 11 | embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits"] } |
| 12 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "net", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } | 12 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "net", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } |
| 13 | embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } | 13 | embassy-net = { path = "../../embassy-net", features = ["defmt", "tcp", "medium-ethernet", "pool-16"] } |
| 14 | 14 | ||
| 15 | defmt = "0.3" | 15 | defmt = "0.3" |
| 16 | defmt-rtt = "0.3" | 16 | defmt-rtt = "0.3" |
