embedded
/
devices
mirror of https://github.com/periph/devices
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update ds248x.go

Browse Source
pull/13/head
Audrius Paskevicius 5 years ago committed by GitHub
parent 6a64ebcefc
commit 9b036ee3ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File

19
ds248x/ds248x.go
Unescape Escape View File

@ -17,10 +17,10 @@ import (
) )
// DS248xType for chip connected to the system identification (ds2482-100, ds2482-800, ds2483). // DS248xType for chip connected to the system identification (ds2482-100, ds2482-800, ds2483).
type DS248xType uint8 type ds248xType uint8
const ( const (
isDS2482x100 DS248xType = iota // DS2482-100 selected isDS2482x100 ds248xType = iota // DS2482-100 selected
isDS2482x800 // DS2482-800 selected isDS2482x800 // DS2482-800 selected
isDS2483 // DS2483 selected isDS2483 // DS2483 selected
) )
@ -94,7 +94,7 @@ func New(i i2c.Bus, addr uint16, opts *Opts) (*Dev, error) {
type Dev struct { type Dev struct {
sync.Mutex // lock for the bus while a transaction is in progress sync.Mutex // lock for the bus while a transaction is in progress
i2c conn.Conn // i2c device handle for the ds248x i2c conn.Conn // i2c device handle for the ds248x
isDS248x DS248xType // 0: ds2482-100 1: ds2482-800 2: ds2483, isDS248x ds248xType // 0: ds2482-100 1: ds2482-800 2: ds2483,
confReg byte // value written to configuration register confReg byte // value written to configuration register
tReset time.Duration // time to perform a 1-wire reset tReset time.Duration // time to perform a 1-wire reset
tSlot time.Duration // time to perform a 1-bit 1-wire read/write tSlot time.Duration // time to perform a 1-bit 1-wire read/write
@ -179,8 +179,8 @@ func (d *Dev) ChannelSelect(ch int) error {
var err error = nil var err error = nil
switch d.isDS248x { switch d.isDS248x {
case isDS2482x100: case isDS2482x100:
// err = errors.New("unsupported (ds2482-100 has only channel 0)") err = errors.New("unsupported (ds2482-100 has only channel 0)")
// return fmt.Errorf("ds2482-100: error while selecting channel: %s", err) return fmt.Errorf("ds2482-100: error while selecting channel: %s", err)
case isDS2482x800: case isDS2482x800:
if ch < 0 || ch > 7 { if ch < 0 || ch > 7 {
err = errors.New("channel out of range 0...7") err = errors.New("channel out of range 0...7")
@ -191,8 +191,8 @@ func (d *Dev) ChannelSelect(ch int) error {
return fmt.Errorf("ds2482-800: error while selecting channel: %s", err) return fmt.Errorf("ds2482-800: error while selecting channel: %s", err)
} }
case isDS2483: case isDS2483:
// err = errors.New("unsupported (ds2483 has only channel 0)") err = errors.New("unsupported (ds2483 has only channel 0)")
// return fmt.Errorf("ds2483: error while selecting channel: %s", err) return fmt.Errorf("ds2483: error while selecting channel: %s", err)
default: default:
err = errors.New("wrong chip") err = errors.New("wrong chip")
return fmt.Errorf("ds248x: error while selecting channel: %s", err) return fmt.Errorf("ds248x: error while selecting channel: %s", err)
@ -215,10 +215,7 @@ func (d *Dev) SelectedChannel() int {
return 255 return 255
} }
ch = bytes.Index(cscr[:], sch[:]) ch = bytes.Index(cscr[:], sch[:])
if ch < 0 { if ch < 0 || ch > 7 {
return 255
}
if ch > 7 {
return 255 return 255
} }
case isDS2483: case isDS2483:

Write Preview
Loading…
Cancel
Save