From 04150591f2267fe422c5437c1f2d824ab042dd28 Mon Sep 17 00:00:00 2001 From: Homer Strong Date: Mon, 14 Jul 2014 13:13:07 -0700 Subject: [PATCH 1/2] fix Port calls in leap motion adapter "Message" should be capitalized to match event in driver fix capitalization again (in example) last event capitalization fix: hands example --- examples/leap_motion.go | 2 +- examples/leap_motion_hands.go | 2 +- platforms/leap/README.md | 2 +- platforms/leap/leap_motion_adaptor.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/leap_motion.go b/examples/leap_motion.go index 21645234..6477d567 100644 --- a/examples/leap_motion.go +++ b/examples/leap_motion.go @@ -14,7 +14,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("message"), func(data interface{}) { + gobot.On(l.Event("Message"), func(data interface{}) { fmt.Println(data.(leap.Frame)) }) } diff --git a/examples/leap_motion_hands.go b/examples/leap_motion_hands.go index 13880c62..1991e1f4 100644 --- a/examples/leap_motion_hands.go +++ b/examples/leap_motion_hands.go @@ -14,7 +14,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("message"), func(data interface{}) { + gobot.On(l.Event("Message"), func(data interface{}) { printHands(data.(leap.Frame)) }) } diff --git a/platforms/leap/README.md b/platforms/leap/README.md index 1d9fd0ad..4cc0d9de 100644 --- a/platforms/leap/README.md +++ b/platforms/leap/README.md @@ -30,7 +30,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("message"), func(data interface{}) { + gobot.On(l.Event("Message"), func(data interface{}) { fmt.Println(data.(leap.Frame)) }) } diff --git a/platforms/leap/leap_motion_adaptor.go b/platforms/leap/leap_motion_adaptor.go index 2067b2b5..2b9995d3 100644 --- a/platforms/leap/leap_motion_adaptor.go +++ b/platforms/leap/leap_motion_adaptor.go @@ -20,8 +20,8 @@ func NewLeapMotionAdaptor(name string, port string) *LeapMotionAdaptor { port, ), connect: func(l *LeapMotionAdaptor) { - origin := fmt.Sprintf("http://%v", l.Port) - url := fmt.Sprintf("ws://%v/v3.json", l.Port) + origin := fmt.Sprintf("http://%v", l.Port()) + url := fmt.Sprintf("ws://%v/v3.json", l.Port()) ws, err := websocket.Dial(url, "", origin) if err != nil { panic(err) From 4427d0f42beb090228c1e1935b1d4db3b953ac56 Mon Sep 17 00:00:00 2001 From: Homer Strong Date: Tue, 15 Jul 2014 11:11:25 -0700 Subject: [PATCH 2/2] fix "message" capitalization in leap driver fix leap examples --- examples/leap_motion.go | 2 +- examples/leap_motion_hands.go | 2 +- platforms/leap/README.md | 2 +- platforms/leap/leap_motion_driver.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/leap_motion.go b/examples/leap_motion.go index 6477d567..21645234 100644 --- a/examples/leap_motion.go +++ b/examples/leap_motion.go @@ -14,7 +14,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("Message"), func(data interface{}) { + gobot.On(l.Event("message"), func(data interface{}) { fmt.Println(data.(leap.Frame)) }) } diff --git a/examples/leap_motion_hands.go b/examples/leap_motion_hands.go index 1991e1f4..13880c62 100644 --- a/examples/leap_motion_hands.go +++ b/examples/leap_motion_hands.go @@ -14,7 +14,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("Message"), func(data interface{}) { + gobot.On(l.Event("message"), func(data interface{}) { printHands(data.(leap.Frame)) }) } diff --git a/platforms/leap/README.md b/platforms/leap/README.md index 4cc0d9de..1d9fd0ad 100644 --- a/platforms/leap/README.md +++ b/platforms/leap/README.md @@ -30,7 +30,7 @@ func main() { l := leap.NewLeapMotionDriver(leapMotionAdaptor, "leap") work := func() { - gobot.On(l.Event("Message"), func(data interface{}) { + gobot.On(l.Event("message"), func(data interface{}) { fmt.Println(data.(leap.Frame)) }) } diff --git a/platforms/leap/leap_motion_driver.go b/platforms/leap/leap_motion_driver.go index e0113810..8ca38454 100644 --- a/platforms/leap/leap_motion_driver.go +++ b/platforms/leap/leap_motion_driver.go @@ -20,7 +20,7 @@ func NewLeapMotionDriver(a *LeapMotionAdaptor, name string) *LeapMotionDriver { ), } - l.AddEvent("Message") + l.AddEvent("message") return l } @@ -39,7 +39,7 @@ func (l *LeapMotionDriver) Start() bool { for { var msg []byte websocket.Message.Receive(l.adaptor().ws, &msg) - gobot.Publish(l.Event("Message"), l.ParseFrame(msg)) + gobot.Publish(l.Event("message"), l.ParseFrame(msg)) } }()