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

core: Refactor Beaglebone platform for new Adaptor creation signatures

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram 2016-09-25 14:12:52 +02:00
parent 80cc3139d0
commit 79e7f34a88
4 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/beaglebone/README.md
View File

@ -40,14 +40,14 @@ import (
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/beaglebone"
"github.com/hybridgroup/gobot/platforms/gpio"
"github.com/hybridgroup/gobot/drivers/gpio"
)
func main() {
gbot := gobot.NewGobot()
beagleboneAdaptor := beaglebone.NewBeagleboneAdaptor("beaglebone")
led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_12")
beagleboneAdaptor := beaglebone.NewAdaptor()
led := gpio.NewLedDriver(beagleboneAdaptor, "P9_12")
work := func() {
gobot.Every(1*time.Second, func() {

50
platforms/beaglebone/beaglebone_adaptor.go
View File

@ -111,8 +111,8 @@ var analogPins = map[string]string{
"P9_35": "AIN6",
}
// BeagleboneAdaptor is the gobot.Adaptor representation for the Beaglebone
type BeagleboneAdaptor struct {
// Adaptor is the gobot.Adaptor representation for the Beaglebone
type Adaptor struct {
name string
digitalPins []sysfs.DigitalPin
pwmPins map[string]*pwmPin
@ -122,10 +122,9 @@ type BeagleboneAdaptor struct {
slots string
}
// NewBeagleboneAdaptor returns a new BeagleboneAdaptor with specified name
func NewBeagleboneAdaptor(name string) *BeagleboneAdaptor {
b := &BeagleboneAdaptor{
name: name,
// NewAdaptor returns a new Beaglebone Adaptor
func NewAdaptor() *Adaptor {
b := &Adaptor{
digitalPins: make([]sysfs.DigitalPin, 120),
pwmPins: make(map[string]*pwmPin),
}
@ -138,11 +137,14 @@ func NewBeagleboneAdaptor(name string) *BeagleboneAdaptor {
return b
}
// Name returns the BeagleboneAdaptors name
func (b *BeagleboneAdaptor) Name() string { return b.name }
// Name returns the Adaptor name
func (b *Adaptor) Name() string { return b.name }
// SetName sets the Adaptor name
func (b *Adaptor) SetName(n string) { b.name = n }
// Connect initializes the pwm and analog dts.
func (b *BeagleboneAdaptor) Connect() (errs []error) {
func (b *Adaptor) Connect() (errs []error) {
if err := ensureSlot(b.slots, "cape-bone-iio"); err != nil {
return []error{err}
}
@ -161,7 +163,7 @@ func (b *BeagleboneAdaptor) Connect() (errs []error) {
}
// Finalize releases all i2c devices and exported analog, digital, pwm pins.
func (b *BeagleboneAdaptor) Finalize() (errs []error) {
func (b *Adaptor) Finalize() (errs []error) {
for _, pin := range b.pwmPins {
if pin != nil {
if err := pin.release(); err != nil {
@ -185,12 +187,12 @@ func (b *BeagleboneAdaptor) Finalize() (errs []error) {
}
// PwmWrite writes the 0-254 value to the specified pin
func (b *BeagleboneAdaptor) PwmWrite(pin string, val byte) (err error) {
func (b *Adaptor) PwmWrite(pin string, val byte) (err error) {
return b.pwmWrite(pin, val)
}
// ServoWrite writes the 0-180 degree val to the specified pin.
func (b *BeagleboneAdaptor) ServoWrite(pin string, val byte) (err error) {
func (b *Adaptor) ServoWrite(pin string, val byte) (err error) {
i, err := b.pwmPin(pin)
if err != nil {
return err
@ -201,7 +203,7 @@ func (b *BeagleboneAdaptor) ServoWrite(pin string, val byte) (err error) {
}
// DigitalRead returns a digital value from specified pin
func (b *BeagleboneAdaptor) DigitalRead(pin string) (val int, err error) {
func (b *Adaptor) DigitalRead(pin string) (val int, err error) {
sysfsPin, err := b.digitalPin(pin, sysfs.IN)
if err != nil {
return
@ -211,7 +213,7 @@ func (b *BeagleboneAdaptor) DigitalRead(pin string) (val int, err error) {
// DigitalWrite writes a digital value to specified pin.
// valid usr pin values are usr0, usr1, usr2 and usr3
func (b *BeagleboneAdaptor) DigitalWrite(pin string, val byte) (err error) {
func (b *Adaptor) DigitalWrite(pin string, val byte) (err error) {
if strings.Contains(pin, "usr") {
fi, err := sysfs.OpenFile(usrLed+pin+"/brightness", os.O_WRONLY|os.O_APPEND, 0666)
defer fi.Close()
@ -229,7 +231,7 @@ func (b *BeagleboneAdaptor) DigitalWrite(pin string, val byte) (err error) {
}
// AnalogRead returns an analog value from specified pin
func (b *BeagleboneAdaptor) AnalogRead(pin string) (val int, err error) {
func (b *Adaptor) AnalogRead(pin string) (val int, err error) {
analogPin, err := b.translateAnalogPin(pin)
if err != nil {
return
@ -252,7 +254,7 @@ func (b *BeagleboneAdaptor) AnalogRead(pin string) (val int, err error) {
}
// I2cStart starts a i2c device in specified address on i2c bus /dev/i2c-1
func (b *BeagleboneAdaptor) I2cStart(address int) (err error) {
func (b *Adaptor) I2cStart(address int) (err error) {
if b.i2cDevice == nil {
b.i2cDevice, err = sysfs.NewI2cDevice("/dev/i2c-1", address)
}
@ -260,7 +262,7 @@ func (b *BeagleboneAdaptor) I2cStart(address int) (err error) {
}
// I2cWrite writes data to i2c device
func (b *BeagleboneAdaptor) I2cWrite(address int, data []byte) (err error) {
func (b *Adaptor) I2cWrite(address int, data []byte) (err error) {
if err = b.i2cDevice.SetAddress(address); err != nil {
return
}
@ -269,7 +271,7 @@ func (b *BeagleboneAdaptor) I2cWrite(address int, data []byte) (err error) {
}
// I2cRead returns size bytes from the i2c device
func (b *BeagleboneAdaptor) I2cRead(address int, size int) (data []byte, err error) {
func (b *Adaptor) I2cRead(address int, size int) (data []byte, err error) {
if err = b.i2cDevice.SetAddress(address); err != nil {
return
}
@ -279,7 +281,7 @@ func (b *BeagleboneAdaptor) I2cRead(address int, size int) (data []byte, err err
}
// translatePin converts digital pin name to pin position
func (b *BeagleboneAdaptor) translatePin(pin string) (value int, err error) {
func (b *Adaptor) translatePin(pin string) (value int, err error) {
for key, value := range pins {
if key == pin {
return value, nil
@ -290,7 +292,7 @@ func (b *BeagleboneAdaptor) translatePin(pin string) (value int, err error) {
}
// translatePwmPin converts pwm pin name to pin position
func (b *BeagleboneAdaptor) translatePwmPin(pin string) (value string, err error) {
func (b *Adaptor) translatePwmPin(pin string) (value string, err error) {
for key, value := range pwmPins {
if key == pin {
return value, nil
@ -301,7 +303,7 @@ func (b *BeagleboneAdaptor) translatePwmPin(pin string) (value string, err error
}
// translateAnalogPin converts analog pin name to pin position
func (b *BeagleboneAdaptor) translateAnalogPin(pin string) (value string, err error) {
func (b *Adaptor) translateAnalogPin(pin string) (value string, err error) {
for key, value := range analogPins {
if key == pin {
return value, nil
@ -312,7 +314,7 @@ func (b *BeagleboneAdaptor) translateAnalogPin(pin string) (value string, err er
}
// digitalPin retrieves digital pin value by name
func (b *BeagleboneAdaptor) digitalPin(pin string, dir string) (sysfsPin sysfs.DigitalPin, err error) {
func (b *Adaptor) digitalPin(pin string, dir string) (sysfsPin sysfs.DigitalPin, err error) {
i, err := b.translatePin(pin)
if err != nil {
return
@ -331,7 +333,7 @@ func (b *BeagleboneAdaptor) digitalPin(pin string, dir string) (sysfsPin sysfs.D
}
// pwPin retrieves pwm pin value by name
func (b *BeagleboneAdaptor) pwmPin(pin string) (i string, err error) {
func (b *Adaptor) pwmPin(pin string) (i string, err error) {
i, err = b.translatePwmPin(pin)
if err != nil {
return
@ -350,7 +352,7 @@ func (b *BeagleboneAdaptor) pwmPin(pin string) (i string, err error) {
}
// pwmWrite writes pwm value to specified pin
func (b *BeagleboneAdaptor) pwmWrite(pin string, val byte) (err error) {
func (b *Adaptor) pwmWrite(pin string, val byte) (err error) {
i, err := b.pwmPin(pin)
if err != nil {
return

20
platforms/beaglebone/beaglebone_adaptor_test.go
View File

@ -6,21 +6,21 @@ import (
"testing"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/drivers/gpio"
"github.com/hybridgroup/gobot/drivers/i2c"
"github.com/hybridgroup/gobot/gobottest"
"github.com/hybridgroup/gobot/platforms/gpio"
"github.com/hybridgroup/gobot/platforms/i2c"
"github.com/hybridgroup/gobot/sysfs"
)
var _ gobot.Adaptor = (*BeagleboneAdaptor)(nil)
var _ gobot.Adaptor = (*Adaptor)(nil)
var _ gpio.DigitalReader = (*BeagleboneAdaptor)(nil)
var _ gpio.DigitalWriter = (*BeagleboneAdaptor)(nil)
var _ gpio.AnalogReader = (*BeagleboneAdaptor)(nil)
var _ gpio.PwmWriter = (*BeagleboneAdaptor)(nil)
var _ gpio.ServoWriter = (*BeagleboneAdaptor)(nil)
var _ gpio.DigitalReader = (*Adaptor)(nil)
var _ gpio.DigitalWriter = (*Adaptor)(nil)
var _ gpio.AnalogReader = (*Adaptor)(nil)
var _ gpio.PwmWriter = (*Adaptor)(nil)
var _ gpio.ServoWriter = (*Adaptor)(nil)
var _ i2c.I2c = (*BeagleboneAdaptor)(nil)
var _ i2c.I2c = (*Adaptor)(nil)
type NullReadWriteCloser struct {
contents []byte
@ -73,7 +73,7 @@ func TestBeagleboneAdaptor(t *testing.T) {
})
sysfs.SetFilesystem(fs)
a := NewBeagleboneAdaptor("myAdaptor")
a := NewAdaptor()
a.slots = "/sys/devices/bone_capemgr.4"
a.ocp = "/sys/devices/ocp.3"

6
platforms/beaglebone/doc.go
View File

@ -14,14 +14,14 @@ Example:
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/beaglebone"
"github.com/hybridgroup/gobot/platforms/gpio"
"github.com/hybridgroup/gobot/drivers/gpio"
)
func main() {
gbot := gobot.NewGobot()
beagleboneAdaptor := beaglebone.NewBeagleboneAdaptor("beaglebone")
led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_12")
beagleboneAdaptor := beaglebone.NewAdaptor()
led := gpio.NewLedDriver(beagleboneAdaptor, "P9_12")
work := func() {
gobot.Every(1*time.Second, func() {