somfy_sdn 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00033a8ac556f5b578c6d13b678b54393376c1f0439340dbd4afbd4a2376714
-  data.tar.gz: 1925c30fa53a68f0eb388b0ff277a00a0ae40bf2798a93ba8e9b955139b2c989
+  metadata.gz: 376921afa9659381b31f588319c02f35f3d539052e8eb6375b311420bcdac60e
+  data.tar.gz: 8c8f5644816c615d0f31dec41e615a1d5857c1f1ee94e45d83bc759616c30e04
 SHA512:
-  metadata.gz: ce9dc75cac82bd65e4fd89908f6e6563761c5171c8dc93ab5b0e40fbe0ce0e0bb1dad7d90ef88470d90a050e7893fb1a35edb589ef2881886bf451d5962a6599
-  data.tar.gz: b82d6d1d60509009c7ea7b7501bd9790ae16f295185cdd5c125e10754e3a96ab9ef9d8956da8d4af554f88390eb4faea2eb4bfb7d0bb7e71248c23e043bc0338
+  metadata.gz: 84de94b508cc42c76bab56b3a02ba61cd389277463583353c67df5798a710016e143b4607367be71db35efa052949c146476a591ef4d8a08f54a99e76833e907
+  data.tar.gz: 2319f36c605560ebccc80e64600a26f2fec4abb806d33bb041bb0f667c41de1f6facecf8bd93b0ec557a676b34474393c1b4fa807a3cfcc84adbbae9244e0ccc

data/exe/somfy_sdn

@@ -3,6 +3,7 @@
 
 require "somfy_sdn"
 require "thor"
+require "uri"
 
 class SomfySDNCLI < Thor
   class_option :verbose, type: :boolean, default: false, desc: "Log protocol messages"
@@ -60,7 +61,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/subscriptions.rb

@@ -59,7 +59,7 @@ module SDN
                       case value
                       when "up", "down"
                         ((motor&.node_type == :st50ilt2) ? ns::SetMotorPosition : Message::MoveTo)
-                    .new(addr, "#{value}_limit".to_sym)
+                    .new(addr, :"#{value}_limit")
                       when "stop"
                         if motor&.node_type == :st50ilt2
                           ns::SetMotorPosition.new(addr,
@@ -89,7 +89,7 @@ module SDN
                     when /jog-(?:pulses|ms)/
                       value = value.to_i
                       ((motor&.node_type == :st50ilt2) ? ns::SetMotorPosition : Message::MoveOf)
-                    .new(addr, "jog_#{value.negative? ? :up : :down}_#{match[:jog_type]}".to_sym, value.abs)
+                    .new(addr, :"jog_#{value.negative? ? :up : :down}_#{match[:jog_type]}", value.abs)
                     when "reset"
                       return unless Message::SetFactoryDefault::RESET.key?(value.to_sym)
 

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/cli/provisioner.rb

@@ -130,11 +130,7 @@ module SDN
             end
             refresh
           when "l"
-            if ilt2?
-              sdn.ensure(Message::ILT2::SetMotorSettings.new(addr, reversed_int, @pos, @pos))
-            else
-              sdn.ensure(Message::SetMotorLimits.new(addr, :current_position, :down))
-            end
+            sdn.ensure(Message::ILT2::SetMotorSettings.new(addr, reversed_int, @pos, @pos))
             refresh
           when "r"
             @reversed = !@reversed

data/lib/sdn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Library for communication with Somfy SDN RS-485 motorized shades