diff --git a/cmd/munin-miflora/main.go b/cmd/munin-miflora/main.go index 4634b42..1a7dc2c 100644 --- a/cmd/munin-miflora/main.go +++ b/cmd/munin-miflora/main.go @@ -16,7 +16,6 @@ import ( ) const discoveryTimeout = 4 * time.Second -const connectionTimeout = 4 * time.Second func readData(client ble.Client, profile *ble.Profile) { prefix := flag.Args()[0] diff --git a/common/ble/impl.go b/common/ble/impl.go index bc9d4f1..94eee27 100644 --- a/common/ble/impl.go +++ b/common/ble/impl.go @@ -1,11 +1,10 @@ package ble import ( - "errors" - "miflorad/common" "github.com/go-ble/ble" + "github.com/pkg/errors" ) func FindServiceByUUID(services []*ble.Service, u ble.UUID) *ble.Service { @@ -39,7 +38,7 @@ func RequestVersionBattery(client ble.Client, profile *ble.Profile) (common.Vers bytes, err := client.ReadCharacteristic(mifloraVersionBatteryChar) if err != nil { - return common.VersionBatteryResponse{}, err + return common.VersionBatteryResponse{}, errors.Wrap(err, "can't read version battery") } return common.ParseVersionBattery(bytes), nil @@ -58,7 +57,7 @@ func RequestModeChange(client ble.Client, profile *ble.Profile) error { err := client.WriteCharacteristic(mifloraModeChangeChar, common.MifloraGetModeChangeData(), false) if err != nil { - return err + return errors.Wrap(err, "can't change mode") } return nil @@ -77,7 +76,7 @@ func RequestSensorData(client ble.Client, profile *ble.Profile) (common.SensorDa bytes, err := client.ReadCharacteristic(mifloraSensorDataChar) if err != nil { - return common.SensorDataResponse{}, err + return common.SensorDataResponse{}, errors.Wrap(err, "can't read sensor data") } return common.ParseSensorData(bytes), nil diff --git a/common/gatt/impl.go b/common/gatt/impl.go index 50a1d72..f991488 100644 --- a/common/gatt/impl.go +++ b/common/gatt/impl.go @@ -1,11 +1,10 @@ package gatt import ( - "errors" - "miflorad/common" "github.com/currantlabs/gatt" + "github.com/pkg/errors" ) var MifloraCharVersionBatteryUUID = gatt.MustParseUUID("00001a02-0000-1000-8000-00805f9b34fb") @@ -41,7 +40,7 @@ func MifloraRequestVersionBattery(p gatt.Peripheral) (common.VersionBatteryRespo bytes, err := p.ReadCharacteristic(mifloraVersionBatteryChar) if err != nil { - return common.VersionBatteryResponse{}, err + return common.VersionBatteryResponse{}, errors.Wrap(err, "can't read version battery") } return common.ParseVersionBattery(bytes), nil @@ -60,7 +59,7 @@ func MifloraRequestModeChange(p gatt.Peripheral) error { err := p.WriteCharacteristic(mifloraModeChangeChar, common.MifloraGetModeChangeData(), false) if err != nil { - return err + return errors.Wrap(err, "can't change mode") } return nil @@ -79,7 +78,7 @@ func MifloraRequstSensorData(p gatt.Peripheral) (common.SensorDataResponse, erro bytes, err := p.ReadCharacteristic(mifloraSensorDataChar) if err != nil { - return common.SensorDataResponse{}, err + return common.SensorDataResponse{}, errors.Wrap(err, "can't read sensor data") } return common.ParseSensorData(bytes), nil diff --git a/go.mod b/go.mod index d7eb902..610aede 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab // indirect github.com/muka/ble v0.0.0-20180314094923-5613a57406d1 // indirect github.com/muka/go-bluetooth v0.0.0-20181012115104-31d8f53bf9a1 - github.com/pkg/errors v0.8.0 // indirect + github.com/pkg/errors v0.8.0 github.com/sirupsen/logrus v1.2.0 // indirect github.com/stretchr/testify v1.2.2 )