somfy_sdn 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d95ac8d2a5acf1ceb0e03051645d8b243f0feffd89da389757df490a85fd6b
-  data.tar.gz: 86cd04871922fbad94f4b1c7fc5a99da211a1f4cffd398ee69c1cda8ffdcc681
+  metadata.gz: ef81905b4b164a5e09d771e07b286f09df6d40cd259b8253c2a0ef1f01f649e4
+  data.tar.gz: 4d6f3ad72d6b2e8f06c530a8657d684f4f0b12c9d54eb13e998841b18a8e37dd
 SHA512:
-  metadata.gz: 430f8b9cab0a245abe7b150203556376de5afbe409a7f5272634880157b831aed32434baf9758e55bb00ba2afbd732f9e3e8b19605e9e2bb51619a2dc5080405
-  data.tar.gz: b51a53a9cabd2d2efadcff644b7c7bdfce958744228f6092c318d7bfec4447302570e20de8d36a78e09496e3c5a5a3ec1cf6e32bbbeedb29abcc12bad0a27d64
+  metadata.gz: 8bf05e27c1e7c50e6893198950d7ab91099807c9d8ad139629e89fe3fc97d6f46c87e93400e1083ecba7c64ec3638a302523804fd921125414aa62f3632e5edb
+  data.tar.gz: 3300c346eeb666d82c686c0e5dec4fb830fa96adabdd7dbc45f3d4cd8e609c13f2796d1ae0b6cd2b2186bcf1ae3251d180e17dd33d578ccfa29eba3f86870e4a

data/lib/sdn.rb

@@ -0,0 +1,6 @@
+require 'sdn/message'
+require 'sdn/mqtt_bridge'
+
+module SDN
+  BROADCAST_ADDRESS = [0xff, 0xff, 0xff]
+end

data/lib/sdn/message.rb

@@ -3,15 +3,23 @@ require 'sdn/messages/helpers'
 module SDN
   class MalformedMessage < RuntimeError; end
 
-  class Message  
+  class Message
     class << self
+      def expected_response
+        if name =~ /::Get([A-Za-z]+)/
+          const_get("Post#{$1}", true)
+        else
+          Ack
+        end
+      end
+
       def parse(data)
         offset = -1
         msg = length = ack_requested = message_class = nil
         # we loop here scanning for a valid message
         loop do
           offset += 1
-          return nil if data.length - offset < 11
+          return [nil, 0] if data.length - offset < 11
           msg = to_number(data[offset])
           length = to_number(data[offset + 1])
           ack_requested = length & 0x80 == 0x80
@@ -39,9 +47,14 @@ module SDN
         reserved = to_number(data[offset + 2])
         src = transform_param(data.slice(offset + 3, 3))
         dest = transform_param(data.slice(offset + 6, 3))
-        result = message_class.new(reserved: reserved, ack_requested: ack_requested, src: src, dest: dest)
-        result.parse(data.slice(offset + 9, length - 11))
-        result.msg = msg if message_class == UnknownMessage
+        begin
+          result = message_class.new(reserved: reserved, ack_requested: ack_requested, src: src, dest: dest)
+          result.parse(data.slice(offset + 9, length - 11))
+          result.msg = msg if message_class == UnknownMessage
+        rescue ArgumentError => e
+          puts "discarding illegal message #{e}"
+          result = nil
+        end
         [result, offset + length]
       end
     end
@@ -50,6 +63,7 @@ module SDN
     singleton_class.include Helpers
 
     attr_reader :reserved, :ack_requested, :src, :dest
+    attr_writer :ack_requested
 
     def initialize(reserved: nil, ack_requested: false, src: nil, dest: nil)
       @reserved = reserved || 0x02 # message sent to Sonesse 30
@@ -72,10 +86,13 @@ module SDN
       length |= 0x80 if ack_requested
       result = transform_param(self.class.const_get(:MSG)) + transform_param(length) + result
       result.concat(checksum(result))
-      puts "wrote #{result.map { |b| '%02x' % b }.join(' ')}"
       result.pack("C*")
     end
 
+    def ==(other)
+      self.serialize == other.serialize
+    end
+
     def inspect
       "#<%s @reserved=%02xh, @ack_requested=%s, @src=%s, @dest=%s%s>" % [self.class.name, reserved, ack_requested, print_address(src), print_address(dest), class_inspect]
     end

data/lib/sdn/messages/control.rb

@@ -27,17 +27,17 @@ module SDN
      end
 
      def direction=(value)
-        raise ArgumentError, "direction must be one of :down, :up, or :cancel" unless DIRECTION.keys.include?(value)
+        raise ArgumentError, "direction must be one of :down, :up, or :cancel (#{value})" unless DIRECTION.keys.include?(value)
         @direction = value
      end
 
      def duration=(value)
-        raise ArgumentError, "duration must be in range 0x0a to 0xff" unless value || value >= 0x0a && value <= 0xff
+        raise ArgumentError, "duration must be in range 0x0a to 0xff (#{value})" unless value && value >= 0x0a && value <= 0xff
         @duration = value
      end
 
      def speed=(value)
-        raise ArgumentError, "speed must be one of :up, :down, or :slow" unless SPEED.keys.include?(value)
+        raise ArgumentError, "speed must be one of :up, :down, or :slow (#{value})" unless SPEED.keys.include?(value)
         @speed = speed
       end
 

data/lib/sdn/messages/ilt2/get.rb

@@ -0,0 +1,9 @@
+module SDN
+  class Message
+    module ILT2
+      class GetMotorPosition < SimpleRequest
+        MSG = 0x44
+      end
+    end
+  end
+end

data/lib/sdn/messages/ilt2/post.rb

@@ -0,0 +1,18 @@
+module SDN
+  class Message
+    module ILT2
+      class PostMotorPosition < Message
+        MSG = 0x64
+        PARAMS_LENGTH = 3
+  
+        attr_accessor :position_pulses, :position_percent
+  
+        def parse(params)
+          super
+          self.position_pulses = to_number(params[0..1])
+          self.position_percent = to_number(params[2]).to_f / 255 * 100
+        end
+      end
+    end
+  end
+end

data/lib/sdn/messages/ilt2/set.rb

@@ -0,0 +1,59 @@
+module SDN
+  class Message
+    module ILT2
+      class SetMotorPosition < Message
+        MSG = 0x54
+        PARAMS_LENGTH = 3
+        TARGET_TYPE = {
+          up_limit: 1,
+          down_limit: 2,
+          stop: 3,
+          ip: 4,
+          next_ip_up: 5,
+          next_ip_down: 6,
+          jog_up: 10,
+          jog_down: 11,
+          position_percent: 16,
+        }.freeze
+
+        attr_reader :target_type, :target
+
+        def initialize(dest = nil, target_type = :up_limit, target = 0, **kwargs)
+          kwargs[:dest] ||= dest
+          super(**kwargs)
+          self.target_type = target_type
+          self.target = target
+        end
+
+        def parse(params)
+          super
+          self.target_type = TARGET_TYPE.invert[to_number(params[0])]
+          target = to_number(params[1..2])
+          if target_type == :position_percent
+            target = target.to_f / 255 * 100
+          end
+          self.target = target
+        end
+
+        def target_type=(value)
+          raise ArgumentError, "target_type must be one of :up_limit, :down_limit, :stop, :ip, :next_ip_up, :next_ip_down, :jog_up, :jog_down, or :position_percent" unless TARGET_TYPE.keys.include?(value)
+          @target_type = value
+        end
+
+        def target=(value)
+          if target_type == :position_percent && value
+            @target = [[0, value].max, 100].min
+          else
+            @target = value&. & 0xffff
+          end
+        end
+
+        def params
+          param = target
+          param = (param * 255 / 100).to_i if target_type == :position_percent
+          transform_param(TARGET_TYPE[target_type]) + from_number(param, 2)
+        end
+      end
+    end
+  end
+end

data/lib/sdn/mqtt_bridge.rb

@@ -1,10 +1,36 @@
 require 'mqtt'
-require 'serialport'
-require 'socket'
 require 'uri'
 require 'set'
 
 module SDN
+  MessageAndRetries = Struct.new(:message, :remaining_retries, :priority)
+
+  Group = Struct.new(:bridge, :addr, :positionpercent, :state, :motors) do
+    def initialize(*)
+      members.each { |k| self[k] = :nil }
+      super
+    end
+
+    def publish(attribute, value)
+      if self[attribute] != value
+        bridge.publish("#{addr}/#{attribute}", value.to_s)
+        self[attribute] = value
+      end
+    end
+
+    def printed_addr
+      Message.print_address(Message.parse_address(addr))
+    end
+
+    def motor_objects
+      bridge.motors.select { |addr, motor| motor.groups_string.include?(printed_addr) }.values
+    end
+
+    def motors_string
+      motor_objects.map { |m| SDN::Message.print_address(SDN::Message.parse_address(m.addr)) }.sort.join(',')
+    end
+  end
+
   Motor = Struct.new(:bridge,
                      :addr,
                      :label,
@@ -53,50 +79,58 @@ module SDN
                      :ip15percent,
                      :ip16pulses,
                      :ip16percent,
-                     :groups) do
-     def initialize(*)
-       members.each { |k| self[k] = :nil }
-       @groups = [].fill(nil, 0, 16)
-       super
-     end
-
-     def publish(attribute, value)
-       if self[attribute] != value
-         bridge.publish("#{addr}/#{attribute}", value.to_s)
-         self[attribute] = value
-       end
-     end
-
-     def add_group(index, address)
-       bridge.add_group(SDN::Message.print_address(address)) if address
-       @groups[index] = address
-       publish(:groups, groups_string)
-     end
-
-     def set_groups(groups)
-       return unless groups =~ /^(?:\h{2}[:.]?\h{2}[:.]?\h{2}(?:,\h{2}[:.]?\h{2}[:.]?\h{2})*)?$/i
-       groups = groups.split(',').sort.uniq.map { |g| SDN::Message.parse_address(g) }
-       groups.fill(nil, groups.length, 16 - groups.length)
-       messages = []
-       sdn_addr = SDN::Message.parse_address(addr)
-       groups.each_with_index do |g, i|
-         if @groups[i] != g
-           messages << SDN::Message::SetGroupAddr.new(sdn_addr, i, g)
-           messages << SDN::Message::GetGroupAddr.new(sdn_addr, i)
-         end
-       end
-       messages
-     end
-
-     def groups_string
-       @groups.compact.map { |g| SDN::Message.print_address(g) }.sort.uniq.join(',')
-     end
+                     :groups,
+                     :last_action) do
+    def initialize(*)
+      members.each { |k| self[k] = :nil }
+      @groups = [].fill(nil, 0, 16)
+      super
+    end
+
+    def publish(attribute, value)
+      if self[attribute] != value
+        bridge.publish("#{addr}/#{attribute}", value.to_s)
+        self[attribute] = value
+      end
+    end
+
+    def add_group(index, address)
+      group = bridge.add_group(SDN::Message.print_address(address)) if address
+      @groups[index] = address
+      group&.publish(:motors, group.motors_string)
+      publish(:groups, groups_string)
+    end
+
+    def set_groups(groups)
+      return unless groups =~ /^(?:\h{2}[:.]?\h{2}[:.]?\h{2}(?:,\h{2}[:.]?\h{2}[:.]?\h{2})*)?$/i
+      groups = groups.split(',').sort.uniq.map { |g| SDN::Message.parse_address(g) }.select { |g| SDN::Message.is_group_address?(g) }
+      groups.fill(nil, groups.length, 16 - groups.length)
+      messages = []
+      sdn_addr = SDN::Message.parse_address(addr)
+      groups.each_with_index do |g, i|
+        if @groups[i] != g
+          messages << SDN::Message::SetGroupAddr.new(sdn_addr, i, g).tap { |m| m.ack_requested = true }
+          messages << SDN::Message::GetGroupAddr.new(sdn_addr, i)
+        end
+      end
+      messages
+    end
+
+    def groups_string
+      @groups.compact.map { |g| SDN::Message.print_address(g) }.sort.uniq.join(',')
+    end
+
+    def group_objects
+      groups_string.split(',').map { |addr| bridge.groups[addr.gsub('.', '')] }
+    end
   end
 
   class MQTTBridge
     WAIT_TIME = 0.25
     BROADCAST_WAIT = 5.0
 
+    attr_reader :motors, :groups
+
     def initialize(mqtt_uri, port, device_id: "somfy", base_topic: "homie")
       @base_topic = "#{base_topic}/#{device_id}"
       @mqtt = MQTT::Client.new(mqtt_uri)
@@ -104,12 +138,11 @@ module SDN
       @mqtt.connect
 
       @motors = {}
-      @groups = Set.new
+      @groups = {}
 
       @mutex = Mutex.new
       @cond = ConditionVariable.new
-      @command_queue = []
-      @request_queue = []
+      @queues = [[], [], []]
       @response_pending = false
       @broadcast_pending = false
 
@@ -117,23 +150,34 @@ module SDN
 
       uri = URI.parse(port)
       if uri.scheme == "tcp"
+        require 'socket'
         @sdn = TCPSocket.new(uri.host, uri.port)
+      elsif uri.scheme == "telnet" || uri.scheme == "rfc2217"
+        require 'net/telnet/rfc2217'
+        @sdn = Net::Telnet::RFC2217.new('Host' => uri.host,
+         'Port' => uri.port || 23,
+         'baud' => 4800,
+         'parity' => Net::Telnet::RFC2217::ODD)
       else
-        @sdn = SerialPort.open(port, "baud" => 4800, "parity" => SerialPort::ODD)
+        require 'ccutrer-serialport'
+        @sdn = CCutrer::SerialPort.new(port, baud: 4800, parity: :odd)
       end
 
       read_thread = Thread.new do
         buffer = ""
+
         loop do
           begin
             message, bytes_read = SDN::Message.parse(buffer.bytes)
+            # discard how much we read
+            buffer = buffer[bytes_read..-1]
             unless message
               begin
-                buffer.concat(@sdn.read_nonblock(1))
+                buffer.concat(@sdn.read_nonblock(64 * 1024))
                 next
-              rescue IO::WaitReadable
+              rescue IO::WaitReadable, EOFError
                 wait = buffer.empty? ? nil : WAIT_TIME
-                if IO.select([@sdn], nil, nil, wait).nil?
+                if @sdn.wait_readable(wait).nil?
                   # timed out; just discard everything
                   puts "timed out reading; discarding buffer: #{buffer.unpack('H*').first}"
                   buffer = ""
@@ -141,8 +185,6 @@ module SDN
               end
               next
             end
-            # discard how much we read
-            buffer = buffer[bytes_read..-1]
 
             src = SDN::Message.print_address(message.src)
             # ignore the UAI Plus and ourselves
@@ -162,8 +204,24 @@ module SDN
               motor.publish(:positionpercent, message.position_percent)
               motor.publish(:positionpulses, message.position_pulses)
               motor.publish(:ip, message.ip)
+              motor.group_objects.each do |group|
+                positions = group.motor_objects.map(&:positionpercent)
+                position = nil
+                # calculate an average, but only if we know a position for
+                # every shade
+                if !positions.include?(:nil) && !positions.include?(nil)
+                  position = positions.inject(&:+) / positions.length
+                end
+
+                group.publish(:positionpercent, position)
+              end
             when SDN::Message::PostMotorStatus
-              if message.state == :running || motor.state == :running
+              if message.state == :running || motor.state == :running ||
+                # if it's explicitly stopped, but we didn't ask it to, it's probably
+                # changing directions so keep querying
+                (message.state == :stopped &&
+                   message.last_action_cause == :explicit_command &&
+                   !(motor.last_action == SDN::Message::Stop || motor.last_action.nil?))
                 follow_ups << SDN::Message::GetMotorStatus.new(message.src)
               end
               # this will do one more position request after it stopped
@@ -172,6 +230,11 @@ module SDN
               motor.publish(:last_direction, message.last_direction)
               motor.publish(:last_action_source, message.last_action_source)
               motor.publish(:last_action_cause, message.last_action_cause)
+              motor.group_objects.each do |group|
+                states = group.motor_objects.map(&:state).uniq
+                state = states.length == 1 ? states.first : 'mixed'
+                group.publish(:state, state)
+              end
             when SDN::Message::PostMotorLimits
               motor.publish(:uplimit, message.up_limit)
               motor.publish(:downlimit, message.down_limit)
@@ -182,18 +245,26 @@ module SDN
               motor.publish(:downspeed, message.down_speed)
               motor.publish(:slowspeed, message.slow_speed)
             when SDN::Message::PostMotorIP
-              motor.publish(:"ip#{message.ip}pulses", message.position_pulses) 
+              motor.publish(:"ip#{message.ip}pulses", message.position_pulses)
               motor.publish(:"ip#{message.ip}percent", message.position_percent)
             when SDN::Message::PostGroupAddr
               motor.add_group(message.group_index, message.group_address)
             end
 
             @mutex.synchronize do
-              signal = @response_pending || !follow_ups.empty?
-              @response_pending = @broadcast_pending
-              @request_queue.concat(follow_ups)
+              correct_response = @response_pending && message.src == @prior_message&.message&.dest && message.is_a?(@prior_message&.message&.class&.expected_response)
+              signal = correct_response || !follow_ups.empty?
+              puts "correct response #{correct_response}"
+              puts "pending: #{@response_pending} #{@broadcast_pending}"
+              @response_pending = @broadcast_pending if correct_response
+              follow_ups.each do |follow_up|
+                @queues[1].push(MessageAndRetries.new(follow_up, 5, 1)) unless @queues[1].any? { |mr| mr.message == follow_up }
+              end
               @cond.signal if signal
             end
+          rescue EOFError
+            puts "EOF reading"
+            exit 2
           rescue SDN::MalformedMessage => e
             puts "ignoring malformed message: #{e}" unless e.to_s =~ /issing data/
           rescue => e
@@ -205,43 +276,63 @@ module SDN
       write_thread = Thread.new do
         begin
           loop do
-            message = nil
+            message_and_retries = nil
             @mutex.synchronize do
               # got woken up early by another command getting queued; spin
               if @response_pending
+                puts "another message queued, but we're still waiting"
                 while @response_pending
                   remaining_wait = @response_pending - Time.now.to_f
                   if remaining_wait < 0
                     puts "timed out waiting on response"
                     @response_pending = nil
                     @broadcast_pending = nil
+                    if @prior_message&.remaining_retries != 0
+                      puts "retrying #{@prior_message.remaining_retries} more times ..."
+                      @queues[@prior_message.priority].push(@prior_message)
+                      @prior_message = nil
+                    end
                   else
+                    puts "waiting #{remaining_wait} more..."
                     @cond.wait(@mutex, remaining_wait)
                   end
                 end
               else
+                # minimum time between messages
+                puts "waiting between messages"
                 sleep 0.1
               end
 
-              message = @command_queue.shift
-              unless message
-                message = @request_queue.shift
-                if message
+              puts "looking for next message to write"
+              @queues.find { |q| message_and_retries = q.shift }
+              if message_and_retries
+                if message_and_retries.message.ack_requested || message_and_retries.message.class.name =~ /^SDN::Message::Get/
                   @response_pending = Time.now.to_f + WAIT_TIME
-                  if message.dest == [0xff, 0xff, 0xff]
+                  if message_and_retries.message.dest == BROADCAST_ADDRESS || SDN::Message::is_group_address?(message_and_retries.message.src) && message_and_retries.message.is_a?(SDN::Message::GetNodeAddr)
                     @broadcast_pending = Time.now.to_f + BROADCAST_WAIT
-                  end    
+                  end
                 end
               end
 
-              # spin until there is a message
-              @cond.wait(@mutex) unless message
+              # wait until there is a message
+              if @response_pending
+                message_and_retries.remaining_retries -= 1
+                @prior_message = message_and_retries  
+              elsif message_and_retries
+                @prior_message = nil  
+              else
+                @cond.wait(@mutex)
+              end
             end
-            next unless message
+            next unless message_and_retries
 
+            message = message_and_retries.message
             puts "writing #{message.inspect}"
-            @sdn.write(message.serialize)
-            @sdn.flush
+            puts "(and waiting for response)" if @response_pending
+            serialized = message.serialize
+            @sdn.write(serialized)
+            @sdn.flush if @sdn.respond_to?(:flush)
+            puts "wrote #{serialized.unpack("C*").map { |b| '%02x' % b }.join(' ')}"
           end
         rescue => e
           puts "failure writing: #{e}"
@@ -254,10 +345,10 @@ module SDN
         if topic == "#{@base_topic}/discovery/discover/set" && value == "true"
           # trigger discovery
           @mutex.synchronize do
-            @request_queue.push(SDN::Message::GetNodeAddr.new)
+            @queues[2].push(MessageAndRetries.new(SDN::Message::GetNodeAddr.new, 1, 2))
             @cond.signal
           end
-        elsif (match = topic.match(%r{^#{Regexp.escape(@base_topic)}/(?<addr>\h{6})/(?<property>label|down|up|stop|positionpulses|positionpercent|ip|wink|reset|(?<speed_type>upspeed|downspeed|slowspeed)|uplimit|downlimit|direction|ip(?<ip>\d+)(?<ip_type>pulses|percent)|groups)/set$}))
+        elsif (match = topic.match(%r{^#{Regexp.escape(@base_topic)}/(?<addr>\h{6})/(?<property>discover|label|down|up|stop|positionpulses|positionpercent|ip|wink|reset|(?<speed_type>upspeed|downspeed|slowspeed)|uplimit|downlimit|direction|ip(?<ip>\d+)(?<ip_type>pulses|percent)|groups)/set$}))
           addr = SDN::Message.parse_address(match[:addr])
           property = match[:property]
           # not homie compliant; allows linking the positionpercent property
@@ -266,10 +357,15 @@ module SDN
             property = value.downcase
             value = "true"
           end
-          motor = @motors[SDN::Message.print_address(addr).gsub('.', '')]
+          mqtt_addr = SDN::Message.print_address(addr).gsub('.', '')
+          motor = @motors[mqtt_addr]
           is_group = SDN::Message.is_group_address?(addr)
+          group = @groups[mqtt_addr]
           follow_up = SDN::Message::GetMotorStatus.new(addr)
           message = case property
+            when 'discover'
+              follow_up = nil
+              SDN::Message::GetNodeAddr.new(addr) if value == "true"
             when 'label'
               follow_up = SDN::Message::GetNodeLabel.new(addr)
               SDN::Message::SetNodeLabel.new(addr, value) unless is_group
@@ -330,15 +426,21 @@ module SDN
               next unless motor
               messages = motor.set_groups(value)
               @mutex.synchronize do
-                messages.each { |m| @command_queue.push(m) }
+                messages.each { |m| @queues[0].push(MessageAndRetries.new(m, 5, 0)) }
                 @cond.signal
               end
               nil
           end
+
+          if motor
+            motor.last_action = message.class if [Message::MoveTo, Message::Move, Message::Wink, Message::Stop].include?(message.class)
+          end
+
           if message
+            message.ack_requested = true if message.class.name !~ /^SDN::Message::Get/
             @mutex.synchronize do
-              @command_queue.push(message)
-              @request_queue.push(follow_up) unless @request_queue.include?(follow_up)
+              @queues[0].push(MessageAndRetries.new(message, 5, 0))
+              @queues[1].push(MessageAndRetries.new(follow_up, 5, 1)) unless @queues[1].any? { |mr| mr.message == follow_up }
               @cond.signal
             end
           end
@@ -379,7 +481,7 @@ module SDN
       publish("discovery/discover/$settable", "true")
       publish("discovery/discover/$retained", "false")
 
-      subscribe("discovery/discover/set")
+      subscribe("+/discover/set")
       subscribe("+/label/set")
       subscribe("+/down/set")
       subscribe("+/up/set")
@@ -407,7 +509,12 @@ module SDN
     def publish_motor(addr)
       publish("#{addr}/$name", addr)
       publish("#{addr}/$type", "Sonesse 30 Motor")
-      publish("#{addr}/$properties", "label,down,up,stop,positionpulses,positionpercent,ip,wink,reset,state,last_direction,last_action_source,last_action_cause,uplimit,downlimit,direction,upspeed,downspeed,slowspeed,#{(1..16).map { |ip| "ip#{ip}pulses,ip#{ip}percent" }.join(',')},groups")
+      publish("#{addr}/$properties", "discover,label,down,up,stop,positionpulses,positionpercent,ip,wink,reset,state,last_direction,last_action_source,last_action_cause,uplimit,downlimit,direction,upspeed,downspeed,slowspeed,#{(1..16).map { |ip| "ip#{ip}pulses,ip#{ip}percent" }.join(',')},groups")
+
+      publish("#{addr}/discover/$name", "Trigger Motor Discovery")
+      publish("#{addr}/discover/$datatype", "boolean")
+      publish("#{addr}/discover/$settable", "true")
+      publish("#{addr}/discover/$retained", "false")
 
       publish("#{addr}/label/$name", "Node label")
       publish("#{addr}/label/$datatype", "string")
@@ -527,17 +634,17 @@ module SDN
 
       motor = Motor.new(self, addr)
       @motors[addr] = motor
-      publish("$nodes", (["discovery"] + @motors.keys.sort + @groups.to_a).join(","))
+      publish("$nodes", (["discovery"] + @motors.keys.sort + @groups.keys.sort).join(","))
 
       sdn_addr = SDN::Message.parse_address(addr)
       @mutex.synchronize do
-        @request_queue.push(SDN::Message::GetNodeLabel.new(sdn_addr))
-        @request_queue.push(SDN::Message::GetMotorStatus.new(sdn_addr))
-        @request_queue.push(SDN::Message::GetMotorLimits.new(sdn_addr))
-        @request_queue.push(SDN::Message::GetMotorDirection.new(sdn_addr))
-        @request_queue.push(SDN::Message::GetMotorRollingSpeed.new(sdn_addr))
-        (1..16).each { |ip| @request_queue.push(SDN::Message::GetMotorIP.new(sdn_addr, ip)) }
-        (0...16).each { |g| @request_queue.push(SDN::Message::GetGroupAddr.new(sdn_addr, g)) }
+        @queues[2].push(MessageAndRetries.new(SDN::Message::GetNodeLabel.new(sdn_addr), 5, 2))
+        @queues[2].push(MessageAndRetries.new(SDN::Message::GetMotorStatus.new(sdn_addr), 5, 2))
+        @queues[2].push(MessageAndRetries.new(SDN::Message::GetMotorLimits.new(sdn_addr), 5, 2))
+        @queues[2].push(MessageAndRetries.new(SDN::Message::GetMotorDirection.new(sdn_addr), 5, 2))
+        @queues[2].push(MessageAndRetries.new(SDN::Message::GetMotorRollingSpeed.new(sdn_addr), 5, 2))
+        (1..16).each { |ip| @queues[2].push(MessageAndRetries.new(SDN::Message::GetMotorIP.new(sdn_addr, ip), 5, 2)) }
+        (0...16).each { |g| @queues[2].push(MessageAndRetries.new(SDN::Message::GetGroupAddr.new(sdn_addr, g), 5, 2)) }
 
         @cond.signal
       end
@@ -547,11 +654,17 @@ module SDN
 
     def add_group(addr)
       addr = addr.gsub('.', '')
-      return if @groups.include?(addr)
+      group = @groups[addr]
+      return group if group
 
       publish("#{addr}/$name", addr)
       publish("#{addr}/$type", "Shade Group")
-      publish("#{addr}/$properties", "down,up,stop,positionpulses,positionpercent,ip,wink,reset")
+      publish("#{addr}/$properties", "discover,down,up,stop,positionpulses,positionpercent,ip,wink,reset,state,motors")
+
+      publish("#{addr}/discover/$name", "Trigger Motor Discovery")
+      publish("#{addr}/discover/$datatype", "boolean")
+      publish("#{addr}/discover/$settable", "true")
+      publish("#{addr}/discover/$retained", "false")
 
       publish("#{addr}/down/$name", "Move in down direction")
       publish("#{addr}/down/$datatype", "boolean")
@@ -566,7 +679,7 @@ module SDN
       publish("#{addr}/stop/$name", "Cancel adjustments")
       publish("#{addr}/stop/$datatype", "boolean")
       publish("#{addr}/stop/$settable", "true")
-      publish("#{addr}/stop/$retained", "false")      
+      publish("#{addr}/stop/$retained", "false")
 
       publish("#{addr}/positionpulses/$name", "Position from up limit (in pulses)")
       publish("#{addr}/positionpulses/$datatype", "integer")
@@ -590,8 +703,16 @@ module SDN
       publish("#{addr}/wink/$settable", "true")
       publish("#{addr}/wink/$retained", "false")
 
-      @groups << addr
-      publish("$nodes", (["discovery"] + @motors.keys.sort + @groups.to_a).join(","))
+      publish("#{addr}/state/$name", "State of the motors; only set if all motors are in the same state")
+      publish("#{addr}/state/$datatype", "enum")
+      publish("#{addr}/state/$format", SDN::Message::PostMotorStatus::STATE.keys.join(','))
+
+      publish("#{addr}/motors/$name", "Motors that are members of this group")
+      publish("#{addr}/motors/$datatype", "string")
+
+      group = @groups[addr] = Group.new(self, addr)
+      publish("$nodes", (["discovery"] + @motors.keys.sort + @groups.keys.sort).join(","))
+      group
     end
   end
 end

data/lib/sdn/version.rb

@@ -1,3 +1,3 @@
 module SDN
-  VERSION = '1.0.6'
+  VERSION = '1.0.11'
 end

data/lib/somfy_sdn.rb

@@ -1,2 +1 @@
-require 'sdn/message'
-require 'sdn/mqtt_bridge'
+require 'sdn'

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: mqtt
+  name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: ccutrer-serialport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: cody@cutrer.com'
 executables:
 - sdn_mqtt_bridge
@@ -74,10 +88,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/sdn_mqtt_bridge
+- lib/sdn.rb
 - lib/sdn/message.rb
 - lib/sdn/messages/control.rb
 - lib/sdn/messages/get.rb
 - lib/sdn/messages/helpers.rb
+- lib/sdn/messages/ilt2/get.rb
+- lib/sdn/messages/ilt2/post.rb
+- lib/sdn/messages/ilt2/set.rb
 - lib/sdn/messages/post.rb
 - lib/sdn/messages/set.rb
 - lib/sdn/mqtt_bridge.rb
@@ -87,7 +105,7 @@ homepage: https://github.com/ccutrer/somfy_sdn
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Library for communication with Somfy SDN RS-485 motorized shades
 test_files: []