Update NewLedDriver function signature

mika-il · Jul 9, 2014 · a94c3c0 · a94c3c0
1 parent 546862c
commit a94c3c0
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 36 deletions.
diff --git a/examples/beaglebone_blink.go b/examples/beaglebone_blink.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/beaglebone"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	beagleboneAdaptor := beaglebone.NewBeagleboneAdaptor("beaglebone")
-	led := gpio.NewLedDriver("led", beagleboneAdaptor, "P9_12")
+	led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_12")
 
 	work := func() {
 		gobot.Every(1*time.Second, func() {

diff --git a/examples/beaglebone_led_brightness.go b/examples/beaglebone_led_brightness.go
@@ -1,16 +1,17 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/beaglebone"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 	beagleboneAdaptor := beaglebone.NewBeagleboneAdaptor("beaglebone")
-	led := gpio.NewLedDriver("led", beagleboneAdaptor, "P9_14")
+	led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_14")
 
 	work := func() {
 		brightness := uint8(0)

diff --git a/examples/beaglebone_led_brightness_with_analog_input.go b/examples/beaglebone_led_brightness_with_analog_input.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/beaglebone"
 	"github.com/hybridgroup/gobot/platforms/gpio"
@@ -12,7 +13,7 @@ func main() {
 
 	beagleboneAdaptor := beaglebone.NewBeagleboneAdaptor("beaglebone")
 	sensor := gpio.NewAnalogSensorDriver(beagleboneAdaptor, "sensor", "P9_33")
-	led := gpio.NewLedDriver("led", beagleboneAdaptor, "P9_14")
+	led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_14")
 
 	work := func() {
 		gobot.On(sensor.Event("data"), func(data interface{}) {

diff --git a/examples/digispark_api.go b/examples/digispark_api.go
@@ -13,7 +13,7 @@ func main() {
 	api.NewAPI(gbot).Start()
 
 	digisparkAdaptor := digispark.NewDigisparkAdaptor("Digispark")
-	led := gpio.NewLedDriver("led", digisparkAdaptor, "0")
+	led := gpio.NewLedDriver(digisparkAdaptor, "led", "0")
 
 	robot := gobot.NewRobot("digispark",
 		[]gobot.Connection{digisparkAdaptor},

diff --git a/examples/digispark_blink.go b/examples/digispark_blink.go
@@ -1,16 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/digispark"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
+
 	digisparkAdaptor := digispark.NewDigisparkAdaptor("Digispark")
-	led := gpio.NewLedDriver("led", digisparkAdaptor, "0")
+	led := gpio.NewLedDriver(digisparkAdaptor, "led", "0")
 
 	work := func() {
 		gobot.Every(1*time.Second, func() {

diff --git a/examples/digispark_led_brightness.go b/examples/digispark_led_brightness.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/digispark"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	digisparkAdaptor := digispark.NewDigisparkAdaptor("digispark")
-	led := gpio.NewLedDriver("led", digisparkAdaptor, "0")
+	led := gpio.NewLedDriver(digisparkAdaptor, "led", "0")
 
 	work := func() {
 		brightness := uint8(0)

diff --git a/examples/firmata_blink.go b/examples/firmata_blink.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/firmata"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	firmataAdaptor := firmata.NewFirmataAdaptor("arduino", "/dev/ttyACM0")
-	led := gpio.NewLedDriver("led", firmataAdaptor, "13")
+	led := gpio.NewLedDriver(firmataAdaptor, "led", "13")
 
 	work := func() {
 		gobot.Every(1*time.Second, func() {

diff --git a/examples/firmata_button.go b/examples/firmata_button.go
@@ -12,7 +12,7 @@ func main() {
 	firmataAdaptor := firmata.NewFirmataAdaptor("myFirmata", "/dev/ttyACM0")
 
 	button := gpio.NewButtonDriver(firmataAdaptor, "myButton", "2")
-	led := gpio.NewLedDriver("myLed", firmataAdaptor, "13")
+	led := gpio.NewLedDriver(firmataAdaptor, "myLed", "13")
 
 	work := func() {
 		gobot.On(button.Event("push"), func(data interface{}) {

diff --git a/examples/firmata_led_brightness.go b/examples/firmata_led_brightness.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/firmata"
 	"github.com/hybridgroup/gobot/platforms/gpio"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	firmataAdaptor := firmata.NewFirmataAdaptor("firmata", "/dev/ttyACM0")
-	led := gpio.NewLedDriver("led", firmataAdaptor, "3")
+	led := gpio.NewLedDriver(firmataAdaptor, "led", "3")
 
 	work := func() {
 		brightness := uint8(0)

diff --git a/examples/firmata_led_brightness_with_analog_input.go b/examples/firmata_led_brightness_with_analog_input.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/firmata"
 	"github.com/hybridgroup/gobot/platforms/gpio"
@@ -12,7 +13,7 @@ func main() {
 
 	firmataAdaptor := firmata.NewFirmataAdaptor("firmata", "/dev/ttyACM0")
 	sensor := gpio.NewAnalogSensorDriver(firmataAdaptor, "sensor", "0")
-	led := gpio.NewLedDriver("led", firmataAdaptor, "3")
+	led := gpio.NewLedDriver(firmataAdaptor, "led", "3")
 
 	work := func() {
 		gobot.On(sensor.Event("data"), func(data interface{}) {

diff --git a/examples/firmata_makey_button.go b/examples/firmata_makey_button.go
@@ -11,7 +11,7 @@ func main() {
 
 	firmataAdaptor := firmata.NewFirmataAdaptor("firmata", "/dev/ttyACM0")
 	button := gpio.NewMakeyButtonDriver(firmataAdaptor, "button", "2")
-	led := gpio.NewLedDriver("led", firmataAdaptor, "13")
+	led := gpio.NewLedDriver(firmataAdaptor, "led", "13")
 
 	work := func() {
 		gobot.On(button.Event("push"), func(data interface{}) {

diff --git a/examples/firmata_travis.go b/examples/firmata_travis.go
@@ -3,12 +3,13 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/hybridgroup/gobot"
-	"github.com/hybridgroup/gobot/platforms/firmata"
-	"github.com/hybridgroup/gobot/platforms/gpio"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/hybridgroup/gobot"
+	"github.com/hybridgroup/gobot/platforms/firmata"
+	"github.com/hybridgroup/gobot/platforms/gpio"
 )
 
 type TravisResponse struct {
@@ -66,9 +67,9 @@ func main() {
 	gbot := gobot.NewGobot()
 
 	firmataAdaptor := firmata.NewFirmataAdaptor("firmata", "/dev/ttyACM0")
-	red := gpio.NewLedDriver("red", firmataAdaptor, "7")
-	green := gpio.NewLedDriver("green", firmataAdaptor, "6")
-	blue := gpio.NewLedDriver("blue", firmataAdaptor, "5")
+	red := gpio.NewLedDriver(firmataAdaptor, "red", "7")
+	green := gpio.NewLedDriver(firmataAdaptor, "green", "6")
+	blue := gpio.NewLedDriver(firmataAdaptor, "blue", "5")
 
 	work := func() {
 		checkTravis(gbot.Robot("travis"))

diff --git a/examples/spark_core_api.go b/examples/spark_core_api.go
@@ -1,19 +1,20 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/api"
 	"github.com/hybridgroup/gobot/platforms/gpio"
 	"github.com/hybridgroup/gobot/platforms/spark"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 	api.NewAPI(gbot).Start()
 
 	sparkCore := spark.NewSparkCoreAdaptor("spark", "device_id", "access_token")
-	led := gpio.NewLedDriver("led", sparkCore, "D7")
+	led := gpio.NewLedDriver(sparkCore, "led", "D7")
 
 	work := func() {
 		gobot.Every(1*time.Second, func() {

diff --git a/examples/spark_core_blink.go b/examples/spark_core_blink.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/gpio"
 	"github.com/hybridgroup/gobot/platforms/spark"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	sparkCore := spark.NewSparkCoreAdaptor("spark", "device_id", "access_token")
-	led := gpio.NewLedDriver("led", sparkCore, "D7")
+	led := gpio.NewLedDriver(sparkCore, "led", "D7")
 
 	work := func() {
 		gobot.Every(1*time.Second, func() {

diff --git a/examples/spark_core_button.go b/examples/spark_core_button.go
@@ -10,7 +10,7 @@ func main() {
 	gbot := gobot.NewGobot()
 
 	sparkCore := spark.NewSparkCoreAdaptor("spark", "device_id", "access_token")
-	led := gpio.NewLedDriver("led", sparkCore, "D7")
+	led := gpio.NewLedDriver(sparkCore, "led", "D7")
 	button := gpio.NewButtonDriver(sparkCore, "button", "D5")
 
 	work := func() {

diff --git a/examples/spark_core_led_brithgness.go b/examples/spark_core_led_brithgness.go
@@ -1,17 +1,18 @@
 package main
 
 import (
+	"time"
+
 	"github.com/hybridgroup/gobot"
 	"github.com/hybridgroup/gobot/platforms/gpio"
 	"github.com/hybridgroup/gobot/platforms/spark"
-	"time"
 )
 
 func main() {
 	gbot := gobot.NewGobot()
 
 	sparkCore := spark.NewSparkCoreAdaptor("spark", "device_id", "access_token")
-	led := gpio.NewLedDriver("led", sparkCore, "A1")
+	led := gpio.NewLedDriver(sparkCore, "led", "A1")
 
 	work := func() {
 		brightness := uint8(0)

diff --git a/platforms/gpio/led_driver.go b/platforms/gpio/led_driver.go
@@ -9,7 +9,7 @@ type LedDriver struct {
 	High bool
 }
 
-func NewLedDriver(name string, a PwmDigitalWriter, pin string) *LedDriver {
+func NewLedDriver(a PwmDigitalWriter, name string, pin string) *LedDriver {
 
 	l := &LedDriver{
 		Driver: *gobot.NewDriver(
@@ -21,23 +21,23 @@ func NewLedDriver(name string, a PwmDigitalWriter, pin string) *LedDriver {
 		High: false,
 	}
 
-	l.Driver.AddCommand("Brightness", func(params map[string]interface{}) interface{} {
+	l.AddCommand("Brightness", func(params map[string]interface{}) interface{} {
 		level := byte(params["level"].(float64))
 		l.Brightness(level)
 		return nil
 	})
 
-	l.Driver.AddCommand("Toggle", func(params map[string]interface{}) interface{} {
+	l.AddCommand("Toggle", func(params map[string]interface{}) interface{} {
 		l.Toggle()
 		return nil
 	})
 
-	l.Driver.AddCommand("On", func(params map[string]interface{}) interface{} {
+	l.AddCommand("On", func(params map[string]interface{}) interface{} {
 		l.On()
 		return nil
 	})
 
-	l.Driver.AddCommand("Off", func(params map[string]interface{}) interface{} {
+	l.AddCommand("Off", func(params map[string]interface{}) interface{} {
 		l.Off()
 		return nil
 	})
@@ -46,7 +46,7 @@ func NewLedDriver(name string, a PwmDigitalWriter, pin string) *LedDriver {
 }
 
 func (l *LedDriver) adaptor() PwmDigitalWriter {
-	return l.Driver.Adaptor().(PwmDigitalWriter)
+	return l.Adaptor().(PwmDigitalWriter)
 }
 
 func (l *LedDriver) Start() bool { return true }