Merge pull request #55 from embed-rs/smoltcp

Use smoltcp for networking

Author: phil-opp

.cargo/config

@@ -1,2 +1,11 @@
+[target.thumbv7em-none-eabihf]
+runner = 'sh gdb.sh'
+# runner='gdb.bat' 
+rustflags = [
+  "-C", "link-arg=-Tstm32f7.ld",
+  "-C", "linker=arm-none-eabi-ld",
+  "-Z", "linker-flavor=ld",
+  "-Z", "thinlto=no",
+]
 [build]
-target = "stm32f7"
+target = "thumbv7em-none-eabihf"

.gdbinitv8

@@ -0,0 +1,38 @@
+define reset
+    # reset board by setting the SYSRESETREQ bit it the AIRCR register
+    # see http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0552a/Cihehdge.html
+    set *(0xE000ED0C_usize as *const usize) = 0x05fa0004
+end
+
+define load-reset
+    reset
+    load
+    reset
+end
+
+define lr
+    load-reset
+end
+
+define lrc
+    reset
+    load
+    reset
+    continue
+end
+
+define semihosting-enable
+  source semihosting.py
+  catch signal SIGTRAP
+  commands
+    silent
+    if (*($pc as *const usize) & 0xff) == 0xab
+      pi SemiHostHelper.on_break()
+      set $pc = $pc + 2
+      continue
+    else
+      echo \n
+      frame
+    end
+  end
+end

.travis.yml

@@ -10,6 +10,14 @@ before_script:
 
 script:
 - docker run stm32f7-discovery sh -c "
-    xargo build;
-    cd blinking_led && xargo update && xargo build
+    set -e;
+    pwd; ls;
+    echo `pwd`;
+    cargo build;
+    cd blinking_led;
+    cargo update;
+    cargo build;
+    cd ../blinking_led_with_interrupts;
+    cargo update;
+    cargo build;
   "

.vscode/settings.json

@@ -15,9 +15,8 @@ cortex-m = "0.1.4"
 r0 = "0.1.0"
 spin = "0.4.5"
 volatile = "0.2.1"
-net = {git = "https://github.com/embed-rs/net.git"}
 rusttype = {git = "https://github.com/phil-opp/rusttype.git", branch = "no_std"}
-alloc-cortex-m = {git = "https://github.com/f-bro/alloc-cortex-m.git", branch = "new-alloc-api"}
+alloc-cortex-m = {git = "https://github.com/embed-rs/alloc-cortex-m.git", branch = "master" }
 bitflags = "0.7.0"
 
 [dependencies.arrayvec]
@@ -27,6 +26,11 @@ version = "0.3.20"
 [dependencies.embedded_stm32f7]
 git = "https://github.com/embed-rs/embedded_stm32f7.git"
 
+[dependencies.smoltcp]
+git = "https://github.com/m-labs/smoltcp.git"
+default-features = false
+features = ["alloc", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp", "proto-ipv4"]
+
 [profile]
 
 [profile.release]

Cargo.lock

@@ -12,6 +12,7 @@ RUN set -ex; \
     apt-get clean -q -y; \
     rm -rf /var/lib/apt/lists/*; \
     cd ..; \
-    cargo install xargo; \
-    cd myapp; \
-    rustup component add rust-src;
+    rustup default nightly-2018-04-10; \
+    rustup target add thumbv7em-none-eabihf; \
+    cd myapp;
+    

Cargo.toml

@@ -1,5 +1,14 @@
 # override the recursive dependency via git to use a path dependency instead
 paths = [".."]
 
+[target.thumbv7em-none-eabihf]
+runner = 'sh gdb.sh'
+# runner='gdb.bat' 
+rustflags = [
+  "-C", "link-arg=-Tstm32f7.ld",
+  "-C", "linker=arm-none-eabi-ld",
+  "-Z", "linker-flavor=ld",
+  "-Z", "thinlto=no",
+]
 [build]
-target = "stm32f7"
+target = "thumbv7em-none-eabihf"

Dockerfile

@@ -0,0 +1,38 @@
+define reset
+    # reset board by setting the SYSRESETREQ bit it the AIRCR register
+    # see http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0552a/Cihehdge.html
+    set *(0xE000ED0C_usize as *const usize) = 0x05fa0004
+end
+
+define load-reset
+    reset
+    load
+    reset
+end
+
+define lr
+    load-reset
+end
+
+define lrc
+    reset
+    load
+    reset
+    continue
+end
+
+define semihosting-enable
+  source semihosting.py
+  catch signal SIGTRAP
+  commands
+    silent
+    if (*($pc as *const usize) & 0xff) == 0xab
+      pi SemiHostHelper.on_break()
+      set $pc = $pc + 2
+      continue
+    else
+      echo \n
+      frame
+    end
+  end
+end