somfy_sdn 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b76beaca35ebf0ae0847fc75bf0fcd12c45e395768cca0c711557b167488e3e
-  data.tar.gz: 64dfc392ef651d1afc6e6a94c8c586e1e95e575c0ff9ba12c74f472cbfe88874
+  metadata.gz: 57ade06be997d5f36fa76aa13c87aa00e26b1bfe07de7a7fd29b9015f249a1a3
+  data.tar.gz: '03462586cabf999666ac43e83036811b8a10df15515ea17d7bfd7b4d2e421e3a'
 SHA512:
-  metadata.gz: 87a1138187217fb8bf7fe62e00f69e20b742d2527d4f0059b9a2d4ba42012c887947608fdbfad4123400a0968d99d9c257cb361025ecef668786d34b708a0512
-  data.tar.gz: e6ddbe689d8d60d252c24a1291893b05040a638ba3b86ac3a7bc1c28479a9ccdf0485e5914035818c50e1005b076d148263916ae1e7a66e05efdb075786d1d95
+  metadata.gz: '00080b23f47bd5c11c13406d818feec587c744b132cb1b1f4cbd57f3a64cd002c0747e4bccb575315e996b7ec7b92d736a5892116c31b277f85fcbf83fd36c6f'
+  data.tar.gz: '01700481ff1ed2966a00287c5c9f1193b600b56518ce36da8a06dae4768daa51fac0da4635993b9eb3daf6ea8a0f068f3e8fd7aee5bd9977e3350eb46aa58d6a'

data/lib/sdn/mqtt_bridge.rb

@@ -270,6 +270,7 @@ module SDN
             @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
@@ -282,17 +283,20 @@ module SDN
                       @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
 
+              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.class.name =~ /^SDN::Message::Get/
+                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_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
@@ -301,22 +305,24 @@ module SDN
               end
 
               # wait until there is a message
-              @cond.wait(@mutex) unless message_and_retries
+              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_and_retries
 
             message = message_and_retries.message
             puts "writing #{message.inspect}"
+            puts "(and waiting for response)" if @response_pending
             serialized = message.serialize
             @sdn.write(serialized)
             @sdn.flush
             puts "wrote #{serialized.unpack("C*").map { |b| '%02x' % b }.join(' ')}"
-            if @response_pending
-              message_and_retries.remaining_retries -= 1
-              @prior_message = message_and_retries
-            else
-              @prior_message = nil
-            end
           end
         rescue => e
           puts "failure writing: #{e}"
@@ -416,9 +422,9 @@ module SDN
               nil
           end
           if message
-            message.ack_requested = true if motor && message.class.name !~ /^SDN::Message::Get/
+            message.ack_requested = true if message.class.name !~ /^SDN::Message::Get/
             @mutex.synchronize do
-              @queues[0].push(MessageAndRetries.new(message, message.ack_requested ? 5 : 1, 0))
+              @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

data/lib/sdn/version.rb

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

metadata

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