lxi_rb 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b92e004dc07e1fe7bd3badd3ad1163c4555abe9ec2992b619ff9f49ffc657c
-  data.tar.gz: b0c02b7b8ef14803b3179b5360c9b5c515049dfe69e6137736d3d989cac0027a
+  metadata.gz: 3e72bc52c850f4d1904dd30130293eda4a68c004f201026f7b90f967980820db
+  data.tar.gz: bf7cf567edc90d38f1a295ffee34b7ac1eef04a564b5ebca1003995c9381fbea
 SHA512:
-  metadata.gz: 6ba992bf1a91502ba42c5ff7e5f408d38d627a56eb20019491ee3fd596a059881cb516ade0132d0be9551767c30e52ce471cffbd6a7b581ac985770456be1012
-  data.tar.gz: d85a26e8551eeee60d5aa87594d81027b6bd42a997b2234aa49d530f9431939346bd802ff3175e63a40ddff3b9e802e4e1d94f998f42aee8c0d57c0d2cf30980
+  metadata.gz: 56dd416d6c473a111929c8b69dcf12f8c4c0a71b65f3c3b1f8d37333022ceb902f6228d691fb8dbfb4884dcf284a6f9c07c9da8892e9eb8fcd038b15e75d959c
+  data.tar.gz: 44fea582e9a62f9f3c1c3eadc89838d471e1d9649c3627ad837d49a5e4ef5c5caf48036626f82782da307451635c0452de32f1d9eaf49820f44ea0b371baa896

data/CHANGELOG.md

@@ -1,5 +1,11 @@
-## [Unreleased]
+## v0.2.3 (2023-05-07)
+## v0.2.2 (2023-05-07)
+## v0.2.1 (2023-05-07)
 
-## [0.1.0] - 2023-05-02
+### New feature:
 
-- Initial release
+- **ffi**: Add search class method([`8f7351f`](https://github.com/robcarruthers/lxi_rb/commit/8f7351f9b541614a717a83d291d169b1fd8db356)) (by Rob Carruthers)
+
+## v0.2.0 (2023-05-07)
+
+## v0.1.0 (2023-05-07)

data/Gemfile.lock

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

data/lib/lxi/ffi.rb

@@ -3,18 +3,18 @@ require 'ffi'
 module Lxi
   extend FFI::Library
 
-  # Set the path to the library
   ffi_lib '/opt/homebrew/lib/liblxi.dylib'
   ffi_lib_flags :now, :global
 
-  # 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
-  attach_function :lxi_connect, %i[string int string int lxi_protocol_type], :int
-  attach_function :lxi_send, %i[int string int int], :int
-  attach_function :lxi_receive, %i[int pointer int int], :int
-  attach_function :lxi_disconnect, [:int], :int
+  # Define liblxi structs
+  class LxiInfo < FFI::Struct
+    layout :broadcast,
+           callback(%i[pointer pointer], :void),
+           :device,
+           callback(%i[pointer pointer], :void),
+           :service,
+           callback(%i[pointer pointer pointer int], :void)
+  end
 
   # LXI Constants
   LXI_OK = 0
@@ -24,6 +24,15 @@ module Lxi
   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
+  attach_function :lxi_connect, %i[string int string int lxi_protocol_type], :int
+  attach_function :lxi_send, %i[int string int int], :int
+  attach_function :lxi_receive, %i[int pointer int int], :int
+  attach_function :lxi_disconnect, [:int], :int
+
   # VXI11 Discovery Callbacks
   BroadcastCallback =
     FFI::Function.new(:void, %i[pointer pointer]) do |address, interface|
@@ -40,19 +49,35 @@ module Lxi
       puts "Service: #{address.read_string}, #{id.read_string}, #{service.read_string}, #{port}"
     end
 
-  # Define liblxi structs
-  class LxiInfo < FFI::Struct
-    layout :broadcast,
-           callback(%i[pointer pointer], :void),
-           :device,
-           callback(%i[pointer pointer], :void),
-           :service,
-           callback(%i[pointer pointer pointer int], :void)
+  # Initialise the LXI library
+  def init_lxi_session
+    raise Error, 'LXI Library Initialisation Error' unless lxi_init == LXI_OK
+  end
+
+  # 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
+
+    devices = []
+    callback =
+      FFI::Function.new(:void, %i[pointer pointer]) do |address, id|
+        devices << { address: address.read_string, id: id.read_string }
+      end
+
+    info = LxiInfo.new
+    info[:broadcast] = BroadcastCallback
+    info[:device] = callback
+
+    result = lxi_discover_internal(info, timeout, type)
+    sleep 0.1
+    puts "result: #{result}"
+    puts "info: #{info[:device].read_string}"
+    devices
   end
 
   # Discover LXI-11 devices on the LAN
-  def self.search(timeout: 1000, type: :vxi11)
-    lxi_init
+  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.2.0'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxi_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Rob Carruthers