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

enforce no shadowed variable

Browse Source 
Convert a few wrapped error from %v to %w.

This does result in a few awkward cases but the value outweighs the
downsides.
pull/18/head
Marc-Antoine Ruel 5 years ago
parent 31cac53e0a
commit a27238ec6e
14 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File

3
.github/workflows/test.yml vendored
Unescape Escape View File

@ -78,13 +78,12 @@ jobs:
if: always() if: always()
run: go vet ./... run: go vet ./...
- name: 'Check: go vet shadow; shadowed variables' - name: 'Check: go vet shadow; shadowed variables'
# TODO: Remove true if we make this check ever pass.
run: | run: |
SHADOW_TOOL="$(which shadow)" SHADOW_TOOL="$(which shadow)"
if [ -f "${SHADOW_TOOL}.exe" ]; then if [ -f "${SHADOW_TOOL}.exe" ]; then
SHADOW_TOOL="${SHADOW_TOOL}.exe" SHADOW_TOOL="${SHADOW_TOOL}.exe"
fi fi
go vet -vettool=$SHADOW_TOOL ./... || true go vet -vettool=$SHADOW_TOOL ./...
- name: 'Check: golint' - name: 'Check: golint'
if: always() if: always()
# TODO: Remove true if we make this check ever pass. # TODO: Remove true if we make this check ever pass.

2
bmxx80/bmx280smoketest/bmx280smoketest.go
Unescape Escape View File

@ -42,7 +42,7 @@ func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
i2cAddr := f.Uint("ia", 0x76, "I²C bus address to use; either 0x76 (BMx280, the default) or 0x77 (BMP180)") i2cAddr := f.Uint("ia", 0x76, "I²C bus address to use; either 0x76 (BMx280, the default) or 0x77 (BMP180)")
spiID := f.String("spi", "", "SPI port to use") spiID := f.String("spi", "", "SPI port to use")
record := f.Bool("r", false, "record operation (for playback unit testing)") record := f.Bool("r", false, "record operation (for playback unit testing)")
if err := f.Parse(args); err != nil { if err = f.Parse(args); err != nil {
return err return err
} }
if f.NArg() != 0 { if f.NArg() != 0 {

2
cap1xxx/cap1xxx_test.go
Unescape Escape View File

@ -183,7 +183,7 @@ func TestDev_InputStatus(t *testing.T) {
} }
// first check // first check
var got [8]TouchStatus var got [8]TouchStatus
if err := d.InputStatus(got[:]); err != nil { if err = d.InputStatus(got[:]); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !reflect.DeepEqual(got, [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) { if !reflect.DeepEqual(got, [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) {

2
cap1xxx/example_test.go
Unescape Escape View File

@ -29,7 +29,7 @@ func Example() {
log.Fatal("invalid alert GPIO pin number") log.Fatal("invalid alert GPIO pin number")
} }
// We set the alert pin to monitor for interrupts. // We set the alert pin to monitor for interrupts.
if err := alertPin.In(gpio.PullUp, gpio.BothEdges); err != nil { if err = alertPin.In(gpio.PullUp, gpio.BothEdges); err != nil {
log.Fatalf("Can't monitor the alert pin") log.Fatalf("Can't monitor the alert pin")
} }

4
ina219/ina219smoketest/ina219smoketest.go
Unescape Escape View File

@ -34,7 +34,7 @@ func (s *SmokeTest) Description() string {
func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) { func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
i2cID := f.String("i2c", "", "I²C bus to use") i2cID := f.String("i2c", "", "I²C bus to use")
i2cAddr := f.Int("ia", 0x40, "I²C bus address use: 0x40 to 0x4f") i2cAddr := f.Int("ia", 0x40, "I²C bus address use: 0x40 to 0x4f")
if err := f.Parse(args); err != nil { if err = f.Parse(args); err != nil {
return err return err
} }
if f.NArg() != 0 { if f.NArg() != 0 {
@ -43,7 +43,7 @@ func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
} }
fmt.Println("Starting INA219 Current Sensor\nctrl+c to exit") fmt.Println("Starting INA219 Current Sensor\nctrl+c to exit")
if _, err := host.Init(); err != nil { if _, err = host.Init(); err != nil {
return err return err
} }

2
inky/example_test.go
Unescape Escape View File

@ -32,7 +32,7 @@ func Example() {
log.Fatal(err) log.Fatal(err)
} }
if _, err := host.Init(); err != nil { if _, err = host.Init(); err != nil {
log.Fatal(err) log.Fatal(err)
} }

33
inky/inky.go
Unescape Escape View File

@ -328,14 +328,14 @@ func (d *Dev) DrawAll(src image.Image) error {
return d.Draw(d.Bounds(), src, image.Point{}) return d.Draw(d.Bounds(), src, image.Point{})
} }
func (d *Dev) update(border byte, black []byte, red []byte) (err error) { func (d *Dev) update(border byte, black []byte, red []byte) error {
if err := d.reset(); err != nil { if err := d.reset(); err != nil {
return err return err
} }
r := make([]byte, 3) r := [3]byte{}
binary.LittleEndian.PutUint16(r, uint16(d.Bounds().Size().Y)) binary.LittleEndian.PutUint16(r[:], uint16(d.Bounds().Size().Y))
h := make([]byte, 4) h := [4]byte{}
binary.LittleEndian.PutUint16(h[2:], uint16(d.Bounds().Size().Y)) binary.LittleEndian.PutUint16(h[2:], uint16(d.Bounds().Size().Y))
type cmdData struct { type cmdData struct {
@ -343,7 +343,7 @@ func (d *Dev) update(border byte, black []byte, red []byte) (err error) {
data []byte data []byte
} }
cmds := []cmdData{ cmds := []cmdData{
{0x01, r}, // Gate setting {0x01, r[:]}, // Gate setting
{0x74, []byte{0x54}}, // Set Analog Block Control. {0x74, []byte{0x54}}, // Set Analog Block Control.
{0x7e, []byte{0x3b}}, // Set Digital Block Control. {0x7e, []byte{0x3b}}, // Set Digital Block Control.
{0x03, []byte{0x17}}, // Gate Driving Voltage. {0x03, []byte{0x17}}, // Gate Driving Voltage.
@ -356,7 +356,7 @@ func (d *Dev) update(border byte, black []byte, red []byte) (err error) {
{0x3c, []byte{byte(border)}}, // Border colour {0x3c, []byte{byte(border)}}, // Border colour
{0x32, modelLUT[d.color]}, // Set LUTs. {0x32, modelLUT[d.color]}, // Set LUTs.
{0x44, []byte{0x00, byte(d.Bounds().Size().X/8) - 1}}, // Set RAM Y Start/End {0x44, []byte{0x00, byte(d.Bounds().Size().X/8) - 1}}, // Set RAM Y Start/End
{0x45, h}, // Set RAM X Start/End {0x45, h[:]}, // Set RAM X Start/End
{0x4e, []byte{0x00}}, // Set RAM X Pointer Start {0x4e, []byte{0x00}}, // Set RAM X Pointer Start
{0x4f, []byte{0x00, 0x00}}, // Set RAM Y Pointer Start {0x4f, []byte{0x00, 0x00}}, // Set RAM Y Pointer Start
{0x24, black}, {0x24, black},
@ -378,21 +378,16 @@ func (d *Dev) update(border byte, black []byte, red []byte) (err error) {
if err := d.busy.In(gpio.PullUp, gpio.FallingEdge); err != nil { if err := d.busy.In(gpio.PullUp, gpio.FallingEdge); err != nil {
return err return err
} }
defer func() { var err error
if err2 := d.busy.In(gpio.PullUp, gpio.NoEdge); err2 != nil { if err = d.sendCommand(0x20, nil); err == nil {
err = err2 d.busy.WaitForEdge(-1)
} // Enter deep sleep.
}() err = d.sendCommand(0x10, []byte{0x01})
if err := d.sendCommand(0x20, nil); err != nil {
return err
} }
if err2 := d.busy.In(gpio.PullUp, gpio.NoEdge); err2 != nil {
d.busy.WaitForEdge(-1) err = err2
if err := d.sendCommand(0x10, []byte{0x01}); err != nil { // Enter deep sleep.
return err
} }
return return err
} }
func (d *Dev) reset() (err error) { func (d *Dev) reset() (err error) {

4
lepton/cci/cci.go
Unescape Escape View File

@ -430,10 +430,10 @@ func (c *cciConn) set(cmd command, data interface{}) error {
if err != nil { if err != nil {
return err return err
} }
if err := c.r.WriteUint16(regDataLength, uint16(nbWords)); err != nil { if err = c.r.WriteUint16(regDataLength, uint16(nbWords)); err != nil {
return err return err
} }
if err := c.r.WriteUint16(regCommandID, uint16(cmd)|1); err != nil { if err = c.r.WriteUint16(regCommandID, uint16(cmd)|1); err != nil {
return err return err
} }
s, err := c.waitIdle() s, err := c.waitIdle()

8
lirc/lirc.go
Unescape Escape View File

@ -136,8 +136,8 @@ func (c *Conn) readData(r *bufio.Reader) error {
} }
default: default:
// In case of any error, ignore the rest. // In case of any error, ignore the rest.
line, err := read(r) line := ""
if err != nil { if line, err = read(r); err != nil {
return err return err
} }
if line != "SUCCESS" { if line != "SUCCESS" {
@ -154,8 +154,8 @@ func (c *Conn) readData(r *bufio.Reader) error {
if line, err = read(r); err != nil { if line, err = read(r); err != nil {
return err return err
} }
nbLines, err := strconv.Atoi(line) nbLines := 0
if err != nil { if nbLines, err = strconv.Atoi(line); err != nil {
return err return err
} }
list := make([]string, nbLines) list := make([]string, nbLines)

3
mcp9808/mcp9808_test.go
Unescape Escape View File

@ -205,8 +205,7 @@ func TestSenseContinuous(t *testing.T) {
if tt.Halt { if tt.Halt {
e := <-env e := <-env
err := mcp9808.Halt() if err = mcp9808.Halt(); err != tt.err {
if err != tt.err {
t.Errorf("SenseContinuous() %s wanted err: %v, but got: %v", tt.name, tt.err, err) t.Errorf("SenseContinuous() %s wanted err: %v, but got: %v", tt.name, tt.err, err)
} }
if err == nil && e.Temperature != tt.want { if err == nil && e.Temperature != tt.want {

4
mcp9808/mcp9808smoketest/mcp9808smoketest.go
Unescape Escape View File

@ -33,7 +33,7 @@ func (s *SmokeTest) Description() string {
func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) { func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
i2cID := f.String("i2c", "", "I²C bus to use") i2cID := f.String("i2c", "", "I²C bus to use")
i2cAddr := f.Int("ia", 0x18, "I²C bus address use: 0x18 to 0x1f") i2cAddr := f.Int("ia", 0x18, "I²C bus address use: 0x18 to 0x1f")
if err := f.Parse(args); err != nil { if err = f.Parse(args); err != nil {
return err return err
} }
if f.NArg() != 0 { if f.NArg() != 0 {
@ -42,7 +42,7 @@ func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
} }
fmt.Println("Starting MCP9808 Temperature Sensor\nctrl+c to exit") fmt.Println("Starting MCP9808 Temperature Sensor\nctrl+c to exit")
if _, err := host.Init(); err != nil { if _, err = host.Init(); err != nil {
return err return err
} }

28
mpu9250/mpu9250.go
Unescape Escape View File

@ -106,21 +106,21 @@ func (m *MPU9250) Calibrate() error {
writeGyroOffset := func(v int16, h, l byte) error { writeGyroOffset := func(v int16, h, l byte) error {
o := (-v) >> 2 o := (-v) >> 2
if err := m.transport.writeByte(h, byte(o>>8)); err != nil { if err = m.transport.writeByte(h, byte(o>>8)); err != nil {
return wrapf("can't write Gyro offset %x(h):%x => %v", h, o, err) return wrapf("can't write Gyro offset %x(h):%x => %w", h, o, err)
} }
if err := m.transport.writeByte(l, byte(o&0xFF)); err != nil { if err = m.transport.writeByte(l, byte(o&0xFF)); err != nil {
return wrapf("can't write Gyro offset %x(l):%x => %v", l, o, err) return wrapf("can't write Gyro offset %x(l):%x => %w", l, o, err)
} }
return nil return nil
} }
writeAccelOffset := func(o uint16, h, l byte) error { writeAccelOffset := func(o uint16, h, l byte) error {
if err := m.transport.writeByte(h, byte(o>>8)); err != nil { if err = m.transport.writeByte(h, byte(o>>8)); err != nil {
return wrapf("can't write Accelerator %x(h):%x => %v", h, o, err) return wrapf("can't write Accelerator %x(h):%x => %w", h, o, err)
} }
if err := m.transport.writeByte(l, byte(o&0xFF)); err != nil { if err = m.transport.writeByte(l, byte(o&0xFF)); err != nil {
return wrapf("can't write Accelerator %x(l):%x => %v", l, o, err) return wrapf("can't write Accelerator %x(l):%x => %w", l, o, err)
} }
return nil return nil
} }
@ -132,9 +132,9 @@ func (m *MPU9250) Calibrate() error {
for i := 0; i < int(packets); i++ { for i := 0; i < int(packets); i++ {
for j := 0; j < registers; j++ { for j := 0; j < registers; j++ {
b, err := m.GetFIFOByte() b := byte(0)
if err != nil { if b, err = m.GetFIFOByte(); err != nil {
return wrapf("can't read data byte %d of packet %d => %v", j, i, err) return wrapf("can't read data byte %d of packet %d => %w", j, i, err)
} }
buffer[j] = b buffer[j] = b
} }
@ -177,13 +177,13 @@ func (m *MPU9250) Calibrate() error {
} }
m.debug("Factory gyroscope bias: X:%d, Y:%d, Z:%d\n", int16(factoryGyroBiasX), int16(factoryGyroBiasY), int16(factoryGyroBiasZ)) m.debug("Factory gyroscope bias: X:%d, Y:%d, Z:%d\n", int16(factoryGyroBiasX), int16(factoryGyroBiasY), int16(factoryGyroBiasZ))
if err := writeGyroOffset(gyroXBias, reg.MPU9250_GYRO_XOUT_H, reg.MPU9250_GYRO_XOUT_L); err != nil { if err = writeGyroOffset(gyroXBias, reg.MPU9250_GYRO_XOUT_H, reg.MPU9250_GYRO_XOUT_L); err != nil {
return err return err
} }
if err := writeGyroOffset(gyroYBias, reg.MPU9250_GYRO_YOUT_H, reg.MPU9250_GYRO_YOUT_L); err != nil { if err = writeGyroOffset(gyroYBias, reg.MPU9250_GYRO_YOUT_H, reg.MPU9250_GYRO_YOUT_L); err != nil {
return err return err
} }
if err := writeGyroOffset(gyroZBias, reg.MPU9250_GYRO_ZOUT_H, reg.MPU9250_GYRO_ZOUT_L); err != nil { if err = writeGyroOffset(gyroZBias, reg.MPU9250_GYRO_ZOUT_H, reg.MPU9250_GYRO_ZOUT_L); err != nil {
return err return err
} }

2
nrzled/nrzled_spi_test.go
Unescape Escape View File

@ -571,7 +571,7 @@ func benchmarkSPIWrite(b *testing.B, o Opts, length int, f genColor) {
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }
if _, err := d.Write(pixels[:]); err != nil { if _, err = d.Write(pixels[:]); err != nil {
b.Fatal(err) b.Fatal(err)
} }
b.ResetTimer() b.ResetTimer()

2
ssd1306/ssd1306smoketest/ssd1306smoketest.go
Unescape Escape View File

@ -62,7 +62,7 @@ func (s *SmokeTest) Run(f *flag.FlagSet, args []string) (err error) {
rotated := f.Bool("rotated", false, "Rotate the displays by 180°") rotated := f.Bool("rotated", false, "Rotate the displays by 180°")
record := f.Bool("record", false, "record operation (for playback unit testing)") record := f.Bool("record", false, "record operation (for playback unit testing)")
if err := f.Parse(args); err != nil { if err = f.Parse(args); err != nil {
return err return err
} }
if f.NArg() != 0 { if f.NArg() != 0 {

Write Preview
Loading…
Cancel
Save