hcitools_wrapper 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d603be0aa030331923e1af810fcc67eacec6ed8c
-  data.tar.gz: cb86854699886e27cb9a76383aad2fa3a3dbe889
+  metadata.gz: 4226dd2bf64738ccdefdefc96c7a145d70d892a3
+  data.tar.gz: 0129f4c5a91819e35d99fb3084dd247f5a66357d
 SHA512:
-  metadata.gz: 96463bfe68d72bb6fa5edb1d0e48e2d9d60bf20a3d97095dfbfad2085d4e11e5acea563e2120847be9083c404264681863bc24e5e460fa5614f81495ba867ab8
-  data.tar.gz: 485757bb6a2fa78aa047271c095ccc8d05c613310ca9710f5c5497f8d244593babb0d3988f46df5f829b6b423d256f51efe5cf9a8b07cb00be5113fb8bbf75aa
+  metadata.gz: 79b4edc9248b0dadce8fa70c2436378b843dba037a55ff1950e8a68d9f1964c268f3186d32d80064fb69ddd3cdfaa6d03673ac55172873af070b5c315c4d0281
+  data.tar.gz: 2984d116ff14eed0470e3d152bc803d1ddb250dfd7ea023ace7da991d3b331e22d6adb119a646691d174186d63e1ab1a5cefdddd554b64ed89e41ca248c47002

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-uq�G�����΅ך��Ab��W��J�ń��S�ݞ爤J��Y�\��z�����B�⌱�\lu��_�bhn�����H��������OՇ0�|���g��t����f�ƺ��2��������@����IGN�i��|��:pOT��������b?�M׆����t��Ӷ@��T���
-��gΉ��9�'���&�x���Ӛ�$)
+��&�ڴx� 3E����[��l�w��Y#{��6j�yp(PN�l	Qgb�ӹ�

data/lib/hcitools_wrapper.rb

@@ -31,10 +31,10 @@ module HcitoolsWrapper
 
   class Detect
 
-    def initialize(bd_address: '', interval: 0, verbose: false)
+    def initialize(bd_address: '', refreshinterval: 60, verbose: false)
 
       @bd_address = bd_address      
-      @interval = interval
+      @refreshinterval = refreshinterval
       @verbose = verbose
 
     end
@@ -45,44 +45,38 @@ module HcitoolsWrapper
       found, last_found = false, Time.now - 60
       a = []
 
-      t3 = Time.now + @interval
 
       IO.popen('sudo hcidump --raw').each_line do |x| 
         
         found = if found then
 
           rssi = (x.split.last.hex - 256)
-          a << rssi.to_i unless a.include? rssi.to_i
-          h = {bdaddress: @bd_address, rssi: rssi.inspect}
+          a << rssi unless a.include? rssi
+          h = {bdaddress: @bd_address, rssi: rssi}
 
-          if t3 <= Time.now then
+          avg = a.max + (a.min - a.max) / 2
 
-            avg = a.max + (a.min - a.max) / 2
+          if @verbose then
+            puts Time.now.inspect + ':  ' + h.inspect
+            puts "max: %s, min: %s, average: %s, a: %s" % \
+                                    [a.max, a.min, avg, a.sort.inspect]
 
-            if @verbose then
-              puts Time.now.inspect + ':  ' + h.inspect
-              puts "max: %s, min: %s, average: %s, a: %s" % \
-                                      [a.max, a.min, avg, a.sort.inspect]
-
-            end
-            
-            recent_movement = Time.now - last_found >= 60
-
-            # the RSSI will vary by up to 10 when the device is stationary
-            if recent_movement or a.length > 10 or rssi > (a.max + 10) or rssi < (a.min - 10) then
+          end
+          
+          recent_movement = Time.now - last_found >= @refreshinterval
 
-              puts 'movement!' if @verbose
-              
-              if block_given? then
-                yield a, avg
-              end
+          # the RSSI will vary by up to 10 when the device is stationary
+          if recent_movement or a.length > 10 then
 
-              a = []
+            puts 'movement!' if @verbose
+            
+            if block_given? then
+              yield( a, rssi == a.min ? rssi : avg)
             end
 
-            t3 = Time.now + @interval
+            a = []
           end
-          
+        
           last_found = Time.now
 
           false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hcitools_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson