somfy_sdn 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ade06be997d5f36fa76aa13c87aa00e26b1bfe07de7a7fd29b9015f249a1a3
-  data.tar.gz: '03462586cabf999666ac43e83036811b8a10df15515ea17d7bfd7b4d2e421e3a'
+  metadata.gz: ef81905b4b164a5e09d771e07b286f09df6d40cd259b8253c2a0ef1f01f649e4
+  data.tar.gz: 4d6f3ad72d6b2e8f06c530a8657d684f4f0b12c9d54eb13e998841b18a8e37dd
 SHA512:
-  metadata.gz: '00080b23f47bd5c11c13406d818feec587c744b132cb1b1f4cbd57f3a64cd002c0747e4bccb575315e996b7ec7b92d736a5892116c31b277f85fcbf83fd36c6f'
-  data.tar.gz: '01700481ff1ed2966a00287c5c9f1193b600b56518ce36da8a06dae4768daa51fac0da4635993b9eb3daf6ea8a0f068f3e8fd7aee5bd9977e3350eb46aa58d6a'
+  metadata.gz: 8bf05e27c1e7c50e6893198950d7ab91099807c9d8ad139629e89fe3fc97d6f46c87e93400e1083ecba7c64ec3638a302523804fd921125414aa62f3632e5edb
+  data.tar.gz: 3300c346eeb666d82c686c0e5dec4fb830fa96adabdd7dbc45f3d4cd8e609c13f2796d1ae0b6cd2b2186bcf1ae3251d180e17dd33d578ccfa29eba3f86870e4a

data/lib/sdn/message.rb

@@ -5,6 +5,14 @@ module SDN
 
   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

data/lib/sdn/mqtt_bridge.rb

@@ -79,7 +79,8 @@ module SDN
                      :ip15percent,
                      :ip16pulses,
                      :ip16percent,
-                     :groups) do
+                     :groups,
+                     :last_action) do
     def initialize(*)
       members.each { |k| self[k] = :nil }
       @groups = [].fill(nil, 0, 16)
@@ -158,12 +159,13 @@ module SDN
          'baud' => 4800,
          'parity' => Net::Telnet::RFC2217::ODD)
       else
-        require 'serialport'
-        @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)
@@ -173,7 +175,7 @@ module SDN
               begin
                 buffer.concat(@sdn.read_nonblock(64 * 1024))
                 next
-              rescue IO::WaitReadable
+              rescue IO::WaitReadable, EOFError
                 wait = buffer.empty? ? nil : WAIT_TIME
                 if @sdn.wait_readable(wait).nil?
                   # timed out; just discard everything
@@ -214,7 +216,12 @@ module SDN
                 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
@@ -245,8 +252,11 @@ module SDN
             end
 
             @mutex.synchronize do
-              signal = @response_pending || !follow_ups.empty?
-              @response_pending = @broadcast_pending
+              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
@@ -321,7 +331,7 @@ module SDN
             puts "(and waiting for response)" if @response_pending
             serialized = message.serialize
             @sdn.write(serialized)
-            @sdn.flush
+            @sdn.flush if @sdn.respond_to?(:flush)
             puts "wrote #{serialized.unpack("C*").map { |b| '%02x' % b }.join(' ')}"
           end
         rescue => e
@@ -421,6 +431,11 @@ module SDN
               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

data/lib/sdn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: cody@cutrer.com'
 executables:
 - sdn_mqtt_bridge
@@ -105,7 +105,7 @@ homepage: https://github.com/ccutrer/somfy_sdn
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,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: []