Skip to content

Commit

Permalink
Merge #77
Browse files Browse the repository at this point in the history
77: Smoltcp 0.6 and bump deps r=jordens a=jordens



Co-authored-by: Robert Jördens <[email protected]>
  • Loading branch information
bors[bot] and jordens authored Jan 21, 2020
2 parents 3c60a72 + 385791a commit 0434ee4
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 47 deletions.
74 changes: 37 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,13 @@ cortex-m-rt = { version = "0.6", features = ["device"] }
cortex-m-log = { version = "0.6", features = ["log-integration"] }
log = "0.4"
panic-semihosting = { version = "0.5", optional = true }
panic-halt = { version = "0.2" }
panic-halt = "0.2"
serde = { version = "1.0", features = ["derive"], default-features = false }
heapless = { version = "0.5" }
serde-json-core = { version = "0.1" }
heapless = "0.5"
serde-json-core = "0.1"
stm32h7 = { version = "0.9", features = ["stm32h743", "rt"] }
cortex-m-rtfm = { version = "0.5" }

[dependencies.smoltcp]
git = "https://github.com/m-labs/smoltcp.git"
rev = "8eb01ac"
features = ["ethernet", "proto-ipv4", "socket-tcp"]
default-features = false
cortex-m-rtfm = "0.5"
smoltcp = { version = "0.6", features = ["ethernet", "proto-ipv4", "socket-tcp"], default-features = false }

[features]
semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]
Expand Down

0 comments on commit 0434ee4

Please sign in to comment.