OrgGo/hybridgroup.gobot
1
0
Fork 0
mirror of https://github.com/hybridgroup/gobot.git synced 2025-04-27 13:48:56 +08:00
Code Issues Projects Releases Wiki Activity

Fix merge errors

Browse Source
This commit is contained in:
Adrian Zankich 2014-11-20 17:54:48 -08:00
parent 4c86c0a4bb
commit 67e8da6c36
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platforms/firmata/firmata_adaptor.go
View File

@ -66,6 +66,7 @@ func (f *FirmataAdaptor) Connect() (errs []error) {
if err := f.connect(f); err != nil {
return []error{err}
}
f.board.connect()
f.SetConnected(true)
return
}

2
platforms/opencv/camera_driver.go
View File

@ -61,7 +61,7 @@ func (c *CameraDriver) Start() (errs []error) {
<-time.After(c.Interval())
}
}()
return true
return
}
// Halt stops camera driver