lib/prologix_gpib/usb.rb in prologix_gpib-0.5.0 vs lib/prologix_gpib/usb.rb in prologix_gpib-0.5.2

@@ -7,12 +7,11 @@
   EOL = "\r\n".freeze
 
   attr_reader :serial_port
 
   def initialize(path, mode: :controller, address: 9)
-    paths = path.nil? ? PrologixGpib.controller_paths : [path]
-    open_serial_port(paths)
+    open_serial_port(path)
     flush
     self.mode = mode
     self.address = address
     self.auto = :disable
     self.eos = 0
@@ -26,14 +25,14 @@
     @serial_port.close
     @serial_port = nil
     @serial_port.nil?
   end
 
-  def write(str)
+  def write(string)
     return unless connected?
 
-    @serial_port.write("#{str}#{EOL}")
+    @serial_port.write("#{string}#{EOL}")
   end
 
   def read(bytes)
     return unless connected?
 
@@ -41,11 +40,11 @@
   end
 
   def readline
     return unless connected?
 
-    t = Timeout.timeout(1, Timeout::Error, 'No response from Data Acquisistion') { getline }
+    t = Timeout.timeout(1, Timeout::Error, 'No response from device') { getline }
   end
 
   def sr(register = nil)
     write 'SR'
     write '++read eoi'
@@ -55,28 +54,39 @@
     register.nil? ? array : array[register - 1]
   end
 
   private
 
-  def open_serial_port(paths)
-    paths.each do |path|
-      @serial_port = Serial.new(path)
-      write('++ver')
-      return if getline.include? 'Prologix'
-    end
+  def open_serial_port(path)
+    @serial_port = Serial.new(path)
+    write('++ver')
+    return if getline.include? 'Prologix'
+
     raise Error, 'No Prologix USB controllers found.'
   end
 
   def connected?
     raise Error, 'ConnectionError: No open Prologix device connections.' if @serial_port.nil?
 
     true
   end
 
+  def flush
+    return unless connected?
+
+    loop until serial_port.getbyte.nil?
+  end
+
   # This method will block until the EOL terminator is received
   # The lower level gets method is pure ruby, so can be safely used with Timeout.
   def getline
     return unless connected?
 
     @serial_port.gets(EOL).chomp
+  end
+
+  def device_query(command)
+    flush
+    write(command)
+    readline
   end
 end