Skip to content

Commit

Permalink
Cargo.toml: Fix excessive dependency requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
HarryMakes committed Dec 22, 2020
1 parent faf6a35 commit 14a75c9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ aligned = "0.3"
embedded-hal = "0.2"
stm32f4xx-hal = { version = "0.8" , optional = true }
smoltcp = { version = "0.6.0", default-features = false, features = ["proto-ipv4", "proto-ipv6", "socket-icmp", "socket-udp", "socket-tcp", "log", "verbose", "ethernet"], optional = true }
log = "0.4"
cortex-m-rtic = "0.5.3"
log = { version = "0.4", optional = true }
cortex-m-rtic = { version = "0.5.3", optional = true }

[features]
smoltcp-phy = ["smoltcp"]
Expand All @@ -25,6 +25,8 @@ smoltcp-phy-all = [
]
stm32f4 = ["stm32f4xx-hal"]
stm32f407 = ["stm32f4xx-hal/stm32f407"]
tx_stm32f407 = ["stm32f407", "log", "cortex-m-rtic"]
tcp_stm32f407 = ["stm32f407", "smoltcp-phy-all", "smoltcp/log", "log", "cortex-m-rtic"]
default = []

[dev-dependencies]
Expand All @@ -34,11 +36,11 @@ panic-itm = "0.4"

[[example]]
name = "tx_stm32f407"
required-features = ["stm32f407"]
required-features = ["tx_stm32f407"]

[[example]]
name = "tcp_stm32f407"
required-features = ["stm32f407", "smoltcp-phy-all", "smoltcp/log"]
required-features = ["tcp_stm32f407"]

[profile.release]
codegen-units = 1
Expand Down
4 changes: 2 additions & 2 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ let

# Examples
exTxStm32f407 = writeShellScriptBin "tx_stm32f407" ''
cargo run --release --example=tx_stm32f407 --features=stm32f407
cargo run --release --example=tx_stm32f407 --features=tx_stm32f407
'';
exTcpStm32f407 = writeShellScriptBin "tcp_stm32f407" ''
cargo run --release --example=tcp_stm32f407 --features=stm32f407,smoltcp-phy-all
cargo run --release --example=tcp_stm32f407 --features=tcp_stm32f407
'';
in
stdenv.mkDerivation {
Expand Down

0 comments on commit 14a75c9

Please sign in to comment.