tilt_hydrometer 0.1.0 → 0.2.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7787ee96428a2985cce2db098e27ef62e488f36c7bb261df9553985686bba5ae
-  data.tar.gz: e9b0fa8ed0434d3948635b24567ea1f47442b0ce6b687fbd265104d35da5c196
+  metadata.gz: d480d07da7125838e72233f8da54f30fbfd4dbc444cacaef2b677823d67c483e
+  data.tar.gz: a37e4eb5cd4a069b4eff654b1a12dc379e0e7766b1bc73b8c0169650fb3fc1fd
 SHA512:
-  metadata.gz: 6c2a109b1eaf8763e297e748dec7dabae01c5bfa9d1cbf10769691758e35e9e591beedf6b13bf48bc3d2be7b6eb4eb9250cac6275559c191876ced3a55b45166
-  data.tar.gz: 98acc5748a92c113f7b1f9001b2d8787f6ff0aea55a036fa184a1b98d9953cb2c4e1dfead82d5eef4e6b9ce0c1508595cdd2f5bd088d0beba2ff78bb72b2e92d
+  metadata.gz: ea7a7faf773b28514f0172dab26f8f84038c5490b152a7340fe7864a78c39a48fe37b8a76acffe7fb23ca1be1366321b50a2b248c2bd9f45c19097be0386894a
+  data.tar.gz: 69271f8ec92fb394675832f425b198e342276418725f779e0a230caede0d80b404828590a71435b715f20f3480b3a5969f717202e1268d30e4c31d90b275c336

data/lib/tilt_hydrometer.rb

@@ -2,15 +2,15 @@
 
 require 'logger'
 require 'json'
+require 'open3'
 
-require 'scan_beacon'
 require 'faraday'
 require 'mqtt'
 
 require 'tilt_hydrometer/version'
 require 'tilt_hydrometer/logger'
 require 'tilt_hydrometer/devices'
-require 'tilt_hydrometer/beacon_decorator'
+require 'tilt_hydrometer/beacon'
 require 'tilt_hydrometer/throttled_execution'
 require 'tilt_hydrometer/brewfather'
 require 'tilt_hydrometer/mqtt'

data/lib/tilt_hydrometer/{beacon_decorator.rb → beacon.rb}

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
 module TiltHydrometer
-  module BeaconDecorator
+  class Beacon
+    def initialize(uuid, temp, gravity)
+      @uuid = uuid
+      @temp = temp
+      @gravity = gravity
+    end
+
     def color
       TiltHydrometer::DEVICES[uuid]
     end
 
     def temp
-      data[0].to_i
+      @temp.to_i
     end
 
     def gravity
-      gravity_string = data[1].to_s
+      gravity_string = @gravity.to_s
 
       "#{gravity_string[-4] || 0}.#{gravity_string[-3..-1]}".to_f
     end
@@ -37,8 +43,9 @@ module TiltHydrometer
 
     def log
       LOGGER.debug("Beacon: #{inspect}")
-      LOGGER.debug("Data: #{data.inspect}")
-      LOGGER.debug("UUID: #{uuid.inspect}")
+      LOGGER.debug("Temp: #{temp.inspect}")
+      LOGGER.debug("Gravity: #{gravity.inspect}")
+      LOGGER.debug("UUID: #{@uuid.inspect}")
     end
   end
 end

data/lib/tilt_hydrometer/core.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 module TiltHydrometer
   class Core
     def initialize(options = {})
@@ -7,32 +9,39 @@ module TiltHydrometer
     end
 
     def run
-      scanner.scan do |beacons|
-        beacons.each do |beacon|
-          beacon.extend(TiltHydrometer::BeaconDecorator)
-          beacon.log
+      scanner_pid = spawn('hcitool lescan --passive --duplicates', out: File::NULL)
+      Process.detach(scanner_pid)
+
+      Open3.popen3 'hcidump -R' do |_stdin, stdout, _stderr, _thread|
+        buffer = []
+        while line = stdout.gets
+          if line.start_with?('>') || line.start_with?('<')
+            process_advertisement(buffer.join.gsub(/\s+/, ''))
 
-          if beacon.values_out_of_range?
-            LOGGER.debug('values out of range') && next
+            buffer = []
           end
 
-          brewfather&.post(beacon)
-          mqtt&.publish(beacon)
+          buffer << line[2..-2]
         end
       end
     end
 
     private
 
-    def scanner
-      @scanner ||=
-        ScanBeacon::DefaultScanner.new.tap do |s|
-          s.add_parser(
-            ScanBeacon::BeaconParser.new(
-              :tilt, 'm:0-5=4c000215a495,i:4-19,d:20-21,d:22-23,p:24-25'
-            )
-          )
+    def process_advertisement(data)
+      if match = data.match(/\h{40}(A495BB[1-8]0C5B14B44B5121370F02D74DE)(\h{4})(\h{4})(\h{2})(\h{2})/i)
+        uuid, temp, gravity, _power, _rssi = match.captures
+
+        beacon = Beacon.new(uuid, temp, gravity)
+        beacon.log
+
+        if beacon.values_out_of_range?
+          LOGGER.debug('values out of range')
+        else
+          brewfather&.post(beacon)
+          mqtt&.publish(beacon)
         end
+      end
     end
 
     def brewfather

data/lib/tilt_hydrometer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TiltHydrometer
-  VERSION = '0.1.0'
+  VERSION = '0.2.0.pre4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt_hydrometer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre4
 platform: ruby
 authors:
 - Steffen Schröder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: scan_beacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.11
 description: Read Tilt Hydrometer beacons and post to Brewfather
 email: steffen@schroeder-blog.de
 executables:
@@ -75,7 +61,7 @@ extra_rdoc_files: []
 files:
 - bin/tilt_hydrometer
 - lib/tilt_hydrometer.rb
-- lib/tilt_hydrometer/beacon_decorator.rb
+- lib/tilt_hydrometer/beacon.rb
 - lib/tilt_hydrometer/brewfather.rb
 - lib/tilt_hydrometer/core.rb
 - lib/tilt_hydrometer/devices.rb
@@ -98,9 +84,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6.2