miflorad: check meta data incl battery level every hour instead daily

- the battery voltage level seems to have more flexibility than one change a day - short drops announcing end of battery life could go unnoticed
utils: remove unused legacy tool
2025-08-08 08:33:59 +02:00 · 2019-05-20 18:28:29 +02:00 · 2019-05-15 17:03:50 +02:00 · 2019-05-15 16:57:01 +02:00 · 2019-05-15 16:49:35 +02:00 · 2019-05-15 14:40:02 +02:00
9 changed files with 61 additions and 184 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 language: go
 go:
  - "1.11.x"
+  - "1.12.x"
  - master

 env:
--- a/3
+++ b/3
@@ -39,7 +39,8 @@ release:
 	mkdir -p pkg
 	cd cmd/miflorad && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o "../../pkg/miflorad-$(MIFLORAD_VERSION)-linux-amd64" -ldflags="-s -w -X main.version=$(MIFLORAD_VERSION)" && cd ../..
 	cd cmd/miflorad && CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -o "../../pkg/miflorad-$(MIFLORAD_VERSION)-linux-arm" -ldflags="-s -w -X main.version=$(MIFLORAD_VERSION)" && cd ../..
-	github-release "v$(MIFLORAD_VERSION)" pkg/miflorad-$(MIFLORAD_VERSION)-* --commit "master" --tag "v$(MIFLORAD_VERSION)" --prerelease --github-repository "cmur2/miflorad"
+#	github-release "v$(MIFLORAD_VERSION)" pkg/miflorad-$(MIFLORAD_VERSION)-* --commit "master" --tag "v$(MIFLORAD_VERSION)" --prerelease --github-repository "cmur2/miflorad"
+	github-release "v$(MIFLORAD_VERSION)" pkg/miflorad-$(MIFLORAD_VERSION)-* --commit "master" --tag "v$(MIFLORAD_VERSION)" --github-repository "cmur2/miflorad"

 .PHONY: cmd/miflorad/miflorad
 cmd/miflorad/miflorad:
--- a/cmd/miflorad/formatters_test.go
+++ b/cmd/miflorad/formatters_test.go
@@ -34,9 +34,9 @@ func TestPublishGraphite(t *testing.T) {
 		case mifloraErrorMetric:
 			for line := range publish {
 				parts := strings.Split(line, " ")
-				assert.Equal(t, len(parts), 3)
-				assert.Equal(t, parts[0], "foo.base.miflora.peri.failed")
-				assert.Equal(t, parts[1], "1")
+				assert.Equal(t, 3, len(parts))
+				assert.Equal(t, "foo.base.miflora.peri.failed", parts[0])
+				assert.Equal(t, "1", parts[1])
 				timestamp, err := strconv.ParseInt(parts[2], 10, 64)
 				assert.NoError(t, err)
 				assert.True(t, timestamp >= 0)
@@ -44,8 +44,8 @@ func TestPublishGraphite(t *testing.T) {
 		case mifloraDataMetric:
 			for line := range publish {
 				parts := strings.Split(line, " ")
-				assert.Equal(t, len(parts), 3)
-				assert.Equal(t, strings.Index(parts[0], "foo.base.miflora.peri"), 0)
+				assert.Equal(t, 3, len(parts))
+				assert.Equal(t, 0, strings.Index(parts[0], "foo.base.miflora.peri"))
 				assert.True(t, len(parts[1]) > 0)
 				timestamp, err := strconv.ParseInt(parts[2], 10, 64)
 				assert.NoError(t, err)
@@ -78,17 +78,17 @@ func TestPublishInflux(t *testing.T) {
 		case mifloraErrorMetric:
 			line := <-publish
 			parts := strings.Split(line, " ")
-			assert.Equal(t, len(parts), 3)
-			assert.Equal(t, parts[0], "miflora,id=peri")
-			assert.Equal(t, parts[1], "failed=1")
+			assert.Equal(t, 3, len(parts))
+			assert.Equal(t, "miflora,id=peri", parts[0])
+			assert.Equal(t, "failed=1", parts[1])
 			timestamp, err := strconv.ParseInt(parts[2], 10, 64)
 			assert.NoError(t, err)
 			assert.True(t, timestamp >= 0)
 		case mifloraDataMetric:
 			line := <-publish
 			parts := strings.Split(line, " ")
-			assert.Equal(t, len(parts), 3)
-			assert.Equal(t, parts[0], "miflora,id=peri")
+			assert.Equal(t, 3, len(parts))
+			assert.Equal(t, "miflora,id=peri", parts[0])
 			assert.True(t, len(parts[1]) > 0)
 			timestamp, err := strconv.ParseInt(parts[2], 10, 64)
 			assert.NoError(t, err)
--- a/cmd/miflorad/main.go
+++ b/cmd/miflorad/main.go
@@ -126,7 +126,7 @@ func getMQTTOptions() *mqtt.ClientOptions {
 func readData(peripheral *peripheral, client ble.Client) (common.SensorDataResponse, error) {
 	// re-request meta data (for battery level) if last check more than 24 hours ago
 	// Source: https://github.com/open-homeautomation/miflora/blob/ffd95c3e616df8843cc8bff99c9b60765b124092/miflora/miflora_poller.py#L92
-	if time.Since(peripheral.lastMetaDataFetch) >= 24*time.Hour {
+	if time.Since(peripheral.lastMetaDataFetch) >= 1*time.Hour {
 		metaData, err := impl.RequestVersionBattery(client)
 		if err != nil {
 			return common.SensorDataResponse{}, errors.Wrap(err, "can't request version battery")
@@ -151,7 +151,6 @@ func readData(peripheral *peripheral, client ble.Client) (common.SensorDataRespo
 }

 func connectPeripheral(peripheral *peripheral, send chan mifloraMetric) error {
-	fmt.Fprintf(os.Stderr, "Scanning for %s...\n", peripheral.id)

 	// only way to get back the found advertisement, must be buffered!
 	foundAdvertisementChannel := make(chan ble.Advertisement, 1)
@@ -215,28 +214,33 @@ func connectPeripheral(peripheral *peripheral, send chan mifloraMetric) error {
 	return nil
 }

-func readPeripheral(peripheral *peripheral, send chan mifloraMetric) error {
+func readPeripheral(quit chan struct{}, peripheral *peripheral, send chan mifloraMetric) error {
 	var err error
+	fmt.Fprintf(os.Stderr, "Scanning for %s...", peripheral.id)
+L:
 	for retry := 0; retry < *readRetries; retry++ {
+		// check for quit signal (non-blocking) and terminate
+		select {
+		case <-quit:
+			break L
+		default:
+		}
+
+		fmt.Fprintf(os.Stderr, " %d", retry+1)
 		err = connectPeripheral(peripheral, send)
 		// stop retrying once we have a success, last err will be returned (or nil)
 		if err == nil {
-			break
+			fmt.Fprintf(os.Stderr, ".")
+			break L
 		}
 	}
+	fmt.Fprintf(os.Stderr, "\n")
 	return err
 }

 func readAllPeripherals(quit chan struct{}, send chan mifloraMetric) {
 	for _, peripheral := range allPeripherals {
-		// check for quit signal (non-blocking) and terminate
-		select {
-		case <-quit:
-			return
-		default:
-		}
-
-		err := readPeripheral(peripheral, send)
+		err := readPeripheral(quit, peripheral, send)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Failed to read peripheral %s, err: %s\n", peripheral.id, err)
 			// id := common.MifloraGetAlphaNumericID(peripheral.id)
@@ -347,8 +351,8 @@ func main() {
 	fmt.Fprintf(os.Stderr, "Received %s! Stopping...\n", signal)
 	intervalTicker.Stop()
 	close(quit)
-	// wait for last readPeripheral to finish (worst case)
-	time.Sleep(*scanTimeout * time.Duration(*readRetries))
+	// wait for last connectPeripheral to finish (worst case)
+	time.Sleep(*scanTimeout)

 	mqttClient.Disconnect(1000)

--- a/common/datatypes_test.go
+++ b/common/datatypes_test.go
@@ -19,6 +19,6 @@ func TestNumericFirmwareVersion(t *testing.T) {
 	}

 	for _, table := range tables {
-		assert.Equal(t, table.metaData.NumericFirmwareVersion(), table.firmware)
+		assert.Equal(t, table.firmware, table.metaData.NumericFirmwareVersion())
 	}
 }
--- a/common/proto_test.go
+++ b/common/proto_test.go
@@ -19,7 +19,7 @@ func TestParseVersionBattery(t *testing.T) {
 	}

 	for _, table := range tables {
-		assert.Equal(t, ParseVersionBattery(table.bytes), table.metaData)
+		assert.Equal(t, table.metaData, ParseVersionBattery(table.bytes))
 	}
 }

@@ -40,6 +40,6 @@ func TestParseSensorData(t *testing.T) {
 	}

 	for _, table := range tables {
-		assert.Equal(t, ParseSensorData(table.bytes), table.sensorData)
+		assert.Equal(t, table.sensorData, ParseSensorData(table.bytes))
 	}
 }
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,17 @@
 module miflorad

 require (
-	github.com/coreos/go-systemd v0.0.0-20190222213131-93d5ec2c7f76 // indirect
+	github.com/coreos/go-systemd v0.0.0-20190401025500-95778dfbb74e // indirect
 	github.com/currantlabs/gatt v0.0.0-20161006170101-f949eac78f4e
-	github.com/eclipse/paho.mqtt.golang v1.1.1
+	github.com/eclipse/paho.mqtt.golang v1.2.0
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/go-ble/ble v0.0.0-20181002102605-e78417b510a3
-	github.com/godbus/dbus v0.0.0-20181031085051-66d97ae // indirect
+	github.com/go-ble/ble v0.0.0-20190515144946-e4c77014ff5a
 	github.com/mattn/go-colorable v0.1.1 // indirect
-	github.com/mattn/go-isatty v0.0.5 // indirect
+	github.com/mattn/go-isatty v0.0.7 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab // indirect
-	github.com/muka/ble v0.0.0-20190208063703-c5982255bf40 // indirect
-	github.com/muka/go-bluetooth v0.0.0-20190222211956-d9e43e1ad94a
 	github.com/pkg/errors v0.8.1
-	github.com/sirupsen/logrus v1.3.0 // indirect
+	github.com/sirupsen/logrus v1.4.1 // indirect
 	github.com/stretchr/testify v1.3.0
-	golang.org/x/net v0.0.0-20190111034749-915654e7eabc // indirect
+	golang.org/x/net v0.0.0-20190501013750-9ce7a6920f09 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -3,6 +3,7 @@ github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK
 github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190204113319-081494f7ee4f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190222213131-93d5ec2c7f76/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190401025500-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/currantlabs/gatt v0.0.0-20161006170101-f949eac78f4e h1:qu1wqkuctiqRtgZu8kNMtFxQ7/xXuOxSJZ2kYoOxFM0=
 github.com/currantlabs/gatt v0.0.0-20161006170101-f949eac78f4e/go.mod h1:GCdlaU9vOYeye8wQtSZNyZ4j5PhmnJ2HUqhRZO0KoZI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -10,59 +11,61 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/eclipse/paho.mqtt.golang v1.1.1 h1:iPJYXJLaViCshRTW/PSqImSS6HJ2Rf671WR0bXZ2GIU=
 github.com/eclipse/paho.mqtt.golang v1.1.1/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
+github.com/eclipse/paho.mqtt.golang v1.2.0 h1:1F8mhG9+aO5/xpdtFkW4SxOJB67ukuDC3t2y2qayIX0=
+github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
 github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/go-ble/ble v0.0.0-20181002102605-e78417b510a3 h1:rsLGztXl2QJvj4x/PAWzC1Zx6tnTDKlosaXAZfaXM8M=
 github.com/go-ble/ble v0.0.0-20181002102605-e78417b510a3/go.mod h1:UMPB54/KFpdTdfH7Yovhk3J6kzgzE88e3QZi8cbayis=
-github.com/godbus/dbus v0.0.0-20181031085051-66d97ae h1:NTs1uIj/Ru/QlpKwd9C9dnv/5zblvCXH7Dbn2oi3p98=
-github.com/godbus/dbus v0.0.0-20181031085051-66d97ae/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/go-ble/ble v0.0.0-20190515144946-e4c77014ff5a h1:Di8pZP1T0FmSSK1x+TsKQnq3Wn1dZ5wbpvLcqgit9wo=
+github.com/go-ble/ble v0.0.0-20190515144946-e4c77014ff5a/go.mod h1:UMPB54/KFpdTdfH7Yovhk3J6kzgzE88e3QZi8cbayis=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
+github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab h1:n8cgpHzJ5+EDyDri2s/GC7a9+qK3/YEGnBsd0uS/8PY=
 github.com/mgutz/logxi v0.0.0-20161027140823-aebf8a7d67ab/go.mod h1:y1pL58r5z2VvAjeG1VLGc8zOQgSOzbKN7kMHPvFXJ+8=
-github.com/muka/ble v0.0.0-20180314094923-5613a57406d1 h1:DrMDOYCxMG7TUMjhBWnRsgPfpPlz0sFL11ukl+2+CZU=
-github.com/muka/ble v0.0.0-20180314094923-5613a57406d1/go.mod h1:1lEPQDLh8Z86+REeQMqID8UpXCSdHF0fvU0qZj3b1eA=
-github.com/muka/ble v0.0.0-20190208060657-c5982255bf40/go.mod h1:1lEPQDLh8Z86+REeQMqID8UpXCSdHF0fvU0qZj3b1eA=
-github.com/muka/ble v0.0.0-20190208063703-c5982255bf40/go.mod h1:1lEPQDLh8Z86+REeQMqID8UpXCSdHF0fvU0qZj3b1eA=
-github.com/muka/go-bluetooth v0.0.0-20181012115104-31d8f53bf9a1 h1:VKhCDuxZ3+Bg+Plf7+CxgGRlNEdwHDKUqHoZLzer8Ms=
-github.com/muka/go-bluetooth v0.0.0-20181012115104-31d8f53bf9a1/go.mod h1:brKFFAJeW2mWp1W5D/GJhwbn3IpNR69jIm1qGWZcl50=
-github.com/muka/go-bluetooth v0.0.0-20190123084403-a5ba83cc4d9b/go.mod h1:brKFFAJeW2mWp1W5D/GJhwbn3IpNR69jIm1qGWZcl50=
-github.com/muka/go-bluetooth v0.0.0-20190204113330-048fce4f8d39/go.mod h1:brKFFAJeW2mWp1W5D/GJhwbn3IpNR69jIm1qGWZcl50=
-github.com/muka/go-bluetooth v0.0.0-20190205215946-510f85fa3c30/go.mod h1:brKFFAJeW2mWp1W5D/GJhwbn3IpNR69jIm1qGWZcl50=
-github.com/muka/go-bluetooth v0.0.0-20190222211956-d9e43e1ad94a/go.mod h1:tbUgXz7VZqw14AD1gArXW8wcVQtfGWBZAIhyMziuTck=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190107174441-1a61f4433d85/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190111034749-915654e7eabc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190301014737-92fc7df08ae7 h1:izsVbp6aRPsQs382yTgqgK3Sz5mgX1N/DQVRIYelTQE=
+golang.org/x/net v0.0.0-20190301014737-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190501013750-9ce7a6920f09 h1:5S8x497/nsQl7/BhsbJWW6AUJO4fVkqOQN8JOmPoiuM=
+golang.org/x/net v0.0.0-20190501013750-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190213121743-983097b1a8a3/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- a/utils/legacy/scanner.go
+++ b/utils/legacy/scanner.go
@@ -1,129 +0,0 @@
-//shows how to watch for new devices and list them
-package legacy
-
-import (
-	"os"
-
-	"github.com/muka/go-bluetooth/api"
-	"github.com/muka/go-bluetooth/emitter"
-	log "github.com/sirupsen/logrus"
-)
-
-const adapterID = "hci0"
-
-// func main() {
-// 	manager, err := api.NewManager()
-// 	if err != nil {
-// 		log.Error(err)
-// 		os.Exit(1)
-// 	}
-//
-// 	err = manager.RefreshState()
-// 	if err != nil {
-// 		log.Error(err)
-// 		os.Exit(1)
-// 	}
-//
-//   var address = "C4:7C:8D:66:D5:27"
-//
-//   dev, err := api.GetDeviceByAddress(address)
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   if dev == nil {
-//     log.Infof("No device found!")
-//     os.Exit(1)
-//   }
-//
-//   dev.GetAllServicesAndUUID()
-//
-//   props, err := dev.GetProperties()
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   log.Infof("name=%s addr=%s rssi=%d", props.Name, props.Address, props.RSSI)
-//
-//   err = dev.Connect()
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   if !dev.IsConnected() {
-//     log.Infof("Device not connected!")
-//     os.Exit(1)
-//   }
-//
-//   y, err := dev.GetCharByUUID("00002a00-0000-1000-8000-00805f9b34fb")
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   log.Infof(y.Path)
-//
-//   err = dev.Disconnect()
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-// }
-
-// func main() {
-//   log.SetLevel(log.DebugLevel)
-//
-//   // clean up connection on exit
-//   defer api.Exit()
-//
-//   manager, err := api.NewManager()
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   err = manager.RefreshState()
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//
-//   boo, err := api.AdapterExists(adapterID)
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//   log.Debugf("AdapterExists: %b", boo)
-//
-//   err = api.StartDiscoveryOn(adapterID)
-//   if err != nil {
-//     log.Error(err)
-//     os.Exit(1)
-//   }
-//   log.Debugf("Started discovery")
-//
-//   err = api.On("discovery", emitter.NewCallback(func(ev emitter.Event) {
-//     discoveryEvent := ev.GetData().(api.DiscoveredDeviceEvent)
-//     dev := discoveryEvent.Device
-//     handleDevice(dev)
-//   }))
-//
-//   select {}
-// }
-//
-// func handleDevice(dev *api.Device) {
-//   if dev == nil {
-//     return
-//   }
-//
-//   props, err := dev.GetProperties()
-//   if err != nil {
-//     log.Error(err)
-//     return
-//   }
-//
-//   log.Infof("name=%s addr=%s rssi=%d", props.Name, props.Address, props.RSSI)
-// }
Author	SHA1	Message	Date
cn	143dc374cf	miflorad: check meta data incl battery level every hour instead daily - the battery voltage level seems to have more flexibility than one change a day - short drops announcing end of battery life could go unnoticed	2019-05-20 18:28:29 +02:00
cn	0595d76f00	utils: remove unused legacy tool	2019-05-15 17:03:50 +02:00
renovate[bot]	cbe0bd62ae	module: update github.com/go-ble/ble commit hash to e4c7701 Update github.com/go-ble/ble commit hash to e4c7701 (#38)	2019-05-15 16:57:01 +02:00
renovate[bot]	3e30b6fcc1	module: update github.com/muka/go-bluetooth commit hash to 127007a Update github.com/muka/go-bluetooth commit hash to 127007a (#37)	2019-05-15 16:49:35 +02:00
renovate[bot]	bb849059d0	module: update github.com/muka/ble commit hash to 27e2a04 Update github.com/muka/ble commit hash to 27e2a04 (#36)	2019-05-15 14:40:02 +02:00
renovate[bot]	42b16dbae1	module: update golang.org/x/net commit hash to 9ce7a69 (#35 )	2019-05-02 09:36:58 +02:00
cn	9c1f76fbc4	module: drop pre-release state from release script	2019-04-27 21:54:15 +02:00
cn	d241c8c6be	miflorad: shorten process termination timeout by listening for quit on every retry	2019-04-23 16:15:38 +02:00
cn	4531a05af3	miflorad: improve logging to show peripheral connect retries	2019-04-23 15:40:28 +02:00
cn	f74628e2e4	module: fix dependencies	2019-04-19 11:25:06 +02:00
renovate[bot]	d2964bfde2	module: update module eclipse/paho.mqtt.golang to v1.2.0 (#33 )	2019-04-19 11:23:08 +02:00
renovate[bot]	d467e80126	module: update github.com/muka/go-bluetooth commit hash to 5c67d86 Update github.com/muka/go-bluetooth commit hash to 5c67d86 (#32)	2019-04-15 08:52:27 +02:00
renovate[bot]	0ad3fdf9f5	module: update module sirupsen/logrus to v1.4.1 Update module sirupsen/logrus to v1.4.1 (#31)	2019-04-03 07:28:25 +02:00
renovate[bot]	32d0daa0bb	module: update github.com/muka/go-bluetooth commit hash to 94cf950 Update github.com/muka/go-bluetooth commit hash to 94cf950 (#30)	2019-04-01 08:05:31 +02:00
renovate[bot]	16cae91017	module: update github.com/coreos/go-systemd commit hash to 95778df Update github.com/coreos/go-systemd commit hash to 95778df (#29)	2019-04-01 08:04:48 +02:00
renovate[bot]	d46ba7c1b3	module: update github.com/muka/go-bluetooth commit hash to 1174eff Update github.com/muka/go-bluetooth commit hash to 1174eff (#28)	2019-03-25 09:39:56 +01:00
renovate[bot]	dbae6940bf	module: update module mattn/go-isatty to v0.0.7 Update module mattn/go-isatty to v0.0.7 (#27)	2019-03-12 16:14:38 +01:00
renovate[bot]	702e38766c	module: update module sirupsen/logrus to v1.4.0 Update module sirupsen/logrus to v1.4.0 (#26)	2019-03-11 20:23:55 +01:00
renovate[bot]	a458e784a9	module: update github.com/muka/go-bluetooth commit hash to ed5c4e1 Update github.com/muka/go-bluetooth commit hash to ed5c4e1 (#25)	2019-03-04 12:36:33 +01:00
cn	befef9d063	module: change assert.Equal arguments to match (expected, actual)	2019-03-03 22:59:32 +01:00
renovate[bot]	388aff5252	module: update golang.org/x/net commit hash to 92fc7df Update golang.org/x/net commit hash to 92fc7df (#24)	2019-03-01 10:19:41 +01:00
renovate[bot]	a3b3ad0702	module: update module mattn/go-isatty to v0.0.6 Update module mattn/go-isatty to v0.0.6 (#23)	2019-02-28 17:55:13 +01:00
cn	c036ea0f73	module: support Go 1.12	2019-02-26 12:50:56 +01:00