aboutsummaryrefslogtreecommitdiff
path: root/embassy-net
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-11-15 18:31:38 +0000
committerGitHub <[email protected]>2021-11-15 18:31:38 +0000
commitc8f3ec3fba47899b123d0a146e8f9b3808ea4601 (patch)
treeba19e675d923441025e6b1c9d8114f85c86f8b6d /embassy-net
parent4e0a0f27febfb00c9b4ec42275ac6b83c98436ea (diff)
parentee1490bce16d98457c1e67f5c7e9320e4c17e51b (diff)
Merge #487
487: Update to defmt 3.0ish. r=bobmcwhirter a=bobmcwhirter Lots of gitrevs deps. Co-authored-by: Bob McWhirter <[email protected]>
Diffstat (limited to 'embassy-net')
-rw-r--r--embassy-net/Cargo.toml11
1 files changed, 3 insertions, 8 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
index 161a3946e..4b932ceb3 100644
--- a/embassy-net/Cargo.toml
+++ b/embassy-net/Cargo.toml
@@ -7,11 +7,6 @@ edition = "2018"
7[features] 7[features]
8default = ["pool-4"] 8default = ["pool-4"]
9std = [] 9std = []
10defmt-trace = []
11defmt-debug = []
12defmt-info = []
13defmt-warn = []
14defmt-error = []
15 10
16tcp = ["smoltcp/socket-tcp"] 11tcp = ["smoltcp/socket-tcp"]
17dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"] 12dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"]
@@ -25,7 +20,7 @@ pool-32 = []
25 20
26[dependencies] 21[dependencies]
27 22
28defmt = { version = "0.2.3", optional = true } 23defmt = { version = "0.3", optional = true }
29log = { version = "0.4.14", optional = true } 24log = { version = "0.4.14", optional = true }
30 25
31embassy = { version = "0.1.0", path = "../embassy" } 26embassy = { version = "0.1.0", path = "../embassy" }
@@ -39,8 +34,8 @@ futures = { version = "0.3.17", default-features = false, features =
39atomic-pool = "0.2.1" 34atomic-pool = "0.2.1"
40 35
41[dependencies.smoltcp] 36[dependencies.smoltcp]
42git = "https://github.com/smoltcp-rs/smoltcp" 37git = "https://github.com/bobmcwhirter/smoltcp"
43rev = "e4241510337e095b9d21136c5f58b2eaa1b78479" 38rev = "faf81d21daae16b650b16e59a8422a8283e8a302"
44default-features = false 39default-features = false
45features = [ 40features = [
46 "proto-ipv4", 41 "proto-ipv4",