From eeea973f1ffcbdcd53278941bbc69aa862d286b4 Mon Sep 17 00:00:00 2001
From: Harry Ho <hh@m-labs.hk>
Date: Tue, 29 Dec 2020 11:50:35 +0800
Subject: [PATCH] Cargo.toml: Fix excessive dependency requirements

---
 Cargo.toml | 10 ++++++----
 shell.nix  |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b0680ea..550e917 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"]
@@ -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]
@@ -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
diff --git a/shell.nix b/shell.nix
index 8f5b837..fb65df1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -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 {