Merge branch 'master' into spi-transactions

.cargo/config

@@ -1,3 +1,17 @@
 
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
+
+# For some reason this _doesn't_ work here, but does for windows?
+#[target.armv7-unknown-linux-gnueabihf."usb-1.0"]
+#rustc-link-search = ["./cross/armhf/"]
+#rustc-link-lib = ["libusb-1.0"]
+
+[target.i686-pc-windows-gnu]
+linker = "i686-w64-mingw32-gcc-posix"
+ar = "i686-w64-mingw32-gcc-ar-posix"
+rustflags = "-C panic=abort"
+
+[target.i686-pc-windows-gnu."usb-1.0"]
+rustc-link-search = ["./cross/win/MinGW32/dll"]
+rustc-link-lib = ["libusb-1.0"]

.travis.yml

@@ -1,25 +1,39 @@
 language: rust
-cache: cargo
-matrix:
+
+cache: 
+  directories:
+    - $HOME/.cargo
+    - $HOME/.cache
+
+services:
+  - docker
+
+jobs:
   include:
   - env: TARGET=x86_64-unknown-linux-gnu
     os: linux
+
   - env: TARGET=armv7-unknown-linux-gnueabihf
     os: linux
-    addons:
-      apt:
-        packages:
-        - libc6-i386
-        - libc6-dev-i386
-        - gcc-arm-linux-gnueabihf
-        - libc6-armhf-cross
-        - libc6-dev-armhf-cross
+
+  - env: TARGET=x86_64-apple-darwin
+    os: osx
+
+  - env: TARGET=i686-pc-windows-gnu
+    os: linux
+
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" != "osx"]; then docker pull ryankurte/rust-embedded; fi
+
 install:
 - cargo fetch
-- rustup target add armv7-unknown-linux-gnueabihf
+- rustup target add $TARGET
 - rustup component add rustfmt
+
 script:
-- cargo build && cargo test && cargo build --target=$TARGET --release
+- ./cross/build.sh $TARGET
+
 before_deploy:
 - tar -cvf target/sx128x-util-$TARGET-$TRAVIS_TAG.tgz -C target/$TARGET/release/ sx128x-util
 

Cargo.toml

@@ -4,7 +4,7 @@ description = "Driver for the Semtec sx1280 2.4GHz RF IC"
 repository = "https://github.com/ryankurte/rust-radio-sx128x"
 license = "MPL-2.0"
 name = "radio-sx128x"
-version = "0.12.1"
+version = "0.13.0"
 
 
 [features]
@@ -16,20 +16,20 @@ util = ["structopt", "simplelog", "humantime", "pcap-file", "embedded-spi/hal",
 bitflags = "1.0.4"
 libc = "0.2.42"
 log = "0.4.6"
-radio = "0.5.0"
+radio = "0.6.0"
 pcap-file = { version = "1.1.1", optional = true }
 
 [dependencies.embedded-hal]
 features = ["unproven"]
 version = "0.2.3"
 
 [dependencies.embedded-spi]
-version = "0.6.0"
+version = "0.6.1"
 default-features = false
 
-[target.'cfg(unix)'.dependencies.embedded-spi]
-version = "0.6.0"
-features = [ "hal-linux" ]
+#[target.'cfg(unix)'.dependencies.embedded-spi]
+#version = "00.6.1
+#features = [ "hal-linux" ]
 
 [dependencies.humantime]
 optional = true

cross/build.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+RUSTC_WRAPPER="sccache"
+
+if [ -z "$SCCACHE_DIR"]; then
+    export SCCACHE_DIR=$HOME/.cache
+fi
+
+if [ -z "$CARGO_HOME"]; then
+    export CARGO_HOME=$HOME/.cargo
+fi
+
+
+DOCKER_CMD="docker run --rm -v=`pwd`:/work -v$CARGO_HOME/registry:/root/.cargo/registry -v$SCCACHE_DIR:/root/.cache --workdir=/work --user=:`id -g` --env PKG_CONFIG_ALLOW_CROSS=1"
+
+DOCKER_IMG=ryankurte/rust-embedded
+
+
+
+echo "Building for target: $1 (cargo cache: $CARGO_HOME, sccache $SCCACHE_DIR)"
+
+# Args for cross build for armhf, windows tricks are in .cargo/config
+ARMHF_ARGS="--env SYSROOT=/usr/arm-linux-gnueabihf --env PKG_CONFIG_ALLOW_CROSS=1 --env PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf/pkgconfig --env PKG_CONFIG_SYSROOT_DIR=/usr/arm-linux-gnueabihf --env PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib/arm-linux-gnueabihf --env PKG_CONFIG_SYSTEM_INCLUDE_PATH=/usr/arm-linux-gnueabihf/include"
+
+
+if [ "$1" == "x86_64-unknown-linux-gnu" ]; then
+    $DOCKER_CMD $DOCKER_IMG /bin/bash -c "cargo build --target=$1 --release --features embedded-spi/hal-linux"
+
+elif [ "$1" == "armv7-unknown-linux-gnueabihf" ]; then
+    $DOCKER_CMD $ARMHF_ARGS $DOCKER_IMG /bin/bash -c "cargo build --target=$1 --release --features embedded-spi/hal-linux"
+
+elif [ "$1" == "x86_64-apple-darwin" ]; then
+    cargo build --target=$1 --release
+
+elif [ "$1" == "i686-pc-windows-gnu" ]; then
+    $DOCKER_CMD $DOCKER_IMG /bin/bash -c "cargo build --target=$1 --release"
+
+else
+
+    echo "Unsupported target: $1"
+    exit 1
+
+fi