Modernize libtock-rs

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "tock"]
+	path = tock
+	url = https://github.com/helena-project/tock
+[submodule "xargo"]
+	path = xargo
+	url = https://github.com/japaric/xargo

.travis.yml

@@ -0,0 +1,23 @@
+language: rust
+rust:
+  - nightly-2018-02-23
+
+os:
+  - linux
+
+cache:
+  directories:
+    - $HOME/.cargo
+    - xargo/target
+    - tock/userland/tools/elf2tbf/target
+
+install:
+  - wget -c https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2016q4/gcc-arm-none-eabi-6_2-2016q4-20161216-linux.tar.bz2
+  - tar -xjf gcc-arm-none-eabi-6_2-2016q4-20161216-linux.tar.bz2
+  - rustup component add rust-src
+
+script:
+  - export PATH="$PATH:gcc-arm-none-eabi-6_2-2016q4/bin"
+  - export RUSTFLAGS="$RUSTFLAGS -D warnings"
+  - cargo test --lib
+  - ./build_examples.sh

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "editor.formatOnSave": true,
+    "rust-client.channel": "nightly-2018-02-23",
+}

Cargo.toml

@@ -5,7 +5,12 @@ authors = ["Tock Project Developers <tock-dev@googlegroups.com>"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-linked_list_allocator = "0.4.3"
+linked_list_allocator = "0.5.0"
+
+[dev-dependencies]
+corepack = { version="~0.3.1", default-features=false, features = ["alloc"] }
+serde_derive = { version = "~1.0.10", default-features = false }
+serde = { version = "~1.0.10", default-features = false }
 
 [profile.dev]
 panic = "abort"

README.md

@@ -1,27 +1,18 @@
+[![Build Status](https://travis-ci.org/torfmaster/libtock-rs.svg?branch=master)](https://travis-ci.org/torfmaster/libtock-rs)
 # libtock-rs
 Rust userland library for Tock (WIP)
 
 ## Getting Started
 
 This project is nascent and still under heavy development, but first steps:
 
-1. First, update rustup to ensure you have the latest toolchain available:
+1. Ensure you have a working toolchain available:
 
-    `rustup update`
-
-    or
-
-    `rustup install nightly`
+    `rustup install nightly-2017-12-16`
 
-2. Get a copy of the latest nightly, in this repo's root:
+2. Get a copy of this toolchain, in this repo's root:
 
-    `rustup override set nightly`
-
-    Your rustc should be at least this new:
-    ```
-    $ rustc --version
-    rustc 1.21.0-nightly (7ac979d8c 2017-08-16)
-    ```
+    `rustup override set nightly-2017-12-16`
 
 3. Need to grab a copy of the rust sources:
 

build_examples.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -eux
+export RUST_TARGET_PATH=`pwd`
+export CARGO_INCREMENTAL=0
+
+cargo run --manifest-path xargo/Cargo.toml -- build --release --target=thumbv7em-tock-eabi --examples

examples/ble_ess.rs

@@ -8,6 +8,8 @@ use alloc::fmt::Write;
 use tock::console::Console;
 use tock::ipc::ble_ess::{self, ReadingType};
 use tock::sensors::*;
+use tock::timer;
+use tock::timer::Duration;
 
 fn main() {
     let mut console = Console::new();
@@ -17,7 +19,7 @@ fn main() {
         Ok(ess) => ess,
         _ => {
             write!(&mut console, "BLE IPC Service not installed\n").unwrap();
-            return
+            return;
         }
     };
     write!(&mut console, "Found BLE IPC Service\n").unwrap();
@@ -26,14 +28,13 @@ fn main() {
     let mut temperature = TemperatureSensor;
     let mut light = AmbientLightSensor;
     loop {
-
         // Temperature
         let temp = temperature.read();
         write!(&mut console, "Temperature: {}\n", temp).unwrap();
         if let Err(_) = ess.set_reading(ReadingType::Temperature, temp) {
             write!(&mut console, "Failed to set temperature\n").unwrap_or(());
         }
-        
+
         // Light
         let lx = light.read();
         write!(&mut console, "Light:       {}\n", lx).unwrap();
@@ -48,7 +49,6 @@ fn main() {
             write!(&mut console, "Failed to set temperature\n").unwrap_or(());
         }
 
-        tock::timer::delay_ms(5000);
+        timer::sleep(Duration::from_ms(5000))
     }
 }
-

examples/ble_scanning.rs

@@ -0,0 +1,49 @@
+#![no_std]
+#![feature(alloc)]
+
+extern crate alloc;
+extern crate corepack;
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
+extern crate tock;
+
+// Macro usages are not detected
+#[allow(unused_imports)]
+use alloc::*;
+use tock::ble_parser;
+use tock::led;
+use tock::simple_ble::BleDriver;
+use tock::syscalls;
+
+#[derive(Deserialize)]
+struct LedCommand {
+    pub nr: u8,
+    pub st: bool,
+}
+
+fn main() {
+    let buffer = [0; tock::simple_ble::BUFFER_SIZE_SCAN];
+    BleDriver::start(&buffer, |_: usize, _: usize| {
+        match ble_parser::find(&buffer, tock::simple_ble::gap_data::SERVICE_DATA as u8) {
+            Some(payload) => {
+                let payload: Vec<u8> = payload.iter().map(|&x| *x).collect::<Vec<u8>>();
+                let msg: LedCommand = corepack::from_bytes(payload.as_slice()).unwrap();
+                let msg_led = led::get(msg.nr as isize);
+                match msg_led {
+                    Some(msg_led) => if msg.st {
+                        msg_led.on();
+                    } else {
+                        msg_led.off();
+                    },
+                    _ => (),
+                }
+            }
+            None => (),
+        }
+    }).unwrap();
+
+    loop {
+        syscalls::yieldk();
+    }
+}

examples/blink.rs

@@ -2,14 +2,15 @@
 
 extern crate tock;
 
-use tock::{led, timer};
+use tock::led;
+use tock::timer;
+use tock::timer::Duration;
 
 fn main() {
-    let led_count = led::count();
+    let led = led::get(0).unwrap();
+
     loop {
-        for i in 0..led_count {
-            led::toggle(i as u32);
-            timer::delay_ms(500);
-        }
+        led.toggle();
+        timer::sleep(Duration::from_ms(500));
     }
 }

examples/button_read.rs

@@ -0,0 +1,27 @@
+#![feature(alloc)]
+#![no_std]
+
+extern crate alloc;
+extern crate tock;
+
+use alloc::string::String;
+use tock::buttons;
+use tock::buttons::ButtonState;
+use tock::console::Console;
+use tock::timer;
+use tock::timer::Duration;
+
+fn main() {
+    let mut console = Console::new();
+    let mut buttons = buttons::with_callback(|_, _| {}).unwrap();
+    let mut button = buttons.iter_mut().next().unwrap();
+    let button = button.enable().unwrap();
+
+    loop {
+        match button.read() {
+            ButtonState::Pressed => console.write(String::from("pressed\n")),
+            ButtonState::Released => console.write(String::from("released\n")),
+        }
+        timer::sleep(Duration::from_ms(500));
+    }
+}

examples/button_subscribe.rs

@@ -0,0 +1,36 @@
+#![feature(alloc)]
+#![no_std]
+
+extern crate alloc;
+extern crate tock;
+
+use alloc::string::String;
+use tock::buttons;
+use tock::buttons::ButtonState;
+use tock::console::Console;
+use tock::fmt;
+use tock::timer;
+use tock::timer::Duration;
+
+// FIXME: Hangs up when buttons are pressed rapidly - problem in console?
+fn main() {
+    let mut console = Console::new();
+
+    let mut buttons = buttons::with_callback(|button_num: usize, state| {
+        console.write(String::from("\nButton: "));
+        console.write(fmt::u32_as_hex(button_num as u32));
+        console.write(String::from(" - State: "));
+        console.write(String::from(match state {
+            ButtonState::Pressed => "pressed",
+            ButtonState::Released => "released",
+        }));
+    }).unwrap();
+
+    for mut button in &mut buttons {
+        button.enable().unwrap();
+    }
+
+    loop {
+        timer::sleep(Duration::from_ms(500));
+    }
+}

examples/gpio.rs

@@ -0,0 +1,20 @@
+#![no_std]
+
+extern crate tock;
+
+use tock::gpio::GpioPinUnitialized;
+use tock::timer;
+use tock::timer::Duration;
+
+// Example works on P0.03
+fn main() {
+    let pin = GpioPinUnitialized::new(0);
+    let pin = pin.open_for_write().unwrap();
+
+    loop {
+        pin.set_high();
+        timer::sleep(Duration::from_ms(500));
+        pin.set_low();;
+        timer::sleep(Duration::from_ms(500));
+    }
+}

examples/gpio_read.rs

@@ -0,0 +1,27 @@
+#![feature(alloc)]
+#![no_std]
+
+extern crate alloc;
+extern crate tock;
+
+use alloc::string::String;
+use tock::console::Console;
+use tock::gpio::{GpioPinUnitialized, InputMode};
+use tock::timer;
+use tock::timer::Duration;
+
+// example works on p0.03
+fn main() {
+    let mut console = Console::new();
+    let pin = GpioPinUnitialized::new(0);
+    let pin = pin.open_for_read(None, InputMode::PullDown).unwrap();
+
+    loop {
+        if pin.read() {
+            console.write(String::from("true\n"));
+        } else {
+            console.write(String::from("false\n"));
+        }
+        timer::sleep(Duration::from_ms(500));
+    }
+}

examples/hello.rs

@@ -1,17 +1,22 @@
-#![feature(asm,alloc)]
+#![feature(alloc)]
 #![no_std]
 
 extern crate alloc;
 extern crate tock;
 
-use alloc::fmt::Write;
+use alloc::string::String;
 use tock::console::Console;
+use tock::timer;
+use tock::timer::Duration;
 
+// TODO: Make format!/alloc::string::ToString work
 fn main() {
     let mut console = Console::new();
+
     for i in 0.. {
-        write!(&mut console, "Hello world! {}\n", i).unwrap();
-        tock::timer::delay_ms(500);
+        console.write(String::from("Hello world! "));
+        console.write(tock::fmt::u32_as_decimal(i));
+        console.write(String::from("\n"));
+        timer::sleep(Duration::from_ms(500))
     }
 }
-