tilt_hydrometer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7787ee96428a2985cce2db098e27ef62e488f36c7bb261df9553985686bba5ae
-  data.tar.gz: e9b0fa8ed0434d3948635b24567ea1f47442b0ce6b687fbd265104d35da5c196
+  metadata.gz: da6e3efa982aaafa172cc2a9e0dc12fda976df1ba3300a618aadd0f398e7a116
+  data.tar.gz: 8f80be83fe3afc2881876d3a513e93db8b883287e52b74be2ea43ca01f4538d6
 SHA512:
-  metadata.gz: 6c2a109b1eaf8763e297e748dec7dabae01c5bfa9d1cbf10769691758e35e9e591beedf6b13bf48bc3d2be7b6eb4eb9250cac6275559c191876ced3a55b45166
-  data.tar.gz: 98acc5748a92c113f7b1f9001b2d8787f6ff0aea55a036fa184a1b98d9953cb2c4e1dfead82d5eef4e6b9ce0c1508595cdd2f5bd088d0beba2ff78bb72b2e92d
+  metadata.gz: a7bd9aa98f2f157b95b58cdc0ab18b79e02cbfcfc9db5dc88b513e224af33c039139608442cc2a3a368548ca4b20cb9bdc25dd8917a769a8ea752d624d05b6d5
+  data.tar.gz: 35f7da991f06c8d105db96389e34c438c430337323d61993738595d45ddf82ea9996736fd2a196fd191f8d05a0455f5993ef69ac9e8094adc3f8b701a0ecde1c

data/lib/tilt_hydrometer/beacon.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module TiltHydrometer
+  class Beacon
+    def initialize(uuid, temp, gravity)
+      @uuid = uuid
+      @temp = temp
+      @gravity = gravity
+    end
+
+    def uuid
+      @uuid
+    end
+
+    def color
+      TiltHydrometer::DEVICES[@uuid]
+    end
+
+    def temp
+      if pro?
+        @temp.to_i/10.0
+      else
+        @temp.to_i
+      end
+    end
+
+    def gravity
+      gravity_string = @gravity.to_s
+
+      if pro?
+        "#{gravity_string[-5] || 0}.#{gravity_string[-4..-1]}".to_f
+      else
+        "#{gravity_string[-4] || 0}.#{gravity_string[-3..-1]}".to_f
+      end
+    end
+
+    def plato
+      (
+        (-1 * 616.868) +
+        (1111.14 * gravity) -
+        (630.272 * (gravity**2)) +
+        (135.997 * (gravity**3))
+      ).round(1)
+    end
+
+    def celsius
+      (
+        (temp - 32.0) * (5.0 / 9.0)
+      ).round(1)
+    end
+
+    def values_out_of_range?
+      temp > 212 || temp < 1
+    end
+
+    def log
+      LOGGER.debug("Beacon: #{inspect}")
+      LOGGER.debug("Temp: #{temp}")
+      LOGGER.debug("Celsius: #{celsius}")
+      LOGGER.debug("Gravity: #{gravity}")
+      LOGGER.debug("Color: #{color}")
+      LOGGER.debug("UUID: #{@uuid}")
+    end
+
+    def pro?
+      @gravity.to_s[-5] == '1'
+    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,36 @@ module TiltHydrometer
     end
 
     def run
-      scanner.scan do |beacons|
-        beacons.each do |beacon|
-          beacon.extend(TiltHydrometer::BeaconDecorator)
-          beacon.log
+      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.to_i(16), gravity.to_i(16))
+        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/devices.rb

@@ -2,13 +2,13 @@
 
 module TiltHydrometer
   DEVICES = {
-    'A495BB10-C5B1-4B44-B512-1370F02D74DE' => 'Red',
-    'A495BB20-C5B1-4B44-B512-1370F02D74DE' => 'Green',
-    'A495BB30-C5B1-4B44-B512-1370F02D74DE' => 'Black',
-    'A495BB40-C5B1-4B44-B512-1370F02D74DE' => 'Purple',
-    'A495BB50-C5B1-4B44-B512-1370F02D74DE' => 'Orange',
-    'A495BB60-C5B1-4B44-B512-1370F02D74DE' => 'Blue',
-    'A495BB70-C5B1-4B44-B512-1370F02D74DE' => 'Yellow',
-    'A495BB80-C5B1-4B44-B512-1370F02D74DE' => 'Pink'
+    'A495BB10C5B14B44B5121370F02D74DE' => 'Red',
+    'A495BB20C5B14B44B5121370F02D74DE' => 'Green',
+    'A495BB30C5B14B44B5121370F02D74DE' => 'Black',
+    'A495BB40C5B14B44B5121370F02D74DE' => 'Purple',
+    'A495BB50C5B14B44B5121370F02D74DE' => 'Orange',
+    'A495BB60C5B14B44B5121370F02D74DE' => 'Blue',
+    'A495BB70C5B14B44B5121370F02D74DE' => 'Yellow',
+    'A495BB80C5B14B44B5121370F02D74DE' => 'Pink'
   }.freeze
 end

data/lib/tilt_hydrometer/mqtt.rb

@@ -9,7 +9,11 @@ module TiltHydrometer
 
     def publish(beacon)
       ::MQTT::Client.connect(@mqtt_uri) do |c|
-        c.publish(topic(beacon), beacon_json(beacon), true)
+        c.publish(topic(beacon), beacon_json(beacon))
+        c.publish(topic(beacon) + '/temp_f', beacon.temp)
+        c.publish(topic(beacon) + '/temp_c', beacon.celsius)
+        c.publish(topic(beacon) + '/gravity_sg', beacon.gravity)
+        c.publish(topic(beacon) + '/gravity_p', beacon.plato)
       end
     end
 

data/lib/tilt_hydrometer/version.rb

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

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'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tilt_hydrometer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steffen Schröder
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -87,7 +73,7 @@ homepage: https://github.com/ChaosSteffen/tilt_hydrometer
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,16 +81,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.5
+      version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Tilt Hydrometer
 test_files: []

data/lib/tilt_hydrometer/beacon_decorator.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module TiltHydrometer
-  module BeaconDecorator
-    def color
-      TiltHydrometer::DEVICES[uuid]
-    end
-
-    def temp
-      data[0].to_i
-    end
-
-    def gravity
-      gravity_string = data[1].to_s
-
-      "#{gravity_string[-4] || 0}.#{gravity_string[-3..-1]}".to_f
-    end
-
-    def plato
-      (
-        (-1 * 616.868) +
-        (1111.14 * gravity) -
-        (630.272 * (gravity**2)) +
-        (135.997 * (gravity**3))
-      ).round(1)
-    end
-
-    def celsius
-      (
-        (temp - 32.0) * (5.0 / 9.0)
-      ).round(1)
-    end
-
-    def values_out_of_range?
-      temp > 212
-    end
-
-    def log
-      LOGGER.debug("Beacon: #{inspect}")
-      LOGGER.debug("Data: #{data.inspect}")
-      LOGGER.debug("UUID: #{uuid.inspect}")
-    end
-  end
-end