Juggle around the dev-dependencies feature set so that running the examples becomes

a lot more straightforward

Author: datdenkikniet

.github/workflows/build.yml

@@ -97,21 +97,14 @@ jobs:
     strategy:
       matrix:
         example:
-          - name: arp
-            example: arp
-            features: defmt
-          - name: ip
-            example: ip
-            features: defmt,smoltcp-phy,smoltcp/defmt,smoltcp/socket-tcp
-          - name: pktgen
-            example: pktgen
-            features: defmt
-          - name: rtic-echo
-            example: rtic-echo
-            features: rtic-echo-example
-          - name: rtic-echo with nucleo pins
-            example: rtic-echo
-            features: rtic-echo-example,example-nucleo-pins
+          - example: arp
+            features: ""
+          - example: ip
+            features: smoltcp-phy
+          - example: pktgen
+            features: ""
+          - example: rtic-echo
+            features: smoltcp-phy
         mcu:
           - stm32f107
           - stm32f429
@@ -130,7 +123,7 @@ jobs:
           rustup override set ${{ matrix.toolchain }}
           rustup target add ${{ matrix.target }}
 
-      - name: Build example ${{ matrix.example.name }} for ${{ matrix.mcu }}
+      - name: Build example ${{ matrix.example.example }} for ${{ matrix.mcu }}
         run: |
           cargo build --release --target=${{ matrix.target }} --example ${{ matrix.example.example}} --features ${{ matrix.mcu }},${{ matrix.example.features }}
 

Cargo.toml

@@ -63,9 +63,6 @@ stm32f779 = ["stm32f7xx-hal/stm32f779", "device-selected", "fence"]
 
 smoltcp-phy = ["smoltcp"]
 
-# Example features
-rtic-echo-example = [ "defmt", "smoltcp-phy", "smoltcp/defmt", "smoltcp/medium-ethernet", "smoltcp/socket-tcp" ]
-
 [dev-dependencies]
 cortex-m = { version = "0.7", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7"
@@ -74,25 +71,23 @@ cortex-m-rtic = "1.0"
 defmt-rtt = "0.4"
 panic-probe = { version = "0.3", features = [ "print-defmt" ] }
 systick-monotonic = "1.0"
-smoltcp = { version = "0.8", features = [ "medium-ethernet", "proto-ipv4", "socket-udp" ], default-features = false }
+smoltcp = { version = "0.8", features = [ "medium-ethernet", "proto-ipv4", "socket-udp", "socket-tcp", "defmt" ], default-features = false }
 
 [[example]]
 name = "pktgen"
 required-features = [ "defmt" ]
 
 [[example]]
 name = "ip"
-required-features = [
-    "defmt", "smoltcp-phy", "smoltcp/defmt", "smoltcp/socket-tcp"
-    ]
+required-features = [ "defmt", "smoltcp-phy" ]
 
 [[example]]
 name = "arp"
 required-features = [ "defmt" ]
 
 [[example]]
 name = "rtic-echo"
-required-features = [ "rtic-echo-example" ]
+required-features = [ "defmt" , "smoltcp-phy" ]
 
 [profile.release]
 debug = 2

README.md

@@ -108,7 +108,7 @@ For example, if we wish to build the `ip` example for an `stm32f429`, we should
 
 ```bash
 cargo build --release --example ip \
-        --features stm32f429,defmt,smoltcp-phy,smoltcp/defmt,smoltcp/socket-tcp \
+        --features stm32f429,smoltcp-phy \
         --target thumbv7em-none-eabihf
 ```
 
@@ -139,7 +139,7 @@ For example, if we wish to run the `rtic-echo` example on an `STM32F107RCT6`, we
 
 ```bash
 DEFMT_LOG=info PROBE_RUN_CHIP=STM32F107RC cargo run --release --example rtic-echo \
-    --features stm32f107,rtic-echo-example \
+    --features stm32f107,smoltcp-phy \
     --target thumbv7m-none-eabi
 ```