examples: remove Master unless needed for less code

Signed-off-by: deadprogram <[email protected]>
eyelight · Oct 18, 2016 · 4230d2a · 4230d2a
1 parent 2f9d0fd
commit 4230d2a
Show file tree

Hide file tree

Showing 126 changed files with 181 additions and 597 deletions.
diff --git a/examples/ardrone.go b/examples/ardrone.go
@@ -8,8 +8,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	ardroneAdaptor := ardrone.NewAdaptor()
 	drone := ardrone.NewDriver(ardroneAdaptor)
 
@@ -27,7 +25,6 @@ func main() {
 		[]gobot.Device{drone},
 		work,
 	)
-	gbot.AddRobot(robot)
 
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/ardrone_face_tracking.go b/examples/ardrone_face_tracking.go
@@ -16,8 +16,6 @@ import (
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
-	gbot := gobot.NewMaster()
-
 	_, currentfile, _, _ := runtime.Caller(0)
 	cascade := path.Join(path.Dir(currentfile), "haarcascade_frontalface_alt.xml")
 	window := opencv.NewWindowDriver()
@@ -76,7 +74,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/ardrone_ps3.go b/examples/ardrone_ps3.go
@@ -15,8 +15,6 @@ type pair struct {
 }
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	joystickAdaptor := joystick.NewAdaptor()
 	stick := joystick.NewDriver(joystickAdaptor,
 		"./platforms/joystick/configs/dualshock3.json",
@@ -109,9 +107,7 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
 
 func validatePitch(data float64, offset float64) float64 {

diff --git a/examples/audio.go b/examples/audio.go
@@ -8,8 +8,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	e := audio.NewAdaptor()
 	laser := audio.NewDriver(e, "./examples/laser.mp3")
 
@@ -25,7 +23,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_basic_direct_pin.go b/examples/beaglebone_basic_direct_pin.go
@@ -6,9 +6,7 @@ import (
 )
 
 func main() {
-
 	// Use Gobot to control BeagleBone's digital pins directly
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	gpioPin := gpio.NewDirectPinDriver(beagleboneAdaptor, "P9_12")
 

diff --git a/examples/beaglebone_blink.go b/examples/beaglebone_blink.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	led := gpio.NewLedDriver(beagleboneAdaptor, "P9_12")
 
@@ -26,7 +24,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_blink_usr_led.go b/examples/beaglebone_blink_usr_led.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	led := gpio.NewLedDriver(beagleboneAdaptor, "usr0")
 
@@ -26,7 +24,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_blinkm.go b/examples/beaglebone_blinkm.go
@@ -10,7 +10,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	blinkm := i2c.NewBlinkMDriver(beagleboneAdaptor)
 
@@ -31,7 +30,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_button.go b/examples/beaglebone_button.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	button := gpio.NewButtonDriver(beagleboneAdaptor, "P8_9")
 
@@ -29,6 +27,6 @@ func main() {
 		[]gobot.Device{button},
 		work,
 	)
-	gbot.AddRobot(robot)
-	gbot.Start()
+
+	robot.Start()
 }
diff --git a/examples/beaglebone_direct_pin.go b/examples/beaglebone_direct_pin.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	led := gpio.NewDirectPinDriver(beagleboneAdaptor, "P8_10")
 	button := gpio.NewDirectPinDriver(beagleboneAdaptor, "P8_9")
@@ -32,7 +30,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_led_brightness.go b/examples/beaglebone_led_brightness.go
@@ -9,7 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	led := gpio.NewLedDriver(beagleboneAdaptor, "P9_14")
 
@@ -32,7 +31,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_led_brightness_with_analog_input.go b/examples/beaglebone_led_brightness_with_analog_input.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	sensor := gpio.NewAnalogSensorDriver(beagleboneAdaptor, "P9_33")
 	led := gpio.NewLedDriver(beagleboneAdaptor, "P9_14")
@@ -32,7 +30,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_makey_button.go b/examples/beaglebone_makey_button.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	button := gpio.NewMakeyButtonDriver(beagleboneAdaptor, "P8_9")
 
@@ -30,7 +28,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/beaglebone_servo.go b/examples/beaglebone_servo.go
@@ -10,7 +10,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
 	beagleboneAdaptor := beaglebone.NewAdaptor()
 	servo := gpio.NewServoDriver(beagleboneAdaptor, "P9_14")
 
@@ -28,7 +27,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/bebop.go b/examples/bebop.go
@@ -8,8 +8,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	bebopAdaptor := bebop.NewAdaptor()
 	drone := bebop.NewDriver(bebopAdaptor)
 
@@ -29,7 +27,6 @@ func main() {
 		[]gobot.Device{drone},
 		work,
 	)
-	gbot.AddRobot(robot)
 
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/bebop_ps3.go b/examples/bebop_ps3.go
@@ -15,8 +15,6 @@ type pair struct {
 }
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	joystickAdaptor := joystick.NewAdaptor()
 	stick := joystick.NewDriver(joystickAdaptor,
 		"./platforms/joystick/configs/dualshock3.json",
@@ -121,9 +119,7 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
 
 func validatePitch(data float64, offset float64) int {

diff --git a/examples/bebop_ps3_video.go b/examples/bebop_ps3_video.go
@@ -53,8 +53,6 @@ func ffmpeg() (stdin io.WriteCloser, stderr io.ReadCloser, err error) {
 }
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	joystickAdaptor := joystick.NewAdaptor()
 	stick := joystick.NewDriver(joystickAdaptor,
 		"./platforms/joystick/configs/dualshock3.json",
@@ -170,9 +168,7 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
 
 func validatePitch(data float64, offset float64) int {

diff --git a/examples/ble_battery.go b/examples/ble_battery.go
@@ -10,8 +10,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	bleAdaptor := ble.NewClientAdaptor(os.Args[1])
 	battery := ble.NewBatteryDriver(bleAdaptor)
 
@@ -27,7 +25,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/ble_device_info.go b/examples/ble_device_info.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	bleAdaptor := ble.NewClientAdaptor(os.Args[1])
 	info := ble.NewDeviceInformationDriver(bleAdaptor)
 
@@ -28,7 +26,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/chip_blink.go b/examples/chip_blink.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	chipAdaptor := chip.NewAdaptor()
 	led := gpio.NewLedDriver(chipAdaptor, "XIO-P0")
 
@@ -26,7 +24,5 @@ func main() {
 		work,
 	)
 
-	gbot.AddRobot(robot)
-
-	gbot.Start()
+	robot.Start()
 }
diff --git a/examples/chip_button.go b/examples/chip_button.go
@@ -9,8 +9,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	chipAdaptor := chip.NewAdaptor()
 	button := gpio.NewButtonDriver(chipAdaptor, "XIO-P0")
 
@@ -29,6 +27,6 @@ func main() {
 		[]gobot.Device{button},
 		work,
 	)
-	gbot.AddRobot(robot)
-	gbot.Start()
+
+	robot.Start()
 }
diff --git a/examples/chip_button_led.go b/examples/chip_button_led.go
@@ -7,8 +7,6 @@ import (
 )
 
 func main() {
-	gbot := gobot.NewMaster()
-
 	chipAdaptor := chip.NewAdaptor()
 	button := gpio.NewButtonDriver(chipAdaptor, "XIO-P6")
 	led := gpio.NewLedDriver(chipAdaptor, "XIO-P7")
@@ -28,6 +26,6 @@ func main() {
 		[]gobot.Device{button, led},
 		work,
 	)
-	gbot.AddRobot(robot)
-	gbot.Start()
+
+	robot.Start()
 }