Merge pull request #72 from hdhoang/nightly-2018-08-24

upgrade to a recent nightly

.travis.yml

@@ -3,14 +3,8 @@ language: rust
 matrix:
   include:
     - os: osx
-      rust: nightly-2018-05-15
-    - rust: nightly-2018-05-15
-      addons:
-        apt:
-          sources:
-            - debian-sid
-          packages:
-            - binutils-arm-none-eabi
+      rust: nightly-2018-08-24
+    - rust: nightly-2018-08-24
 
 before_install:
 - |
@@ -27,19 +21,23 @@ before_install:
 
 install:
   - bash ./scripts/install.sh
+  - export PATH="$PATH:$PWD/gcc/bin"
 
 script:
   - make bloat
   - make
-  - cargo fmt --all -- --write-mode=diff
+  - cargo fmt --all -- --check
   - cargo build --features use_semihosting
 
 cache:
   cargo: true
+  directories:
+    - ${HOME}/gcc
 
 before_cache:
   # Travis can't cache files that are not readable by "others"
-  - chmod -R a+r $HOME/.cargo
+  - chmod -R a+r ${HOME}/.cargo
+  - chmod -R a+r ${HOME}/gcc
 
 before_deploy:
   - git config --local user.name "Andreas Heider"

Cargo.toml

@@ -14,14 +14,10 @@ bit_field = "0.9.0"
 cortex-m = "0.4.3"
 cortex-m-rt = "0.4"
 cortex-m-semihosting = "0.2.0"
-cortex-m-rtfm = "0.3.1"
+cortex-m-rtfm = "0.3.3"
 nb = "0.1.1"
 vcell = "0.1.0"
 
-[features]
-default = ["panic-abort"]
-use_semihosting = ["panic-semihosting"]
-
 [dependencies.embedded-hal]
 features = ["unproven"]
 version = "0.1.0"
@@ -34,13 +30,17 @@ version = "0.1.1"
 version = "0.2.0"
 
 [dependencies.panic-abort]
-version = "0.1.0"
+version = "0.2.0"
 optional = true
 
 [dependencies.panic-semihosting]
-version = "0.1.0"
+version = "0.3.0"
 optional = true
 
+[features]
+default = ["panic-abort"]
+use_semihosting = ["panic-semihosting"]
+
 [profile.release]
 debug = true
 lto = true

Makefile

@@ -15,7 +15,7 @@ openocd:
 	openocd -f openocd.cfg
 
 bloat:
-	cargo bloat $(BLOAT_ARGS) -n 50
+	cargo bloat $(BLOAT_ARGS) -n 50 --target thumbv7m-none-eabi
 
 fmt:
 	cargo fmt

README.md

@@ -110,11 +110,11 @@ Many fellow projects provide insights into the obins firmware and app protocol:
 - qmk ports: [josecostamartins'](https://github.com/josecostamartins/qmk_firmware/commits/anne_pro) and [dwhinham's](https://github.com/dwhinham/qmk_firmware/commits/anne_pro)
 
 
-To build your own firmware, you need the nightly-2018-05-15 rust toolchain with
-the following components:
+To build your own firmware, you need the nightly-2018-08-24 rust
+toolchain with the following components:
 
-- nightly rust as default: `rustup override set nightly-2018-05-15` within your checkout
-- thumbv7m std: `rustup target add thumbv7m-none-eabi`
+- rustup: to make use of the `rust-toolchain` file
+- thumbv7m std: `rustup target add thumbv7m-none-eabi` within your checkout
 - ARM linker: usually named `arm-none-eabi-ld`, please check with your OS
 
 Then, `make dfu` in the top directory will build your `anne-key.dfu`.

rust-toolchain

@@ -0,0 +1 @@
+nightly-2018-08-24

scripts/install.sh

@@ -10,6 +10,11 @@ main() {
             rustup component add rustfmt-preview
 
         which cargo-bloat || (cd /; cargo install cargo-bloat)
+
+        if [ ${TRAVIS_OS_NAME} != 'osx' ]; then
+            mkdir gcc
+            curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,7-2018-q2-update | tar --strip-components=1 -C gcc -xj
+        fi
 }
 
 main

src/bluetooth.rs

@@ -1,5 +1,3 @@
-#![feature(const_fn)]
-
 use super::hidreport::HidReport;
 use super::keyboard::Keyboard;
 use super::led::Led;
@@ -253,7 +251,8 @@ where
     }
 
     pub fn poll(&mut self, led: &mut Led<BUFFER>, keyboard: &mut Keyboard) {
-        let result = self.rx_transfer
+        let result = self
+            .rx_transfer
             .as_mut()
             .unwrap()
             .poll(&mut self.serial.usart);

src/keymatrix.rs

@@ -1,5 +1,3 @@
-#![feature(const_fn)]
-
 use bit_field::BitArray;
 use embedded_hal::digital::{InputPin, OutputPin};
 use hal::gpio::gpioa::*;

src/led.rs

@@ -237,7 +237,8 @@ where
     }
 
     pub fn poll(&mut self) {
-        let result = self.rx_transfer
+        let result = self
+            .rx_transfer
             .as_mut()
             .unwrap()
             .poll(&mut self.serial.usart);

src/main.rs

@@ -1,7 +1,6 @@
 #![feature(const_fn)]
 #![feature(never_type)]
 #![feature(non_exhaustive)]
-#![feature(proc_macro)]
 #![feature(unsize)]
 #![no_std]
 

src/serial/bluetooth_usart.rs

@@ -2,7 +2,7 @@ use embedded_hal::digital::OutputPin;
 use hal::dma::dma1::{C6, C7};
 use hal::gpio::gpioa::{PA1, PA2, PA3};
 use hal::gpio::{Alternate, Input, Output};
-use stm32l151::{USART2, RCC};
+use stm32l151::{RCC, USART2};
 
 use super::DmaUsart;
 

src/serial/led_usart.rs

@@ -2,7 +2,7 @@ use super::DmaUsart;
 use hal::dma::dma1::{C2, C3};
 use hal::gpio::gpiob::{PB10, PB11};
 use hal::gpio::{Alternate, Input};
-use stm32l151::{USART3, RCC};
+use stm32l151::{RCC, USART3};
 
 pub struct LedUsart {
     _pb10: PB10<Alternate>,