Merge branch 'master' into dev

Conflicts: CHANGELOG.md Makefile platforms/intel-iot/edison/edison_adaptor.go platforms/intel-iot/edison/edison_adaptor_test.go platforms/intel-iot/edison/pwm_pin.go platforms/intel-iot/intel-iot.go platforms/leap/leap_motion_adaptor.go platforms/leap/leap_motion_driver.go platforms/sphero/sphero_driver.go scripts/travis.sh version.go
jsyzthz · Nov 11, 2014 · b782498 · b782498
2 parents 8426639 + 8e8d990
commit b782498
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,12 +26,28 @@
   - sysfs
     - Add generic linux filesystem gpio implementation
 
+0.6.3
+---
+- Add support for the Intel Edison
+
+0.6.2
+---
+- cli
+  - Fix typo in generator
+- leap
+  - Fix incorrect Port reference
+  - Fix incorrect Event name
+- neurosky
+  - Fix incorrect Event names
+- sphero
+  - Correctly format output of GetRGB 
+>>>>>>> master
+
 0.6.1
 ---
 - cli
   - Fix template error in generator
 
-
 0.6  
 ---  
 - api

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 PACKAGES := gobot gobot/api gobot/platforms/intel-iot/edison gobot/sysfs $(shell ls ./platforms | sed -e 's/^/gobot\/platforms\//')
-
 .PHONY: test cover robeaux
 
 test:

diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ Gobot has a extensible system for connecting to hardware devices. The following
   - [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)
   - [Digispark](http://digistump.com/products/1) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/digispark)
+  - [Intel Edison](http://www.intel.com/content/www/us/en/do-it-yourself/edison.html) <=> [Library](https://github.com/hybridgroup/gobot/tree/master/platforms/intel-iot/edison)
   - [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)

diff --git a/platforms/digispark/README.md b/platforms/digispark/README.md
@@ -11,7 +11,7 @@ This package requires `libusb`.
 To install `libusb` on OSX using Homebrew:
 
 ```
-$ brew install libusb
+$ brew install libusb && brew install libusb-compat
 ```
 
 ### Ubuntu

diff --git a/platforms/sphero/sphero_driver.go b/platforms/sphero/sphero_driver.go
@@ -183,7 +183,11 @@ func (s *SpheroDriver) SetRGB(r uint8, g uint8, b uint8) {
 
 // GetRGB returns the current r, g, b value of the Sphero
 func (s *SpheroDriver) GetRGB() []uint8 {
-	return s.getSyncResponse(s.craftPacket([]uint8{}, 0x02, 0x22))
+	buf := s.getSyncResponse(s.craftPacket([]uint8{}, 0x02, 0x22))
+	if len(buf) == 9 {
+		return []uint8{buf[5], buf[6], buf[7]}
+	}
+	return []uint8{}
 }
 
 // SetBackLED sets the Sphero Back LED to the specified brightness
@@ -244,7 +248,7 @@ func (s *SpheroDriver) getSyncResponse(packet *packet) []byte {
 				return response
 			}
 		}
-		time.Sleep(10 * time.Microsecond)
+		time.Sleep(100 * time.Microsecond)
 	}
 
 	return []byte{}