somfy_sdn 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab121215242974fc0570c9495954b8a8584fd02535fe6b758590e3e5baa7a21
-  data.tar.gz: f2130a9042156d347808409bab26bec3dcdd37ac27d4a5fcd156ed90a889ed6a
+  metadata.gz: 83eab2a162518795d82296d471608e8b9a300d34e6b81897630a06e81456ed40
+  data.tar.gz: d8bfc48d510c2a5b97663326bb893d5abc09fd5a4b1876a70e03a408ad446e15
 SHA512:
-  metadata.gz: a104e2ad0bba74257e89768c36ceba023208190074da12fe35420c451c981b9582521b6276fd342e6513d7949e7264b073c4975a66bbaacd4592577948ad3ed6
-  data.tar.gz: fce28168771816f6718d116fb0bc84daa02475b9a8318ddf65e16caa288c24303e2f57910d445d654c44b2dbb356ccf23b5b680b29120c3c9f751317ba661a6f
+  metadata.gz: c523da782a69732baf2d114fe412125d0406b96764b9119e97cfea221808c6cff702b6a3f7f8b487afba5f85c919f9a554f707405f15f175682a0072512e9ecd
+  data.tar.gz: 56a628ec9e87aab0667c67ad379194bb67c2f5bd0a26c9995ac5b164f4173c296566b3b749fc5823ec7d1151a2e6083add55eef4fe7bcc521a2f11c0812d29bb

data/lib/sdn/cli/mqtt.rb

@@ -45,6 +45,7 @@ module SDN
 
         @sdn = Client.new(port)
 
+        Thread.abort_on_exception = true
         read_thread = Thread.new { read }
         write_thread = Thread.new { write }
         @mqtt.get { |packet| handle_message(packet.topic, packet.payload) }

data/lib/sdn/cli/provisioner.rb

@@ -70,6 +70,7 @@ module SDN
         win.keypad = true
         print_help
         refresh
+        wait_for_stop
 
         loop do
           char = win.getch
@@ -170,18 +171,29 @@ r    reverse motor
       def wait_for_stop
         win.setpos(13, 0)
         win.addstr("Moving...\n")
+
         loop do
           win.nodelay = true
           stop if win.getch == 27 # Esc
+
           sdn.send(ns::GetMotorPosition.new(addr))
-          sdn.receive do |message|
-            next unless message.is_a?(ns::PostMotorPosition)
-            last_pos = @pos
-            @pos = message.position_pulses
-            win.setpos(14, 0)
-            win.addstr("Position: #{@pos}\n")
-
-            if last_pos == @pos
+          unless ilt2?
+            sleep 0.1
+            sdn.send(ns::GetMotorStatus.new(addr))
+          end
+
+          sdn.receive(0.1) do |message|
+
+            if message.is_a?(ns::PostMotorPosition)
+              last_pos = @pos
+              @pos = message.position_pulses
+              win.setpos(14, 0)
+              win.addstr("Position: #{@pos}\n")
+            end
+
+            if (ilt2? && last_pos == @pos) ||
+               (message.is_a?(Message::PostMotorStatus) &&
+                message.state != :running)
               win.setpos(13, 0)
               win.addstr("\n")
               win.nodelay = false
@@ -190,7 +202,6 @@ r    reverse motor
             end
           end
           sleep 0.1
-          
         end
       end
 

data/lib/sdn/client.rb

@@ -58,18 +58,31 @@ module SDN
         unless message
           break unless messages.empty?
 
+          # one EOF is just serial ports saying they have no data;
+          # several EOFs in a row is the file is dead and gone
+          eofs = 0
           begin
             block = @io.read_nonblock(64 * 1024)
             SDN.logger.debug "read #{block.unpack("H*").first.gsub(/\h{2}/, "\\0 ")}"
             @buffer.concat(block)
             next
-          rescue IO::WaitReadable, EOFError
+          rescue IO::WaitReadable, EOFError => e
+            if e.is_a?(EOFError)
+              eofs += 1
+            else
+              eofs = 0
+            end
+            raise if eofs == 5
+
             wait = @buffer.empty? ? timeout : WAIT_TIME
             if @io.wait_readable(wait).nil?
               # timed out; just discard everything
               SDN.logger.debug "discarding #{@buffer.unpack("H*").first.gsub(/\h{2}/, "\\0 ")} due to timeout"
               @buffer = ""
+              return messages if timeout
             end
+
+            retry
           end
           next
         end

data/lib/sdn/message.rb

@@ -111,6 +111,7 @@ module SDN
     def inspect
       "#<%s @node_type=%s, @ack_requested=%s, @src=%s, @dest=%s%s>" % [self.class.name, node_type_to_string(node_type), ack_requested, print_address(src), print_address(dest), class_inspect]
     end
+    alias_method :to_s, :inspect
 
     def class_inspect
       ivars = instance_variables - [:@node_type, :@ack_requested, :@src, :@dest, :@params]

data/lib/sdn/version.rb

@@ -1,3 +1,3 @@
 module SDN
-  VERSION = '2.1.2'
+  VERSION = '2.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-ccutrer
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Library for communication with Somfy SDN RS-485 motorized shades