somfy_sdn 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00033a8ac556f5b578c6d13b678b54393376c1f0439340dbd4afbd4a2376714
-  data.tar.gz: 1925c30fa53a68f0eb388b0ff277a00a0ae40bf2798a93ba8e9b955139b2c989
+  metadata.gz: 1e5c2c8156980740a28a35f3709e51175fa7df14206b88e636f1e5a4eecf8630
+  data.tar.gz: d1fa621ba70dc475755996b6d0c66621953675a4bc9725a840d530facf51a6ef
 SHA512:
-  metadata.gz: ce9dc75cac82bd65e4fd89908f6e6563761c5171c8dc93ab5b0e40fbe0ce0e0bb1dad7d90ef88470d90a050e7893fb1a35edb589ef2881886bf451d5962a6599
-  data.tar.gz: b82d6d1d60509009c7ea7b7501bd9790ae16f295185cdd5c125e10754e3a96ab9ef9d8956da8d4af554f88390eb4faea2eb4bfb7d0bb7e71248c23e043bc0338
+  metadata.gz: 3b09021cb98f1b1c7bc88c42d0b93d6e2da5115bd6d36ebdd69d6af36101857ad3844f77915b5ca706245d8feb468f920529642f46186c2b3583d56cea85482e
+  data.tar.gz: d0cf5c1d5cf0fc2edffdec548ee41122f49e2bab5454296084c2f61e068137f0cccdfe394809d6efafec8e282903046a1174cc47e89867643a86ba9573684727

data/exe/somfy_sdn

@@ -60,7 +60,7 @@ class SomfySDNCLI < Thor
 
   def handle_global_options(port)
     SDN.logger = Logger.new(options[:log]) if options[:log]
-    SDN.logger.level = options[:verbose] || options[:trace] ? :debug : :info
+    SDN.logger.level = (options[:verbose] || options[:trace]) ? :debug : :info
 
     SDN::Client.new(port).tap { |sdn| sdn.trace = options[:trace] }
   end

data/lib/sdn/cli/mqtt.rb

@@ -311,8 +311,8 @@ module SDN
           # message priorities are:
           # 0 - control
           # 1 - follow-up (i.e. get position after control)
-          # 2 - get basic motor info
-          # 3 - get advanced motor info
+          # 2 - get motor limits
+          # 3 - get motor info
           # 4 - get group 1
           # 5 - get ip 1
           # 6 - get group 2
@@ -323,24 +323,27 @@ module SDN
           # The Group and IP sorting makes it so you quickly get the most commonly used group
           # and IP addresses, while the almost-never-used ones are pushed to the bottom of the list
 
-          @queue.push(MessageAndRetries.new(Message::GetNodeLabel.new(sdn_addr), 5, 2))
+          @queue.push(MessageAndRetries.new(Message::GetNodeLabel.new(sdn_addr), 5, 3))
 
           case node_type
           when :st30, 0x20 # no idea why 0x20, but that's what I get
-            @queue.push(MessageAndRetries.new(Message::GetMotorStatus.new(sdn_addr), 5, 2))
             @queue.push(MessageAndRetries.new(Message::GetMotorLimits.new(sdn_addr), 5, 2))
+            @queue.push(MessageAndRetries.new(Message::GetMotorStatus.new(sdn_addr), 5, 3))
             @queue.push(MessageAndRetries.new(Message::GetMotorDirection.new(sdn_addr), 5, 3))
             @queue.push(MessageAndRetries.new(Message::GetMotorRollingSpeed.new(sdn_addr), 5, 3))
-            (1..16).each { |ip| 
-            @queue.push(MessageAndRetries.new(Message::GetMotorIP.new(sdn_addr, ip), 5, 2 * ip + 3)) }
+            (1..16).each do |ip|
+              @queue.push(MessageAndRetries.new(Message::GetMotorIP.new(sdn_addr, ip), 5, (2 * ip) + 3))
+            end
           when :st50ilt2
-            @queue.push(MessageAndRetries.new(Message::ILT2::GetMotorSettings.new(sdn_addr), 5, 2))
             @queue.push(MessageAndRetries.new(Message::ILT2::GetMotorPosition.new(sdn_addr), 5, 2))
+            @queue.push(MessageAndRetries.new(Message::ILT2::GetMotorSettings.new(sdn_addr), 5, 3))
             (1..16).each do |ip|
-              @queue.push(MessageAndRetries.new(Message::ILT2::GetMotorIP.new(sdn_addr, ip), 5, 2 * ip + 3))
+              @queue.push(MessageAndRetries.new(Message::ILT2::GetMotorIP.new(sdn_addr, ip), 5, (2 * ip) + 3))
             end
           end
-          (1..16).each { |g| @queue.push(MessageAndRetries.new(Message::GetGroupAddr.new(sdn_addr, g), 5, 2 * g + 2)) }
+          (1..16).each do |g|
+            @queue.push(MessageAndRetries.new(Message::GetGroupAddr.new(sdn_addr, g), 5, (2 * g) + 2))
+          end
 
           @cond.signal
         end

data/lib/sdn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SDN
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Cody Cutrer