ledenet_api 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899df804f239c23c90e1e13d71e2f91f95873ece
-  data.tar.gz: 92e0e57c1dc0c4a09469c12bdc94a0093645692e
+  metadata.gz: 1e5e8d4f413e19ff927524214a21ebca92d355cc
+  data.tar.gz: b6dc2f96936668a01e67d60aff2e563df065d89e
 SHA512:
-  metadata.gz: 1cef2986a4cb6c2aafd8c187a2fd9d02a54e333de1b34d628a513b62088c89936a220880b2af7ae7bf8e871167e98a67544681a34ee0c03a7b5991b70bf6cacf
-  data.tar.gz: 7566d9b24c17e14af7d510589ff006c75d930e65ea38f5ba0df3e31709703c6fe706341506c03512396012d910dade92525c6875e4ffeccba104730bf8f9f14e
+  metadata.gz: 60b9a5f1d845bacb6a282f0d8042783a999a260bdb50b91136b29dd45f593b35c8d9262e1754b06285fce171142fd8add6830be9f2eb91afda10d70ba7f4c741
+  data.tar.gz: 3f93c82424f55dc7fe237c30150d25e5223d6f5c61564be352ab8a6ab344b658016fce8022dd5888eb2926056fe965e9edff7cfc410c7d308efeb1112d60b546

data/README.md

@@ -61,15 +61,15 @@ $ ledenet-ufo --list
 #### Get current status
 
 ```
-$ ledenet-ufo -s
-{"red":"255","green":"255","blue":"255","warm_white":"255","is_on":true}
+$ ledenet-ufo --status
+{"is_on":true,"red":"255","green":"255","blue":"255","warm_white":"255","running_function?":false,"speed":61,"speed_packet_value":"12","function_name":"NO_FUNCTION","function_id":"97"}
 ```
 
 #### Turn on, adjust colors
 
 ```
 $ ledenet-ufo --on -r 200 -g 0 -b 255 --warm-white 0 --status
-{"red":"200","green":"0","blue":"255","warm_white":"255","is_on":true}
+{"is_on":true,"red":"200","green":"0","blue":"255","warm_white":"0","running_function?":false,"speed":99,"speed_packet_value":"0","function_name":"NO_FUNCTION","function_id":"97"}
 ```
 
 #### Turn off
@@ -81,7 +81,8 @@ $ ledenet-ufo --off
 #### Set function
 
 ```
-$ ledenet-ufo --function seven_color_cross_fade --speed 10
+$ ledenet-ufo --speed 60 --function seven_color_cross_fade --status
+{"is_on":true,"red":"255","green":"0","blue":"0","warm_white":"255","running_function?":true,"speed":61,"speed_packet_value":"12","function_name":"SEVEN_COLOR_CROSS_FADE","function_id":"37"}
 ```
 
 ### Ruby API
@@ -180,12 +181,13 @@ LEDENET::Functions.all_functions
 ```
 
 ```ruby
-fn = LEDENET::Functions::SEVEN_COLOR_CROSS_FADE
-speed = 0 # very slow
+api.update_function(:seven_color_cross_fade)
+api.update_function_speed(100) #very fast
 
-api.update_function(fn, speed)
-
-api.update_function(:blue_green_cross_fade, 100) # Very fast
+api.update_function_data(
+  function_id: LEDENET::Functions::BLUE_GREEN_CROSS_FADE,
+  speed: 50
+)
 ```
 
 To quit the function and return to a constant color, simply update a color value:

data/bin/ledenet-ufo

@@ -106,7 +106,7 @@ begin
     row_format = "%16s %18s %20s\n"
     printf row_format, "IP ADDRESS", "HW ADDRESS", "Model #"
 
-    LEDENET.discover_devices.each do |device|
+    devices.each do |device|
       formatted_hwaddr = (0...12).step(2)
         .map { |x| device.hw_addr[x, 2] }
         .join(':')
@@ -119,7 +119,9 @@ begin
     if options[:ip]
       ip = options[:ip]
     elsif options[:hw_addr]
-      r = LEDENET.discover_devices.select { |x| x.hw_addr == options[:hw_addr] }
+      r = LEDENET.discover_devices(expected_hw_addrs: [options[:hw_addr]])
+      r.select! { |x| x.hw_addr == options[:hw_addr] }
+
       if r.empty?
         raise "Couldn't find device with mac addr: #{options[:hw_addr]}"
       end

data/lib/ledenet/device_discovery.rb

@@ -19,6 +19,7 @@ module LEDENET
       expected_devices: 1,
       timeout: 5,
       expected_models: [],
+      expected_hw_addrs: [],
       udp_port: 48899
   }
 
@@ -39,12 +40,17 @@ module LEDENET
 
     discovered_devices = []
     discovered_models = Set.new
+    discovered_hw_addrs = Set.new
     expected_models = Set.new(options[:expected_models])
+    expected_hw_addrs = Set.new(
+      options[:expected_hw_addrs].map { |x| x.gsub(':', '').upcase }
+    )
 
     begin
       Timeout::timeout(options[:timeout]) do
-        while discovered_devices.count < options[:expected_devices] or
-              !expected_models.subset?(discovered_models)
+        while discovered_devices.count < options[:expected_devices] ||
+              !expected_models.subset?(discovered_models) ||
+              !expected_hw_addrs.subset?(discovered_hw_addrs)
           data = send_socket.recv(1024)
 
           device = LEDENET::Device.new(data)
@@ -52,6 +58,7 @@ module LEDENET
           if device.ip and device.hw_addr and device.model
             discovered_devices.push(device)
             discovered_models.add(device.model)
+            discovered_hw_addrs.add(device.hw_addr)
           end
         end
       end

data/lib/ledenet/version.rb

@@ -1,3 +1,3 @@
 module LEDENET
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledenet_api
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata