Merge pull request hybridgroup#86 from hybridgroup/pebble-api

Making pebble finally work on gobot
caledhwa · Aug 1, 2014 · c817295 · c817295
2 parents 2d8ba72 + a155efa
commit c817295
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/examples/pebble.go b/examples/pebble.go
@@ -10,7 +10,9 @@ import (
 
 func main() {
 	gbot := gobot.NewGobot()
-	api.NewAPI(gbot).Start()
+	api := api.NewAPI(gbot)
+	api.Port = "8080"
+	api.Start()
 
 	pebbleAdaptor := pebble.NewPebbleAdaptor("pebble")
 	pebbleDriver := pebble.NewPebbleDriver(pebbleAdaptor, "pebble")

diff --git a/examples/pebble_accelerometer.go b/examples/pebble_accelerometer.go
@@ -10,7 +10,9 @@ import (
 
 func main() {
 	gbot := gobot.NewGobot()
-	api.NewAPI(gbot).Start()
+	a := api.NewAPI(gbot)
+	a.Port = "8080"
+	a.Start()
 
 	pebbleAdaptor := pebble.NewPebbleAdaptor("pebble")
 	pebbleDriver := pebble.NewPebbleDriver(pebbleAdaptor, "pebble")

diff --git a/platforms/pebble/pebble_driver.go b/platforms/pebble/pebble_driver.go
@@ -26,7 +26,7 @@ func NewPebbleDriver(adaptor *PebbleAdaptor, name string) *PebbleDriver {
 	p.AddEvent("accel")
 	p.AddEvent("tap")
 
-	p.AddCommand("PublishEvent", func(params map[string]interface{}) interface{} {
+	p.AddCommand("publish_event", func(params map[string]interface{}) interface{} {
 		p.PublishEvent(params["name"].(string), params["data"].(string))
 		return nil
 	})
@@ -36,10 +36,8 @@ func NewPebbleDriver(adaptor *PebbleAdaptor, name string) *PebbleDriver {
 		return nil
 	})
 
-	p.AddCommand("PendingMessage", func(params map[string]interface{}) interface{} {
-		m := make(map[string]string)
-		m["result"] = p.PendingMessage()
-		return m
+	p.AddCommand("pending_message", func(params map[string]interface{}) interface{} {
+		return p.PendingMessage()
 	})
 
 	return p