scan_beacon 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d7b866b545422618dc14fc1229e8dc28fed321
-  data.tar.gz: b1989dea9025dec91ef228c1b3ef2bdcdb648eee
+  metadata.gz: 2854fb487434f83d2e24c5d9928d38f1da8c5159
+  data.tar.gz: 6e731cc3982883356caa1c8b87d94d8e7440c40b
 SHA512:
-  metadata.gz: 46609a18cce5083333cec616b6b6f24fcc2b92338c2360d09f8a31fef3da11e8eaeff152e63562c38b3013b69849132ad42796398334bee47f424b7569e6fd56
-  data.tar.gz: 22b231911ea22001e93a8cd6e70c0263c7fe3599ecf723677db1c31e952fe965f6b24a1ec97f3533083f504505b2963bf9d626c4f2d71f447359163bc5796703
+  metadata.gz: 74f7cb551de59d34214f478a6af5308b442910894360ce3abfd4a997c2b71f34a5d7009fce3b8c9dc3bd3979f1dc3b13166365852debf15960af43bb3bdb07b1
+  data.tar.gz: 6d5ddf2c696194f18daff43b165e3658995e4591c01859984a6cd8b16b01a5736098e60ecdf96e84c88fe520d9b2c7d7c93573dc9a172a16fd42a00bf5afb0e1

data/lib/scan_beacon/ble112_device.rb

@@ -28,14 +28,8 @@ module ScanBeacon
     BG_GAP_CONNECTABLE = 2
 
     def self.find_all
-      # try to reset all the possible devices
-      devices = Dir.glob("/dev/{cu.usbmodem,ttyACM}*")
-      devices.map {|device_path|
-        Thread.new { self.new(device_path).reset }
-      }.each(&:join)
-      # reset causes devices to reattach, possibly at different path
-      devices = Dir.glob("/dev/{cu.usbmodem,ttyACM}*")
-      devices.select {|device_path|
+      self.reset_all
+      possible_devices.select {|device_path|
         device = self.new(device_path)
         device.open{ device.get_addr } != nil
       }
@@ -134,6 +128,38 @@ module ScanBeacon
       sleep 1
     end
 
+    def self.possible_devices
+      Dir.glob("/dev/{cu.usbmodem,ttyACM}*")
+    end
+
+    def self.reset_all
+      # try to reset all the devices
+      device_count = possible_devices.count
+      possible_devices.each do |device_path|
+        File.open(device_path, 'r+b') do |file|
+          file.write([BG_COMMAND, 1, BG_MSG_CLASS_SYSTEM, BG_RESET, 0].pack('C*'))
+        end
+      end
+
+      # wait for them to show up again, but only wait for up to 5 secs
+      sleep 0.1
+      wait_count = 0
+      while possible_devices.count < device_count && wait_count < 50
+        sleep 0.1
+        wait_count += 1
+      end
+
+      # try to open them - if we get a busy, wait and try again
+      possible_devices.each do |device_path|
+        begin
+          File.open(device_path, 'r+b') {|f| f.close }
+        rescue Errno::EBUSY
+          sleep 0.1
+          retry
+        end
+      end
+    end
+
     class BLE112Response
       def initialize(data)
         data ||= ""

data/lib/scan_beacon/version.rb

@@ -1,3 +1,3 @@
 module ScanBeacon
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan_beacon
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Radius Networks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler