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

.gitignore

@@ -2,3 +2,4 @@
 cmd/miflorad/miflorad
 cmd/munin-miflora/munin-miflora
 cmd/munin-miflora-gatt/munin-miflora-gatt
+pkg/miflorad-*

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 language: go
 go:
   - "1.11.x"
+  - "1.12.x"
   - master
 
 env:

LICENSE

@@ -0,0 +1,187 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.

Makefile

@@ -34,6 +34,14 @@ remote-run: clean
 	scp cmd/$(RUN_COMMAND)/$(RUN_COMMAND) extzero:$(RUN_COMMAND)
 	ssh extzero "./$(RUN_COMMAND) $(RUN_OPTIONS)"
 
+.PHONY: release
+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)" --github-repository "cmur2/miflorad"
+
 .PHONY: cmd/miflorad/miflorad
 cmd/miflorad/miflorad:
 	cd cmd/miflorad && CGO_ENABLED=0 go build -buildmode=pie -ldflags "-X main.version=$(MIFLORAD_VERSION)" && cd ../..

README.md

@@ -48,3 +48,20 @@ handle = 0x0040, char properties = 0x02, char value handle = 0x0041, uuid = 0000
 
 - [https://wiki.hackerspace.pl/projects:xiaomi-flora](https://wiki.hackerspace.pl/projects:xiaomi-flora) (very nice teardown)
 - [https://github.com/open-homeautomation/miflora](https://github.com/open-homeautomation/miflora) (python library)
+
+## Doing a release
+
+Install the [github-release binary](https://github.com/buildkite/github-release) helper somewhere into your path as `github-release`.
+
+You also need a [personal access token](https://github.com/settings/tokens) for your Github account.
+
+The below will create a Github release of `miflorad` based on your current git working copy and create a matching git tag:
+
+```bash
+export GITHUB_RELEASE_ACCESS_TOKEN=my-personal-access-token
+MIFLORAD_VERSION=x.y.z make release
+```
+
+## License
+
+miflorad is licensed under the Apache License, Version 2.0. See LICENSE for more information.

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)

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)
 

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())
 	}
 }

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))
 	}
 }

go.mod

@@ -1,20 +1,17 @@
 module miflorad
 
 require (
-	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // 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/mattn/go-colorable v0.0.9 // indirect
-	github.com/mattn/go-isatty v0.0.4 // 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.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-20180314094923-5613a57406d1 // indirect
-	github.com/muka/go-bluetooth v0.0.0-20190123084403-a5ba83cc4d9b
 	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
 )

go.sum

@@ -1,5 +1,9 @@
+github.com/coreos/go-systemd v0.0.0-20180202092358-40e2722dffea/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk=
 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=
@@ -7,46 +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/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/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/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-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=

renovate.json

@@ -4,10 +4,24 @@
   ],
   "commitMessagePrefix": "module:",
   "commitMessageAction": "update",
+  "rebaseStalePrs": true,
   "packageRules": [
     {
-      "packageNames": ["^golang.org/x/net"],
-      "enabled": false
+      "packageNames": [
+        "github.com/currantlabs/gatt",
+        "github.com/muka/ble",
+        "github.com/muka/go-bluetooth"
+      ],
+      "extends": ["schedule:weekly"]
+    },
+    {
+      "packageNames": [
+        "github.com/coreos/go-systemd",
+        "github.com/mgutz/ansi",
+        "github.com/mgutz/logxi",
+        "golang.org/x/net"
+      ],
+      "extends": ["schedule:monthly"]
     }
   ]
 }

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)
-// }