parrot: move both ARDrone and Bebop under Parrot package

Signed-off-by: deadprogram <[email protected]>
freeonce · Dec 7, 2016 · 95586fa · 95586fa
1 parent 8d43d00
commit 95586fa
Show file tree

Hide file tree

Showing 29 changed files with 20 additions and 18 deletions.
diff --git a/ci/travis.sh b/ci/travis.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PACKAGES=('gobot' 'gobot/api' 'gobot/sysfs' 'gobot/drivers/gpio' 'gobot/drivers/i2c' 'gobot/platforms/firmata/client' 'gobot/platforms/intel-iot/edison' 'gobot/platforms/intel-iot/joule' 'gobot/platforms/parrot/minidrone' 'gobot/platforms/sphero/ollie' $(ls ./platforms | sed -e 's/^/gobot\/platforms\//'))
+PACKAGES=('gobot' 'gobot/api' 'gobot/sysfs' 'gobot/drivers/gpio' 'gobot/drivers/i2c' 'gobot/platforms/firmata/client' 'gobot/platforms/intel-iot/edison' 'gobot/platforms/intel-iot/joule' 'gobot/platforms/parrot/ardrone' 'gobot/platforms/parrot/bebop' 'gobot/platforms/parrot/minidrone' 'gobot/platforms/sphero/ollie' $(ls ./platforms | sed -e 's/^/gobot\/platforms\//'))
 EXITCODE=0
 
 echo "mode: set" > profile.cov

diff --git a/examples/ardrone.go b/examples/ardrone.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/ardrone"
+	"github.com/hybridgroup/gobot/platforms/parrot/ardrone"
 )
 
 func main() {

diff --git a/examples/ardrone_face_tracking.go b/examples/ardrone_face_tracking.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/ardrone"
 	"github.com/hybridgroup/gobot/platforms/opencv"
+	"github.com/hybridgroup/gobot/platforms/parrot/ardrone"
 	cv "github.com/lazywei/go-opencv/opencv"
 )
 

diff --git a/examples/ardrone_ps3.go b/examples/ardrone_ps3.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/ardrone"
 	"github.com/hybridgroup/gobot/platforms/joystick"
+	"github.com/hybridgroup/gobot/platforms/parrot/ardrone"
 )
 
 type pair struct {

diff --git a/examples/bebop.go b/examples/bebop.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/bebop"
+	"github.com/hybridgroup/gobot/platforms/parrot/bebop"
 )
 
 func main() {

diff --git a/examples/bebop_ps3.go b/examples/bebop_ps3.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/bebop"
 	"github.com/hybridgroup/gobot/platforms/joystick"
+	"github.com/hybridgroup/gobot/platforms/parrot/bebop"
 )
 
 type pair struct {

diff --git a/examples/bebop_ps3_video.go b/examples/bebop_ps3_video.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/bebop"
 	"github.com/hybridgroup/gobot/platforms/joystick"
+	"github.com/hybridgroup/gobot/platforms/parrot/bebop"
 )
 
 type pair struct {

diff --git a/platforms/parrot/README.md b/platforms/parrot/README.md
@@ -3,4 +3,6 @@
 This package contains the Gobot adaptors and drivers for the various [Parrot]((https://www.parrot.com) drones.
 
 This package currently supports the following drones:
+- Parrot ARDrone 2.0
+- Parrot Bebop/Bebop 2
 - Parrot Minidrone
diff --git a/platforms/ardrone/LICENSE → platforms/parrot/ardrone/LICENSE b/platforms/ardrone/LICENSE → platforms/parrot/ardrone/LICENSE
diff --git a/platforms/ardrone/README.md → platforms/parrot/ardrone/README.md b/platforms/ardrone/README.md → platforms/parrot/ardrone/README.md
@@ -6,7 +6,7 @@ For more info about the ARDrone platform click [here](http://ardrone2.parrot.com
 
 ## How to Install
 ```
-go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/ardrone
+go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/parrot/ardrone
 ```
 ## How to Use
 ```go
@@ -16,12 +16,12 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/ardrone"
+	"github.com/hybridgroup/gobot/platforms/parrot/ardrone"
 )
 
 func main() {
-	ardroneAdaptor := ardrone.NewArdroneAdaptor("Drone")
-	drone := ardrone.NewArdroneDriver(ardroneAdaptor, "Drone")
+	ardroneAdaptor := ardrone.NewAdaptor("Drone")
+	drone := ardrone.NewDriver(ardroneAdaptor, "Drone")
 
 	work := func() {
 		drone.On(drone.Event("flying"), func(data interface{}) {

diff --git a/platforms/ardrone/ardrone_adaptor.go → platforms/parrot/ardrone/ardrone_adaptor.go b/platforms/ardrone/ardrone_adaptor.go → platforms/parrot/ardrone/ardrone_adaptor.go
diff --git a/platforms/ardrone/ardrone_adaptor_test.go → ...ms/parrot/ardrone/ardrone_adaptor_test.go b/platforms/ardrone/ardrone_adaptor_test.go → ...ms/parrot/ardrone/ardrone_adaptor_test.go
diff --git a/platforms/ardrone/ardrone_driver.go → platforms/parrot/ardrone/ardrone_driver.go b/platforms/ardrone/ardrone_driver.go → platforms/parrot/ardrone/ardrone_driver.go
diff --git a/platforms/ardrone/ardrone_driver_test.go → ...rms/parrot/ardrone/ardrone_driver_test.go b/platforms/ardrone/ardrone_driver_test.go → ...rms/parrot/ardrone/ardrone_driver_test.go
diff --git a/platforms/ardrone/doc.go → platforms/parrot/ardrone/doc.go b/platforms/ardrone/doc.go → platforms/parrot/ardrone/doc.go
@@ -3,7 +3,7 @@ Package ardrone provides the Gobot adaptor and driver for the Parrot Ardrone.
 
 Installing:
 
-	go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/ardrone
+	go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/parrot/ardrone
 
 Example:
 
@@ -13,7 +13,7 @@ Example:
 		"time"
 
 		"github.com/hybridgroup/gobot"
-		"github.com/hybridgroup/gobot/platforms/ardrone"
+		"github.com/hybridgroup/gobot/platforms/parrot/ardrone"
 	)
 
 	func main() {

diff --git a/platforms/ardrone/test_helper.go → platforms/parrot/ardrone/test_helper.go b/platforms/ardrone/test_helper.go → platforms/parrot/ardrone/test_helper.go
diff --git a/platforms/bebop/LICENSE → platforms/parrot/bebop/LICENSE b/platforms/bebop/LICENSE → platforms/parrot/bebop/LICENSE
diff --git a/platforms/bebop/README.md → platforms/parrot/bebop/README.md b/platforms/bebop/README.md → platforms/parrot/bebop/README.md
@@ -5,7 +5,7 @@ The Bebop from Parrot is an inexpensive quadcopter that is controlled using WiFi
 
 ## How to Install
 ```
-go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/bebop
+go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/parrot/bebop
 ```
 
 ## How to Use
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/bebop"
+	"github.com/hybridgroup/gobot/platforms/parrot/bebop"
 )
 
 func main() {

diff --git a/platforms/bebop/bebop_adaptor.go → platforms/parrot/bebop/bebop_adaptor.go b/platforms/bebop/bebop_adaptor.go → platforms/parrot/bebop/bebop_adaptor.go
@@ -1,7 +1,7 @@
 package bebop
 
 import (
-	"github.com/hybridgroup/gobot/platforms/bebop/client"
+	"github.com/hybridgroup/gobot/platforms/parrot/bebop/client"
 )
 
 // drone defines expected drone behaviour

diff --git a/platforms/bebop/bebop_adaptor_test.go → platforms/parrot/bebop/bebop_adaptor_test.go b/platforms/bebop/bebop_adaptor_test.go → platforms/parrot/bebop/bebop_adaptor_test.go
diff --git a/platforms/bebop/bebop_driver.go → platforms/parrot/bebop/bebop_driver.go b/platforms/bebop/bebop_driver.go → platforms/parrot/bebop/bebop_driver.go
diff --git a/platforms/bebop/bebop_driver_test.go → platforms/parrot/bebop/bebop_driver_test.go b/platforms/bebop/bebop_driver_test.go → platforms/parrot/bebop/bebop_driver_test.go
diff --git a/platforms/bebop/client/client.go → platforms/parrot/bebop/client/client.go b/platforms/bebop/client/client.go → platforms/parrot/bebop/client/client.go
diff --git a/platforms/bebop/client/constants.go → platforms/parrot/bebop/client/constants.go b/platforms/bebop/client/constants.go → platforms/parrot/bebop/client/constants.go
diff --git a/platforms/bebop/client/examples/ff.conf → ...orms/parrot/bebop/client/examples/ff.conf b/platforms/bebop/client/examples/ff.conf → ...orms/parrot/bebop/client/examples/ff.conf
diff --git a/platforms/bebop/client/examples/takeoff.go → ...s/parrot/bebop/client/examples/takeoff.go b/platforms/bebop/client/examples/takeoff.go → ...s/parrot/bebop/client/examples/takeoff.go
diff --git a/platforms/bebop/client/examples/video.go → ...rms/parrot/bebop/client/examples/video.go b/platforms/bebop/client/examples/video.go → ...rms/parrot/bebop/client/examples/video.go
diff --git a/platforms/bebop/doc.go → platforms/parrot/bebop/doc.go b/platforms/bebop/doc.go → platforms/parrot/bebop/doc.go
@@ -3,9 +3,9 @@ Package bebop provides the Gobot adaptor and driver for the Parrot Bebop.
 
 Installing:
 
-	go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/bebop
+	go get -d -u github.com/hybridgroup/gobot/... && go install github.com/hybridgroup/gobot/platforms/parrot/bebop
 
 For more information refer to the bebop README:
-https://github.com/hybridgroup/gobot/tree/master/platforms/bebop
+https://github.com/hybridgroup/gobot/tree/master/platforms/parrot/bebop
 */
 package bebop
diff --git a/platforms/bebop/test_helper.go → platforms/parrot/bebop/test_helper.go b/platforms/bebop/test_helper.go → platforms/parrot/bebop/test_helper.go