Merge pull request #54 from datdenkikniet/fix_broken

Fix incorrect startup sequence

Author: korken89

.cargo/config

@@ -1,18 +1,14 @@
-[target.thumbv7em-none-eabihf]
-runner = 'gdb'
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+runner = 'probe-run'
 rustflags = [
   "-C", "link-arg=-Tlink.x",
+  "-C", "link-arg=-Tdefmt.x",
 ]
 
-[target.thumbv7m-none-eabi]
-runner = 'gdb'
-rustflags = [
-  "-C", "link-arg=-Tlink.x",
-]
 
 [build]
 # Pick ONE of these compilation targets
 # target = "thumbv6m-none-eabi"    # Cortex-M0 and Cortex-M0+
-# target = "thumbv7m-none-eabi"    # Cortex-M3
+target = "thumbv7m-none-eabi"    # Cortex-M3
 # target = "thumbv7em-none-eabi"   # Cortex-M4 and Cortex-M7 (no FPU)
-target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
+# target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)

.github/workflows/build.yml

@@ -137,35 +137,67 @@ jobs:
         with:
           use-cross: false
           command: build
-          args: --target=${{ matrix.target }} --example pktgen --features stm32f429
+          args: --release --target=${{ matrix.target }} --example pktgen --features stm32f429
 
       - name: cargo build f4 example ip
         uses: actions-rs/cargo@v1
         with:
           use-cross: false
           command: build
-          args: --target=${{ matrix.target }} --example ip --features stm32f429,smoltcp-phy,log,smoltcp/socket-tcp,smoltcp/socket-icmp,smoltcp/log,smoltcp/verbose
+          args: --release --target=${{ matrix.target }} --example ip --features stm32f429,smoltcp-phy,log,smoltcp/socket-tcp,smoltcp/socket-icmp,smoltcp/log,smoltcp/verbose
 
       - name: cargo build f4 example arp
         uses: actions-rs/cargo@v1
         with:
           use-cross: false
           command: build
-          args: --target=${{ matrix.target }} --example arp --features stm32f407
+          args: --release --target=${{ matrix.target }} --example arp --features stm32f407
 
       - name: cargo build f4 example arp-smoltcp
         uses: actions-rs/cargo@v1
         with:
           use-cross: false
           command: build
-          args: --target=${{ matrix.target }} --example arp-smoltcp --features stm32f407,smoltcp-phy,smoltcp/socket-icmp
+          args: --release --target=${{ matrix.target }} --example arp-smoltcp --features stm32f407,smoltcp-phy,smoltcp/socket-icmp
 
       - name: cargo build f1 example ip
         uses: actions-rs/cargo@v1
         with:
           use-cross: false
           command: build
-          args: --target=${{ matrix.target }} --example ip-f107 --features stm32f107,smoltcp-phy,log,smoltcp/socket-tcp,smoltcp/socket-icmp,smoltcp/log,smoltcp/verbose
+          args: --release --target=${{ matrix.target }} --example ip-f107 --features stm32f107,smoltcp-phy,log,smoltcp/socket-tcp,smoltcp/socket-icmp,smoltcp/log,smoltcp/verbose
+  
+  rtic-echo-example:
+    name: rtic-echo example
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        target:
+          - thumbv7m-none-eabi
+        toolchain:
+          - stable
+        features:
+          - stm32f107
+          - stm32f407
+          - stm32f765
+          - rtic-echo-example-altpin,stm32f765
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust ${{ matrix.toolchain }} with target (${{ matrix.target }})
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          target: ${{ matrix.target }}
+          override: true
+
+      - name: build rtic-echo-example with features ${{ matrix.features }}
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: false
+          command: build
+          args: --release --target=${{ matrix.target }} --example rtic-echo --features rtic-echo-example,${{ matrix.features }}
 
   # Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
   #
@@ -179,6 +211,7 @@ jobs:
       - build
       - test
       - examples
+      - rtic-echo-example
     runs-on: ubuntu-20.04
     steps:
       - name: Mark the job as a success

Cargo.toml

@@ -27,14 +27,22 @@ ieee802_3_miim = { version = "0.7", optional = true }
 cortex-m = "0.7"
 log = { version = "0.4", optional = true }
 
+# For rtic-echo
+cortex-m-rtic = { version = "1.0", optional = true }
+defmt = { version = "0.3", optional = true }
+defmt-rtt = { version = "0.3", optional = true }
+panic-probe = { version = "0.3", optional = true, features = [ "print-defmt" ] }
+systick-monotonic = { version = "1.0", optional = true }
+fugit = { version = "0.3", optional = true}
+
 [dependencies.smoltcp]
 version = "0.8"
 default-features = false
 features = ["medium-ethernet", "proto-ipv4"]
 optional = true
 
 [features]
-default = [ "ieee802_3_miim" ]
+default = [ "ieee802_3_miim", "defmt" ]
 device-selected = []
 fence = []
 
@@ -61,6 +69,10 @@ stm32f779 = ["stm32f7xx-hal/stm32f779", "device-selected", "fence"]
 
 smoltcp-phy = ["smoltcp"]
 
+# Example features
+rtic-echo-example = [ "ieee802_3_miim", "cortex-m-rtic", "smoltcp-phy", "smoltcp/defmt", "smoltcp/medium-ethernet", "smoltcp/socket-tcp", "defmt", "defmt-rtt", "panic-probe", "systick-monotonic", "fugit" ]
+rtic-echo-example-altpin = [ ]
+
 [dev-dependencies]
 cortex-m = "0.7"
 cortex-m-rt = "0.7"
@@ -94,6 +106,10 @@ required-features = ["stm32f407"]
 name = "arp-smoltcp"
 required-features = ["stm32f407", "smoltcp-phy", "smoltcp/socket-icmp"]
 
+[[example]]
+name = "rtic-echo"
+required-features = [ "rtic-echo-example" ]
+
 [profile.release]
 debug = 2
 lto = true

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    #[cfg(feature = "stm32f1xx-hal")]
+    println!("cargo:rustc-link-search=memory.x")
+}