Merge branch 'master' into dev

derailed · Jul 10, 2014 · 1700c12 · 1700c12
2 parents d7b2d04 + be058d5
commit 1700c12
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -76,23 +76,23 @@ func main() {
 ## Hardware Support
 Gobot has a extensible system for connecting to hardware devices. The following robotics and physical computing platforms are currently supported:
 
-  - [Ardrone](http://ardrone2.parrot.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/ardrone)
-  - [Arduino](http://www.arduino.cc/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/firmata)
-  - [Beaglebone Black](http://beagleboard.org/Products/BeagleBone+Black/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/beaglebone)
-  - [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/joystick)
-  - [Digispark](http://digistump.com/products/1) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/digispark)
-  - [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/joystick)
-  - [Leap Motion](https://www.leapmotion.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/leapmotion)
-  - [Neurosky](http://neurosky.com/products-markets/eeg-biosensors/hardware/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/neurosky)
-  - [OpenCV](http://opencv.org/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/opencv)
-  - [Spark](https://www.spark.io/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/spark)
-  - [Sphero](http://www.gosphero.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/dev/platforms/sphero)
+  - [Ardrone](http://ardrone2.parrot.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/ardrone)
+  - [Arduino](http://www.arduino.cc/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/firmata)
+  - [Beaglebone Black](http://beagleboard.org/Products/BeagleBone+Black/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/beaglebone)
+  - [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/joystick)
+  - [Digispark](http://digistump.com/products/1) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/digispark)
+  - [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/joystick)
+  - [Leap Motion](https://www.leapmotion.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/leapmotion)
+  - [Neurosky](http://neurosky.com/products-markets/eeg-biosensors/hardware/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/neurosky)
+  - [OpenCV](http://opencv.org/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/opencv)
+  - [Spark](https://www.spark.io/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/spark)
+  - [Sphero](http://www.gosphero.com/) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/sphero)
 
 
 Support for many devices that use General Purpose Input/Output (GPIO) have
 a shared set of drivers provided using the cylon-gpio module:
 
-  - [GPIO](https://en.wikipedia.org/wiki/General_Purpose_Input/Output) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/dev/platforms/gpio)
+  - [GPIO](https://en.wikipedia.org/wiki/General_Purpose_Input/Output) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/master/platforms/gpio)
     - Analog Sensor
     - Button
     - Digital Sensor
@@ -103,7 +103,7 @@ a shared set of drivers provided using the cylon-gpio module:
 Support for devices that use Inter-Integrated Circuit (I2C) have a shared set of
 drivers provided using the gobot-i2c module:
 
-  - [I2C](https://en.wikipedia.org/wiki/I%C2%B2C) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/dev/platforms/i2c)
+  - [I2C](https://en.wikipedia.org/wiki/I%C2%B2C) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/master/platforms/i2c)
     - BlinkM
     - HMC6352
     - Wii Nunchuck Controller

diff --git a/platforms/ardrone/README.md b/platforms/ardrone/README.md
@@ -9,7 +9,7 @@ https://github.com/hybridgroup/gobot
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/ardrone
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/ardrone
 ```
 ## Using
 ```go

diff --git a/platforms/beaglebone/README.md b/platforms/beaglebone/README.md
@@ -6,7 +6,7 @@ This package provides the Gobot adaptor for the [Beaglebone Black](http://beagle
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/beaglebone
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/gobot/beaglebone
 ```
 
 ## Cross compiling for the Beaglebone Black

diff --git a/platforms/digispark/README.md b/platforms/digispark/README.md
@@ -22,9 +22,9 @@ To install libusb on linux:
 $ sudo apt-get install libusb-dev
 ```
 
-Now you can install the package with 
+Now you can install the package with
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/digispark
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/digispark
 ```
 
 ## Examples
@@ -57,7 +57,7 @@ func main() {
 ```
 ## Connecting to Digispark
 
-If your Digispark already has the Little Wire protocol firmware installed, you can connect right away with Gobot. 
+If your Digispark already has the Little Wire protocol firmware installed, you can connect right away with Gobot.
 
 Otherwise, for instructions on how to install Little Wire on a Digispark check out http://digistump.com/board/index.php/topic,160.0.html
 

diff --git a/platforms/firmata/README.md b/platforms/firmata/README.md
@@ -1,11 +1,11 @@
 # Firmata
 
-This package provides the adaptor for microcontrollers such as Arduino that support the [Firmata](http://firmata.org/wiki/Main_Page) protocol 
+This package provides the adaptor for microcontrollers such as Arduino that support the [Firmata](http://firmata.org/wiki/Main_Page) protocol
 
 ## Getting Started
 
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/firmata
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/firmata
 ```
 
 ## Example

diff --git a/platforms/gpio/README.md b/platforms/gpio/README.md
@@ -6,7 +6,7 @@ This package provides drivers for [General Purpose Input/Output (GPIO)](https://
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/gpio
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/gpio
 ```
 
 ## Hardware Support

diff --git a/platforms/i2c/README.md b/platforms/i2c/README.md
@@ -6,7 +6,7 @@ This package provides drivers for [i2c](https://en.wikipedia.org/wiki/I%C2%B2C)d
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/i2c
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/i2c
 ```
 
 ## Hardware Support

diff --git a/platforms/joystick/README.md b/platforms/joystick/README.md
@@ -20,9 +20,9 @@ $ brew install sdl2
 $ sudo apt-get install libsdl2-2.0-0
 ```
 
-Now you can install the package with 
+Now you can install the package with
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/joystick
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/joystick
 ```
 
 ## Usage

diff --git a/platforms/leap/README.md b/platforms/leap/README.md
@@ -1,4 +1,4 @@
-# Leap 
+# Leap
 
 This package provides the Gobot adaptor and driver for the [Leap Motion](https://www.leapmotion.com/)
 
@@ -8,7 +8,7 @@ First install the [Leap Motion Software](https://www.leapmotion.com/setup)
 
 Now you can install the package with
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/leap
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/leap
 ```
 
 ## Example

diff --git a/platforms/neurosky/README.md b/platforms/neurosky/README.md
@@ -1,10 +1,10 @@
-# Neurosky 
+# Neurosky
 
 This package contains the Gobot adaptor and driver for the [Neurosky Mindwave Mobile EEG](http://store.neurosky.com/products/mindwave-mobile).
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/neurosky
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/neurosky
 ```
 
 ## How To Connect

diff --git a/platforms/opencv/README.md b/platforms/opencv/README.md
@@ -11,21 +11,21 @@ This package requires `opencv` to be installed on your system
 To install `opencv` on OSX using Homebrew:
 
 ```
-$ brew tap homebrew/science && brew install opencv 
+$ brew tap homebrew/science && brew install opencv
 ```
 
 ### Ubuntu
 
 Follow the official [OpenCV installation guide](http://docs.opencv.org/doc/tutorials/introduction/linux_install/linux_install.html)
 
-### Windows 
+### Windows
 
 Follow the official [OpenCV installation guide](http://docs.opencv.org/doc/tutorials/introduction/windows_install/windows_install.html#windows-installation)
 
 
-Now you can install the package with 
+Now you can install the package with
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/opencv
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/opencv
 ```
 
 ## Using

diff --git a/platforms/spark/README.md b/platforms/spark/README.md
@@ -4,7 +4,7 @@ This package provides the Gobot adaptor for the [Spark Core](https://www.spark.i
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/spark
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/spark
 ```
 
 ## Example

diff --git a/platforms/sphero/README.md b/platforms/sphero/README.md
@@ -4,7 +4,7 @@ This package provides the Gobot adaptor and driver for the [Sphero](http://www.g
 
 ## Installing
 ```
-go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/platforms/sphero
+go get github.com/hybridgroup/gobot && go install github.com/hybridgroup/gobot/platforms/sphero
 ```
 
 ## How To Connect