1 files changed, 34 insertions, 9 deletions

diff --git a/README.md b/README.md
index 910cb08..b1c6b60 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/dvhdr/launchpad-pro.svg?branch=master)](https://travis-ci.org/dvhdr/launchpad-pro)
+
 # Launchpad Pro
 Open source firmware for the Novation Launchpad Pro grid controller!  By customising this code, you can:
 
@@ -18,8 +20,21 @@ We could have released the full source for the factory shipping firmware, but we
 
 I'm sure you'll have feedback for us, so please do get in touch!  I'm [blogging the process too](http://launchpadfirmware.tumblr.com/) if you'd like to read my musings.
 
-# Installation
-This project uses [Vagrant](https://www.vagrantup.com/) to manage the build environment. As such, you need to:
+# Setup the Development Environment
+
+## Using Docker
+
+If your system is running docker you can easily setup the environment with:
+
+```
+docker build -t novation-launchpad-pro-dev .
+docker run -it -v $(pwd):/launchpad-pro novation-launchpad-pro-dev
+make
+```
+
+## Using Vagrant
+
+To use [Vagrant](https://www.vagrantup.com/) to manage the build environment you need to:
 
 1. Clone this repository on your host computer (if using the command line, make sure you `git clone --recursive`).
 2. Install [Vagrant](https://www.vagrantup.com/)
@@ -29,21 +44,21 @@ This project uses [Vagrant](https://www.vagrantup.com/) to manage the build envi
 
 If you have a poor internet connection, ummm, find a better one :)
 
-# Building
+### Building
 Once your new "box" is up and running, you can build the app in one of two ways.  In the spirit of experimentation, we've created a full Eclipse development environment for you to use.  However, you might prefer to do things on the command line.
 
-#  To use the command line interface:
+###  To use the command line interface:
 1. SSH into the Vagrant "box" by doing `vagrant ssh`
 2. At the command prompt, simply type `make`
 
-#  To build using the Eclipse GUI
+### To build using Eclipse GUI
 
 **Make sure you wait until the `vagrant up` command has fully completed** before logging in to your VM.  The GUI appears long before the provisioning script finishes.  If you don't, you'll have to log out and log back in again before Eclipse can see the correct path.
 
 1. Log in to the Ubuntu GUI (the password is, as is the convention, **vagrant**).
 2. Launch Eclipse from the doodah on the top left (it's a bit like Spotlight)
 3. Accept the default when Eclipse asks you for a workspace.  I can't figure out how to store the workspace in source control, so you need to import it.
-4. Click "Workbench" at the Ecliplse startup screen.
+4. Click "Workbench" at the Eclipse startup screen.
 5. In Eclipse, choose "File->Import..."
 6. Under "C/C++", choose "Existing Code as Makefile Project", hit "Next"
 7. Give the project any name you like (launchpad?)
@@ -54,8 +69,18 @@ Once your new "box" is up and running, you can build the app in one of two ways.
 
 Either of the above methods will generate the firmware image, `launchpad_pro.syx`, in the project `build` directory.  You can then upload this to your Launchpad Pro from the host!
 
+## Using macOS
+
+On macOS you can easily install the GCC ARM toolchain using the [homebrew package manager](http://brew.sh). The EABI tools are maintained in an external repository which you need to put on tap first. You can then run ```make``` to directly compile the code:
+
+```
+brew tap PX4/homebrew-px4
+brew install gcc-arm-none-eabi
+make
+```
+
 # Uploading to a Launchpad Pro
-Now you've got some nice new code to run! To upload it to your Launchpad Pro, you'll need a sysex tool for your host platform (I'd love to get it working from the virtual machine, but that's for later).  I recommend [Sysex Librarian](http://www.snoize.com/SysExLibrarian/) on OS X, and [MIDI OX](http://www.midiox.com/) on Windows.  On Linux, I'll bet you already have a tool in mind.
+Now you've got some nice new code to run! To upload it to your Launchpad Pro, you'll need a sysex tool for your host platform (I'd love to get it working from the virtual machine, but that's for later).  I recommend [Sysex Librarian](http://www.snoize.com/SysExLibrarian/) on macOS, and [MIDI OX](http://www.midiox.com/) on Windows.  On Linux, I'll bet you already have a tool in mind.
 
 I won't describe how to use these tools, I'm sure you already know - and if you don't, their documentation is superior to mine!  Here's what you need to do:
 
@@ -91,7 +116,7 @@ We decided not to support or encourage using a hardware debugger, as opening a L
 
 Instead, you're going to have to do things the old fashioned way - by blinking LEDs or sending MIDI messages (though hopefully no need for a 'scope!).  For what it's worth, that's the way I've developed this version of the firmware - dogfooding all the way ;)
 
-If do you want to debug interactively (and of course you do), you can use the interactive desktop simulator on OS X:  
+If do you want to debug interactively (and of course you do), you can use the interactive desktop simulator on macOS:
 
 1. Build the Xcode project located in `/tools/osx`
 2. Connect your Launchpad Pro
@@ -128,4 +153,4 @@ It appears that VirtualBox does not yet work on Windows 10.
 If your connection drops out while updating the Vagrant box, you can get stuck, unable to `vagrant up`.  To resolve, you need to delete the temp file - `~/vagrant.d/tmp`.
 
 # Firmware development tips
-OK - we're not going to need to use the MISRA rules, but there are a few things to avoid.  Dynamic memory allocation is a no (well it will work, but it's best avoided). Floating point will work, but it's implemented in software and will be slooooow.   C++ ought to work, but you'll definitely want to avoid exceptions and RTTI!
\ No newline at end of file
+OK - we're not going to need to use the MISRA rules, but there are a few things to avoid.  Dynamic memory allocation is a no (well it will work, but it's best avoided). Floating point will work, but it's implemented in software and will be slooooow.   C++ ought to work, but you'll definitely want to avoid exceptions and RTTI!