somfy_sdn 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d95ac8d2a5acf1ceb0e03051645d8b243f0feffd89da389757df490a85fd6b
-  data.tar.gz: 86cd04871922fbad94f4b1c7fc5a99da211a1f4cffd398ee69c1cda8ffdcc681
+  metadata.gz: 4edace9439651dd89a2c7618a03ae5b6ac9d4ccdf8101ac597eca8f5e66bacf9
+  data.tar.gz: 4ecefc5e15483f4b97169f3a0e8939297c1bdd4cdbe909a2388806feaa0bbac7
 SHA512:
-  metadata.gz: 430f8b9cab0a245abe7b150203556376de5afbe409a7f5272634880157b831aed32434baf9758e55bb00ba2afbd732f9e3e8b19605e9e2bb51619a2dc5080405
-  data.tar.gz: b51a53a9cabd2d2efadcff644b7c7bdfce958744228f6092c318d7bfec4447302570e20de8d36a78e09496e3c5a5a3ec1cf6e32bbbeedb29abcc12bad0a27d64
+  metadata.gz: e515961e3b633fd7d02879b4d907d76a7bacde2e91f20ddb90893d676e88657f89f912dd645a7e32f9cc166641ae86b816f2dbe96ea1eb702922c51a3bc1b697
+  data.tar.gz: 5825179cad7e2dd32af3a9bbca82cf706dbd0e38b10fe0a756241f8e28e954b414a37fe1a80fa0a84e0586f515b379d27a6b0ab013e9a77a71519924ae68e4a0

data/lib/sdn/mqtt_bridge.rb

@@ -1,10 +1,30 @@
 require 'mqtt'
-require 'serialport'
-require 'socket'
 require 'uri'
 require 'set'
 
 module SDN
+  Group = Struct.new(:bridge, :addr, :positionpercent, :state) 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 motors
+      bridge.motors.select { |addr, motor| motor.groups_string.include?(printed_addr) }.values
+    end
+  end
+
   Motor = Struct.new(:bridge,
                      :addr,
                      :label,
@@ -91,12 +111,18 @@ module SDN
      def groups_string
        @groups.compact.map { |g| SDN::Message.print_address(g) }.sort.uniq.join(',')
      end
-  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,7 +130,7 @@ module SDN
       @mqtt.connect
 
       @motors = {}
-      @groups = Set.new
+      @groups = {}
 
       @mutex = Mutex.new
       @cond = ConditionVariable.new
@@ -117,8 +143,16 @@ 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
+        require 'serialport'
         @sdn = SerialPort.open(port, "baud" => 4800, "parity" => SerialPort::ODD)
       end
 
@@ -129,11 +163,11 @@ module SDN
             message, bytes_read = SDN::Message.parse(buffer.bytes)
             unless message
               begin
-                buffer.concat(@sdn.read_nonblock(1))
+                buffer.concat(@sdn.read_nonblock(64 * 1024))
                 next
               rescue IO::WaitReadable
                 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 = ""
@@ -162,6 +196,17 @@ 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.motors.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
                 follow_ups << SDN::Message::GetMotorStatus.new(message.src)
@@ -172,6 +217,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.motors.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)
@@ -194,6 +244,9 @@ module SDN
               @request_queue.concat(follow_ups)
               @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
@@ -527,7 +580,7 @@ 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.to_a).join(","))
 
       sdn_addr = SDN::Message.parse_address(addr)
       @mutex.synchronize do
@@ -547,7 +600,7 @@ module SDN
 
     def add_group(addr)
       addr = addr.gsub('.', '')
-      return if @groups.include?(addr)
+      return if @groups.key?(addr)
 
       publish("#{addr}/$name", addr)
       publish("#{addr}/$type", "Shade Group")
@@ -590,7 +643,11 @@ module SDN
       publish("#{addr}/wink/$settable", "true")
       publish("#{addr}/wink/$retained", "false")
 
-      @groups << addr
+      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(','))
+
+      @groups[addr] = Group.new(self, addr)
       publish("$nodes", (["discovery"] + @motors.keys.sort + @groups.to_a).join(","))
     end
   end

data/lib/sdn/version.rb

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

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-15 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.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement