diff --git a/devices/apa102/apa102.go b/devices/apa102/apa102.go index 2400bf1..69f0f0e 100644 --- a/devices/apa102/apa102.go +++ b/devices/apa102/apa102.go @@ -294,7 +294,7 @@ func (d *Dev) Halt() error { // https://en.wikipedia.org/wiki/Flicker_fusion_threshold is a recommended // reading. func New(p spi.Port, numLights int, intensity uint8, temperature uint16) (*Dev, error) { - c, err := p.DevParams(20000000, spi.Mode3, 8) + c, err := p.Connect(20000000, spi.Mode3, 8) if err != nil { return nil, err } diff --git a/devices/apa102/apa102_test.go b/devices/apa102/apa102_test.go index 075fdc7..3ea69c7 100644 --- a/devices/apa102/apa102_test.go +++ b/devices/apa102/apa102_test.go @@ -340,9 +340,9 @@ func TestDevEmpty(t *testing.T) { } } -func TestDevParamsFail(t *testing.T) { +func TestConnectFail(t *testing.T) { if d, err := New(&configFail{}, 150, 255, 6500); d != nil || err == nil { - t.Fatal("DevParams() call have failed") + t.Fatal("Connect() call have failed") } } @@ -703,7 +703,7 @@ type configFail struct { spitest.Record } -func (c *configFail) DevParams(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { +func (c *configFail) Connect(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { return nil, errors.New("injected error") } diff --git a/devices/bme280/bme280.go b/devices/bme280/bme280.go index baae215..87fb11c 100644 --- a/devices/bme280/bme280.go +++ b/devices/bme280/bme280.go @@ -175,7 +175,7 @@ func NewI2C(b i2c.Bus, opts *Opts) (*Dev, error) { // When using SPI, the CS line must be used. func NewSPI(p spi.Port, opts *Opts) (*Dev, error) { // It works both in Mode0 and Mode3. - c, err := p.DevParams(10000000, spi.Mode3, 8) + c, err := p.Connect(10000000, spi.Mode3, 8) if err != nil { return nil, err } diff --git a/devices/bme280/bme280_test.go b/devices/bme280/bme280_test.go index 81e4477..91f8720 100644 --- a/devices/bme280/bme280_test.go +++ b/devices/bme280/bme280_test.go @@ -105,7 +105,7 @@ func TestSPISense_success(t *testing.T) { func TestNewSPI_fail(t *testing.T) { if d, err := NewSPI(&spiFail{}, nil); d != nil || err == nil { - t.Fatal("DevParams() have failed") + t.Fatal("Connect() have failed") } } @@ -545,6 +545,6 @@ type spiFail struct { spitest.Playback } -func (s *spiFail) DevParams(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { +func (s *spiFail) Connect(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { return nil, errors.New("failing") } diff --git a/devices/lepton/lepton.go b/devices/lepton/lepton.go index 8f0c8c8..b98b65a 100644 --- a/devices/lepton/lepton.go +++ b/devices/lepton/lepton.go @@ -84,7 +84,7 @@ type Dev struct { // New returns an initialized connection to the FLIR Lepton. // // The CS line is manually managed by using mode spi.NoCS when calling -// DevParams(). In this case pass nil for the cs parameter. Some spidev drivers +// Connect(). In this case pass nil for the cs parameter. Some spidev drivers // refuse spi.NoCS, they do not implement proper support to not trigger the CS // line so a manual CS (really, any GPIO pin) must be used instead. // @@ -112,7 +112,7 @@ func New(p spi.Port, i i2c.Bus, cs gpio.PinOut) (*Dev, error) { } // TODO(maruel): Switch to 16 bits per word, so that big endian 16 bits word // decoding is done by the SPI driver. - s, err := p.DevParams(20000000, mode, 8) + s, err := p.Connect(20000000, mode, 8) if err != nil { return nil, err } diff --git a/devices/lepton/lepton_test.go b/devices/lepton/lepton_test.go index fdbc33e..c9ac94d 100644 --- a/devices/lepton/lepton_test.go +++ b/devices/lepton/lepton_test.go @@ -144,11 +144,11 @@ func TestNew_fail_no_Pins(t *testing.T) { } } -func TestNew_DevParams(t *testing.T) { +func TestNew_Connect(t *testing.T) { i := i2ctest.Record{} s := spiStream{err: errors.New("injected")} if _, err := New(&s, &i, &gpiotest.Pin{N: "CS"}); err == nil { - t.Fatal("DevParams failed") + t.Fatal("Connect failed") } } @@ -370,7 +370,7 @@ type spiStream struct { err error } -func (s *spiStream) DevParams(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { +func (s *spiStream) Connect(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { if maxHz != 20000000 { s.t.Fatal(maxHz) } diff --git a/devices/ssd1306/ssd1306.go b/devices/ssd1306/ssd1306.go index 40d574f..6ff0488 100644 --- a/devices/ssd1306/ssd1306.go +++ b/devices/ssd1306/ssd1306.go @@ -133,7 +133,7 @@ func NewSPI(p spi.Port, dc gpio.PinOut, w, h int, rotated bool) (*Dev, error) { } else if err := dc.Out(gpio.Low); err != nil { return nil, err } - c, err := p.DevParams(3300000, spi.Mode0, bits) + c, err := p.Connect(3300000, spi.Mode0, bits) if err != nil { return nil, err } diff --git a/devices/ssd1306/ssd1306_test.go b/devices/ssd1306/ssd1306_test.go index 5ff3f82..9f444ca 100644 --- a/devices/ssd1306/ssd1306_test.go +++ b/devices/ssd1306/ssd1306_test.go @@ -576,7 +576,7 @@ type configFail struct { spitest.Record } -func (c *configFail) DevParams(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { +func (c *configFail) Connect(maxHz int64, mode spi.Mode, bits int) (spi.Conn, error) { return nil, errors.New("injected error") } diff --git a/experimental/devices/bitbang/spi.go b/experimental/devices/bitbang/spi.go index f7ecbad..c2e78e7 100644 --- a/experimental/devices/bitbang/spi.go +++ b/experimental/devices/bitbang/spi.go @@ -67,8 +67,8 @@ func (s *SPI) LimitSpeed(maxHz int64) error { return nil } -// DevParams implements spi.Conn. -func (s *SPI) DevParams(maxHz int64, mode spi.Mode, bits int) error { +// Connect implements spi.Conn. +func (s *SPI) Connect(maxHz int64, mode spi.Mode, bits int) error { if maxHz < 0 { return errors.New("bitbang-spi: invalid maxHz") }