lxi_rb 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79bb0d516f205bcdeeb9dd3e12d685fde5237c481b66ec02d80b54e22bd393ce
-  data.tar.gz: f713c4887fae97699c9c26a9a42e7b7b8308b7d615529889c53e41a843bc2a6a
+  metadata.gz: 5e2583bda1cd48c51967b68e5b16f139c77f915cab04b8abbfd88165dba8b245
+  data.tar.gz: b4e21c0a5430cb59bcddfb8db0d4740da4a9368b0e695ed777083fb06b9d3bf4
 SHA512:
-  metadata.gz: def303af335abcb996b9f88709a8901da0b298e7687f46e72dbee56d451ea033972672c6f4a17e19ae9ce30a14cf34d92e5891472769e735d22c22718c019b07
-  data.tar.gz: c92a6342c28c3ba4d60d0480cd394d2ba6fa804c9abe0bf18b1327909fe43fa6ddc2edfb0ff3fd22abc66ac91b6ffeeaa72beea247ca08606c9bbc944e11753a
+  metadata.gz: 035f02d9942e7a270f0b3a4b3d4a1220e1ca0c01bd7a366e9a6ce39f635fdfc796a9df572856284fc6fcf12120142d8a87960cfa3d7abc55b2bcb682a007b8ec
+  data.tar.gz: ba12b510bc5f56cbd7ee5530c2d8c7119b2e6340c580ba84c0d863c175d74cbc596785ba63abc8aae958c9733f65c4731a17d6bfff1be81ad6968a72bcf11b6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lxi_rb (0.1.0)
+    lxi_rb (0.2.1)
       ffi (~> 1.15)
 
 GEM

data/lib/lxi/device.rb

@@ -17,10 +17,10 @@ module Lxi
     end
 
     def connect
-      raise Error, 'LXI Library Initialisation Error' unless Lxi.lxi_init == Lxi::OK
+      raise Error, 'LXI Library Initialisation Error' unless Lxi.lxi_init == LXI_OK
 
       @id = Lxi.lxi_connect(@address, @port, @name, @timeout, @protocol)
-      raise Error, 'LXI Connection Error' if @id == Lxi::ERROR
+      raise Error, 'LXI Connection Error' if @id == LXI_ERROR
 
       true
     end
@@ -42,7 +42,9 @@ module Lxi
 
     def read(length)
       message = FFI::MemoryPointer.new(:char, length)
-      raise Error, 'LXI communications error' unless Lxi.lxi_receive(@id, message, length, @timeout).positive?
+      bytes_received = Lxi.lxi_receive(@id, message, length, @timeout)
+      raise Error, 'LXI communications error' unless bytes_received.positive?
+
       message.read_string
     end
     alias gets read

data/lib/lxi/ffi.rb

@@ -7,27 +7,7 @@ module Lxi
   ffi_lib '/opt/homebrew/lib/liblxi.dylib'
   ffi_lib_flags :now, :global
 
-  # Define the enums
-  enum :lxi_protocol_type, %i[vxi11 raw hyslip]
-  enum :lxi_discover_type, %i[vxi11 mdns]
-
-  # Callbacks
-  BroadcastCallback =
-    FFI::Function.new(:void, %i[pointer pointer]) do |address, interface|
-      puts "Broadcast: #{address.read_string}, #{interface.read_string}"
-    end
-
-  DeviceCallback =
-    FFI::Function.new(:void, %i[pointer pointer]) do |address, id|
-      puts "Device: #{address.read_string}, #{id.read_string}"
-    end
-
-  ServiceCallback =
-    FFI::Function.new(:void, %i[pointer pointer pointer int]) do |address, id, service, port|
-      puts "Service: #{address.read_string}, #{id.read_string}, #{service.read_string}, #{port}"
-    end
-
-  # Define the structs
+  # Define liblxi structs
   class LxiInfo < FFI::Struct
     layout :broadcast,
            callback(%i[pointer pointer], :void),
@@ -37,7 +17,15 @@ module Lxi
            callback(%i[pointer pointer pointer int], :void)
   end
 
-  # Define the functions
+  # LXI Constants
+  LXI_OK = 0
+  LXI_ERROR = -1
+
+  # Define liblxi enums
+  enum :lxi_protocol_type, %i[vxi11 raw hyslip]
+  enum :lxi_discover_type, %i[vxi11 mdns]
+
+  # Expose liblxi functions
   attach_function :lxi_init, [], :int
   attach_function :lxi_discover_internal, :lxi_discover, [LxiInfo.ptr, :int, :lxi_discover_type], :int
   attach_function :lxi_discover_if, [LxiInfo.ptr, :string, :int, :lxi_discover_type], :int
@@ -46,36 +34,51 @@ module Lxi
   attach_function :lxi_receive, %i[int pointer int int], :int
   attach_function :lxi_disconnect, [:int], :int
 
-  # Define the constants
-  OK = 0
-  ERROR = -1
+  # VXI11 Discovery Callbacks
+  BroadcastCallback =
+    FFI::Function.new(:void, %i[pointer pointer]) do |address, interface|
+      puts "Broadcast: #{address.read_string}, #{interface.read_string}"
+    end
 
-  # Send and recieve scpi commands
-  def self.scpi(address, port = 0, name = nil, protocol, command)
-    response = FFI::MemoryPointer.new(:char, 65_536)
-    timeout = 1000
+  DeviceCallback =
+    FFI::Function.new(:void, %i[pointer pointer]) do |address, id|
+      puts "Device: #{address.read_string}, #{id.read_string}"
+    end
 
-    # Initialize LXI library
-    lxi_init
+  ServiceCallback =
+    FFI::Function.new(:void, %i[pointer pointer pointer int]) do |address, id, service, port|
+      puts "Service: #{address.read_string}, #{id.read_string}, #{service.read_string}, #{port}"
+    end
 
-    # Connect LXI device
-    device = lxi_connect(address, port, name, timeout, protocol)
+  # Initialise the LXI library
+  def init_lxi_session
+    raise Error, 'LXI Library Initialisation Error' unless lxi_init == LXI_OK
+  end
 
-    # Send SCPI command
-    lxi_send(device, command, command.length, timeout)
+  # Search for LXI-11 devices on the specified interface and return hash of devices
+  def self.devices(interface: 'en0', timeout: 1000, type: :vxi11)
+    raise Error, 'LXI Library Initialisation Error' unless lxi_init == LXI_OK
 
-    # Wait for response
-    lxi_receive(device, response, response.size, timeout)
+    devices = []
+    callback =
+      FFI::Function.new(:void, %i[pointer pointer]) do |address, id|
+        devices << { address: address.read_string, id: id.read_string }
+      end
 
-    puts response.read_string
+    info = LxiInfo.new
+    info[:broadcast] = BroadcastCallback
+    info[:device] = callback
 
-    # Disconnect
-    lxi_disconnect(device)
+    result = lxi_discover_internal(info, timeout, type)
+    sleep 0.1
+    puts "result: #{result}"
+    puts "info: #{info[:device].read_string}"
+    devices
   end
 
-  # Discover LXI devices on the LAN
-  def self.search(timeout: 1000, type: :vxi11)
-    lxi_init
+  # Discover LXI-11 devices on the LAN
+  def self.discover_local(timeout: 1000, type: :vxi11)
+    init_lxi_session
 
     info = LxiInfo.new
     info[:broadcast] = BroadcastCallback

data/lib/lxi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxi_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rob Carruthers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,7 +44,6 @@ files:
 - lib/lxi/ffi.rb
 - lib/lxi/version.rb
 - lib/lxi_rb.rb
-- lxi_rb.gemspec
 - sig/lxi_rb.rbs
 homepage: https://github.com/robcarruthers/lxi_rb
 licenses:

data/lxi_rb.gemspec

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/lxi/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'lxi_rb'
-  spec.version = Lxi::VERSION
-  spec.authors = ['Rob Carruthers']
-  spec.email = ['robcarruthers@mac.com']
-
-  spec.summary = 'Ruby wrapper for the liblxi library.'
-  spec.description = 'The gem includes methods required for discovering and communicating with LXI compliant devices'
-  spec.homepage = 'https://github.com/robcarruthers/lxi_rb'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.1.0'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/robcarruthers/lxi_rb'
-  spec.metadata['changelog_uri'] = 'https://github.com/robcarruthers/lxi_rb/-/blob/master/CHANGELOG.md'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files =
-    Dir.chdir(__dir__) do
-      `git ls-files -z`.split("\x0")
-        .reject do |f|
-          (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
-        end
-    end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency 'ffi', '~> 1.15'
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end