somfy_sdn 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4380614e85e00d1e41bd28809bbc2b1dc698f73cb1d5cb78f84c3e7a359674fc
-  data.tar.gz: 87b3291290d811ccb52e20f4a0b773bd30dcab410a6421a4514f1494b9244487
+  metadata.gz: 61d3c1baa4f63612972ab6ba2cfc05aed5173176101a8d19e2e53756f2e4ec2b
+  data.tar.gz: 6c7999e7755a4d17b304da25d5b70e864a737efde7bb6b7506a309057fae0137
 SHA512:
-  metadata.gz: 764b92020f3f77d99d23cbf4f376ea7c66104562eafa613655cbc8e0edcd4a2d276d1666925e96e2291765dd256f070ec5df6d10876f62bbffa94b52134dfbcd
-  data.tar.gz: 46ebafb6663046bccb107083df5b88dc5046a997972aa66bb5a4360f4ef21a4dcab462522c7826d4de0d0061c9caea056e1229e45bad374f4f6e7c5f0ef5980a
+  metadata.gz: 75d5b1432d83f8713f81738e2ae99127be390465938f38274a026e8fe3c44cd45022cf74814e04a005c2a3b122b6735fb6424b0840cf8c1a82abff8a092a0a41
+  data.tar.gz: c253d1113a568f14209d2521ace015ccb8f7f0c1665f43dd5b64c29d601a5a163dc97c504c20d4a5c17e6c789cb9c51165f0108ba9e92dd8427677c48c252b51

data/lib/sdn/message.rb

@@ -1,173 +1,172 @@
 require 'sdn/messages/helpers'
 
 module SDN
-    class MalformedMessage < RuntimeError; end
-  
-    class Message  
-      class << self
-        def readpartial(io, length, allow_empty: true)
-          data = []
-          while data.length < length
-            begin
-              data.concat(io.read_nonblock(length - data.length).bytes)
-            rescue EOFError
-              break
-            rescue IO::WaitReadable
-              break if allow_empty
-              IO.select([io])
-            end
-          end
-          data
-        end
-  
-        def parse(io)
-          io = StringIO.new(io) if io.is_a?(String)
-          data = readpartial(io, 2, allow_empty: false)
-          if data.length != 2
-            # don't have enough data yet; buffer it
-            io.ungetbyte(data.first) if data.length == 1
-            raise MalformedMessage, "Could not get message type and length"
-          end
-          msg = to_number(data.first)
-          length = to_number(data.last)
-          ack_requested = length & 0x80 == 0x80
-          length &= 0x7f
-          if length < 11 || length > 32
-            # only skip over one byte to try and re-sync
-            io.ungetbyte(data.last)
-            raise MalformedMessage, "Message has bogus length: #{length}"
-          end
-          data.concat(readpartial(io, length - 4))
-          unless data.length == length - 2
-            data.reverse.each { |byte| io.ungetbyte(byte) }
-            raise MalformedMessage, "Missing data: got #{data.length} expected #{length}"
-          end
-  
-          message_class = constants.find { |c| (const_get(c, false).const_get(:MSG, false) rescue nil) == msg }
-          message_class = const_get(message_class, false) if message_class
-          message_class ||= UnknownMessage
-  
-          bogus_checksums = [SetNodeLabel::MSG, PostNodeLabel::MSG].include?(msg)
-  
-          calculated_sum = checksum(data)
-          read_sum = readpartial(io, 2)
-          if read_sum.length == 0 || (!bogus_checksums && read_sum.length == 1)
-            read_sum.each { |byte| io.ungetbyte(byte) }
-            data.reverse.each { |byte| io.ungetbyte(byte) }
-            raise MalformedMessage, "Missing data: got #{data.length} expected #{length}"
-          end
-  
-          # check both the proper checksum, and a truncated checksum
-          unless calculated_sum == read_sum || (bogus_checksums && calculated_sum.last == read_sum.first)
-             raw_message = (data + read_sum).map { |b| '%02x' % b }.join(' ')
-             # skip over single byte to try and re-sync
-             data.shift
-             read_sum.reverse.each { |byte| io.ungetbyte(byte) }
-             data.reverse.each { |byte| io.ungetbyte(byte) }
-             raise MalformedMessage, "Checksum mismatch for #{message_class.name}: #{raw_message}"
+  class MalformedMessage < RuntimeError; end
+
+  class Message  
+    class << self
+      def readpartial(io, length, allow_empty: true)
+        data = []
+        while data.length < length
+          begin
+            data.concat(io.read_nonblock(length - data.length).bytes)
+          rescue EOFError
+            break
+          rescue IO::WaitReadable
+            break if allow_empty
+            IO.select([io])
           end
-          # the checksum was truncated; put back the unused byte
-          io.ungetbyte(read_sum.last) if calculated_sum != read_sum && read_sum.length == 2
-  
-          puts "read #{(data + read_sum).map { |b| '%02x' % b }.join(' ')}"
-  
-          reserved = to_number(data[2])
-          src = transform_param(data[3..5])
-          dest = transform_param(data[6..8])
-          result = message_class.new(reserved: reserved, ack_requested: ack_requested, src: src, dest: dest)
-          result.parse(data[9..-1])
-          result.msg = msg if message_class == UnknownMessage
-          result
         end
+        data
       end
-  
-      include Helpers
-      singleton_class.include Helpers
-  
-      attr_reader :reserved, :ack_requested, :src, :dest
-  
-      def initialize(reserved: nil, ack_requested: false, src: nil, dest: nil)
-        @reserved = reserved || 0x02 # message sent to Sonesse 30
-        @ack_requested = ack_requested
-        if src.nil? && is_group_address?(dest)
-          src = dest
-          dest = nil
+
+      def parse(io)
+        io = StringIO.new(io) if io.is_a?(String)
+        data = readpartial(io, 2, allow_empty: false)
+        if data.length != 2
+          # don't have enough data yet; buffer it
+          io.ungetbyte(data.first) if data.length == 1
+          raise MalformedMessage, "Could not get message type and length"
         end
-        @src = src || [0, 0, 1]
-        @dest = dest || [0, 0, 0]
-      end
-  
-      def parse(params)
-        raise MalformedMessage, "unrecognized params for #{self.class.name}: #{params.map { |b| '%02x' % b }}" if self.class.const_defined?(:PARAMS_LENGTH) && params.length != self.class.const_get(:PARAMS_LENGTH)
-      end
-  
-      def serialize
-        result = transform_param(reserved) + transform_param(src) + transform_param(dest) + params
-        length = result.length + 4
-        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 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
-  
-      def class_inspect
-        ivars = instance_variables - [:@reserved, :@ack_requested, :@src, :@dest]
-        return if ivars.empty?
-        ivars.map { |iv| ", #{iv}=#{instance_variable_get(iv).inspect}" }.join
-      end
-  
-      protected
-  
-      def params; []; end
-
-      public
-  
-      class SimpleRequest < Message
-        PARAMS_LENGTH = 0
-  
-        def initialize(dest = nil, **kwargs)
-          kwargs[:dest] ||= dest
-          super(**kwargs)
+        msg = to_number(data.first)
+        length = to_number(data.last)
+        ack_requested = length & 0x80 == 0x80
+        length &= 0x7f
+        if length < 11 || length > 32
+          # only skip over one byte to try and re-sync
+          io.ungetbyte(data.last)
+          raise MalformedMessage, "Message has bogus length: #{length}"
+        end
+        data.concat(readpartial(io, length - 4))
+        unless data.length == length - 2
+          data.reverse.each { |byte| io.ungetbyte(byte) }
+          raise MalformedMessage, "Missing data: got #{data.length} expected #{length}"
         end
-      end
 
-      class Nack < Message
-        MSG = 0x6f
-        PARAMS_LENGTH = 1
-        VALUES = { data_error: 0x01, unknown_message: 0x10, node_is_locked: 0x20, wrong_position: 0x21, limits_not_set: 0x22, ip_not_set: 0x23, out_of_range: 0x24, busy: 0xff }
-  
-        # presumed
-        attr_accessor :error_code
-  
-        def parse(params)
-          super
-          error_code = to_number(params[0])
-          self.error_code = VALUES[error_code] || error_code
+        message_class = constants.find { |c| (const_get(c, false).const_get(:MSG, false) rescue nil) == msg }
+        message_class = const_get(message_class, false) if message_class
+        message_class ||= UnknownMessage
+
+        bogus_checksums = [SetNodeLabel::MSG, PostNodeLabel::MSG].include?(msg)
+
+        calculated_sum = checksum(data)
+        read_sum = readpartial(io, 2)
+        if read_sum.length == 0 || (!bogus_checksums && read_sum.length == 1)
+          read_sum.each { |byte| io.ungetbyte(byte) }
+          data.reverse.each { |byte| io.ungetbyte(byte) }
+          raise MalformedMessage, "Missing data: got #{data.length} expected #{length}"
         end
+
+        # check both the proper checksum, and a truncated checksum
+        unless calculated_sum == read_sum || (bogus_checksums && calculated_sum.last == read_sum.first)
+            raw_message = (data + read_sum).map { |b| '%02x' % b }.join(' ')
+            # skip over single byte to try and re-sync
+            data.shift
+            read_sum.reverse.each { |byte| io.ungetbyte(byte) }
+            data.reverse.each { |byte| io.ungetbyte(byte) }
+            raise MalformedMessage, "Checksum mismatch for #{message_class.name}: #{raw_message}"
+        end
+        # the checksum was truncated; put back the unused byte
+        io.ungetbyte(read_sum.last) if calculated_sum != read_sum && read_sum.length == 2
+
+        puts "read #{(data + read_sum).map { |b| '%02x' % b }.join(' ')}"
+
+        reserved = to_number(data[2])
+        src = transform_param(data[3..5])
+        dest = transform_param(data[6..8])
+        result = message_class.new(reserved: reserved, ack_requested: ack_requested, src: src, dest: dest)
+        result.parse(data[9..-1])
+        result.msg = msg if message_class == UnknownMessage
+        result
       end
-  
-      class Ack < Message
-        MSG = 0x7f
-        PARAMS_LENGTH = 0
+    end
+
+    include Helpers
+    singleton_class.include Helpers
+
+    attr_reader :reserved, :ack_requested, :src, :dest
+
+    def initialize(reserved: nil, ack_requested: false, src: nil, dest: nil)
+      @reserved = reserved || 0x02 # message sent to Sonesse 30
+      @ack_requested = ack_requested
+      if src.nil? && is_group_address?(dest)
+        src = dest
+        dest = nil
       end
+      @src = src || [0, 0, 1]
+      @dest = dest || [0, 0, 0]
+    end
 
-      # messages after this point were decoded from UAI+ communication and may be named wrong
-      class UnknownMessage < Message
-        attr_accessor :msg, :params
-  
-        alias parse params=
-  
-        def class_inspect
-          result = ", @msg=%02xh" % msg
-          return result if params.empty?
-  
-          result << ", @params=#{params.map { |b| "%02x" % b }.join(' ')}"
-        end
+    def parse(params)
+      raise MalformedMessage, "unrecognized params for #{self.class.name}: #{params.map { |b| '%02x' % b }}" if self.class.const_defined?(:PARAMS_LENGTH) && params.length != self.class.const_get(:PARAMS_LENGTH)
+    end
+
+    def serialize
+      result = transform_param(reserved) + transform_param(src) + transform_param(dest) + params
+      length = result.length + 4
+      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 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
+
+    def class_inspect
+      ivars = instance_variables - [:@reserved, :@ack_requested, :@src, :@dest]
+      return if ivars.empty?
+      ivars.map { |iv| ", #{iv}=#{instance_variable_get(iv).inspect}" }.join
+    end
+
+    protected
+
+    def params; []; end
+
+    public
+
+    class SimpleRequest < Message
+      PARAMS_LENGTH = 0
+
+      def initialize(dest = nil, **kwargs)
+        kwargs[:dest] ||= dest
+        super(**kwargs)
+      end
+    end
+
+    class Nack < Message
+      MSG = 0x6f
+      PARAMS_LENGTH = 1
+      VALUES = { data_error: 0x01, unknown_message: 0x10, node_is_locked: 0x20, wrong_position: 0x21, limits_not_set: 0x22, ip_not_set: 0x23, out_of_range: 0x24, busy: 0xff }
+
+      # presumed
+      attr_accessor :error_code
+
+      def parse(params)
+        super
+        error_code = to_number(params[0])
+        self.error_code = VALUES[error_code] || error_code
+      end
+    end
+
+    class Ack < Message
+      MSG = 0x7f
+      PARAMS_LENGTH = 0
+    end
+
+    # messages after this point were decoded from UAI+ communication and may be named wrong
+    class UnknownMessage < Message
+      attr_accessor :msg, :params
+
+      alias parse params=
+
+      def class_inspect
+        result = ", @msg=%02xh" % msg
+        return result if params.empty?
+
+        result << ", @params=#{params.map { |b| "%02x" % b }.join(' ')}"
       end
     end
   end

data/lib/sdn/mqtt_bridge.rb

@@ -1,3 +1,7 @@
+require 'mqtt'
+require 'serialport'
+require 'set'
+
 module SDN
   Motor = Struct.new(:bridge,
                      :addr,
@@ -199,7 +203,7 @@ module SDN
               next unless SDN::Message::SetFactoryDefault::RESET.keys.include?(value.to_sym)
               SDN::Message::SetFactoryDefault.new(addr, value.to_sym)
             when 'positionpulses', 'positionpercent', 'ip'
-              SDN::Message::MoveTo.new(addr, property.to_sym, value.to_i)
+              SDN::Message::MoveTo.new(addr, property.sub('position', 'position_').to_sym, value.to_i)
             when 'direction'
               next if is_group
               follow_up = SDN::Message::GetMotorDirection.new(addr)

data/lib/sdn/version.rb

@@ -1,3 +1,3 @@
 module SDN
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

metadata

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