home_assistant-ble 1.2.0.pre.alpha.pre.25 → 1.2.0.pre.alpha.pre.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18742553e5d1415a026d205fa5aaa1bbd21944b
-  data.tar.gz: 024c171360e06c15fe0c41a7a7451b6896cd6542
+  metadata.gz: e962366e242a811c1629e3d1b6b31f8cf091df6f
+  data.tar.gz: 2d4f69d0681cfecf051518f5ee7e67b7946a699a
 SHA512:
-  metadata.gz: c6aa82f4939aa225a3cb5c1b71a93cd2bf5bdc5b69f437cf51d572c12ea232a203fcd29b6d5fffc505e78eba532fa5d5b402faedb7f18e6c337004cfe137e315
-  data.tar.gz: d164b86fd4481664e68ec265005cb0b0e767bd179fdd05115944469ab6a4f09b727a01c1188a52a6b8ed0f63f1ca1a15112545059bc886155083d76d32046b46
+  metadata.gz: a354881a9191742f2a63da85031fb8e50139d6bafb46ad370fa67d5a10854257475013dff7987f94346be9d853b234741a66451869a2c04c6df6f575f559258e
+  data.tar.gz: 460e4979e32733a61a6d9321c15e9e91c781482c8de60850bd309f130a3b78fd6dee6078653548786b951f00c5b7d2b33bf03af6e5be4861c3ef484ca096c190

data/lib/home_assistant/ble.rb

@@ -16,6 +16,10 @@ module HomeAssistant
         @known_devices = {}
       end
 
+      def discovery_time
+        config['discovery_time'] || 60
+      end
+
       # polling interval
       def interval
         config['interval'] || 30
@@ -50,9 +54,9 @@ module HomeAssistant
 
       def run
         loop do
-          detect_devices
+          discover
+          detect_new_devices
           clean_devices
-          release_adapter
           debug "Will sleep #{interval}s before relisting devices"
           sleep interval
         end
@@ -72,7 +76,7 @@ module HomeAssistant
         puts message
       end
 
-      def detect_devices
+      def detect_new_devices
         adapter.devices.each do |name|
           unless known_devices.key?(name)
             log "Just discovered #{name}"
@@ -122,18 +126,20 @@ module HomeAssistant
                        iface = BLE::Adapter.list.first
                        debug "Selecting #{iface} to listen for bluetooth events"
                        raise 'Unable to find a bluetooth device' unless iface
-                       BLE::Adapter.new(iface).tap do |a|
-                         debug 'Activating discovery'
-                         a.start_discovery
-                         debug 'Sleeping a bit to discover devices'
-                         sleep 20
-                         a.stop_discovery
-                       end
+                       BLE::Adapter.new(iface)
                      end
       end
 
-      def release_adapter
-        @adapter = nil
+      def discover
+        debug 'Cleaning old devices'
+        adapter.devices.dup.each do |d|
+          adapter[d].remove
+        end
+        debug 'Activating discovery'
+        adapter.start_discovery
+        debug 'Sleeping a bit to discover devices'
+        sleep discovery_time
+        adapter.stop_discovery
       end
 
       def ensure_rights!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: home_assistant-ble
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.alpha.pre.25
+  version: 1.2.0.pre.alpha.pre.26
 platform: ruby
 authors:
 - Grégoire Seux