removed usage of errors.Join

pull/68/head
Wilke, Louis 2 years ago
parent 1177d80f35
commit 36bf6f98cf

@ -5,7 +5,6 @@
package aht20 package aht20
import ( import (
"errors"
"fmt" "fmt"
"periph.io/x/conn/v3/i2c" "periph.io/x/conn/v3/i2c"
"periph.io/x/conn/v3/physic" "periph.io/x/conn/v3/physic"
@ -65,16 +64,17 @@ func NewI2C(b i2c.Bus, opts *Opts) (*Dev, error) {
if opts == nil { if opts == nil {
opts = &DefaultOpts opts = &DefaultOpts
} }
if opts.MeasurementWaitInterval <= 0 { d := &Dev{d: &i2c.Dev{Bus: b, Addr: deviceAddress}, opts: *opts}
opts.MeasurementWaitInterval = 10 * time.Millisecond
if d.opts.MeasurementWaitInterval <= 0 {
d.opts.MeasurementWaitInterval = 10 * time.Millisecond
} }
d := &Dev{d: &i2c.Dev{Bus: b, Addr: deviceAddress}, opts: *opts}
if err, initialized := d.isInitialized(); err != nil { if err, initialized := d.isInitialized(); err != nil {
return nil, errors.Join(fmt.Errorf("could read sensor status"), err) return nil, fmt.Errorf("%w; could read sensor status", err)
} else if !initialized { } else if !initialized {
if err := d.initialize(); err != nil { if err := d.initialize(); err != nil {
return nil, errors.Join(fmt.Errorf("could not calibrate sensor"), err) return nil, fmt.Errorf("%w; could not calibrate sensor", err)
} }
} }
return d, nil return d, nil

Loading…
Cancel
Save