seriamp 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8c5974a39756c641ab5fb6e600d0d67095e4e9f18c872225ffb580cea4e70c
-  data.tar.gz: ba47852332bdb66070cf4105c4929ed691fce8eca8dd7f47aaefbeb4effab932
+  metadata.gz: 5687443fb1ef40b23fe59092d92d5421ff5dae7fd5196ddcd682df99d8dd64bd
+  data.tar.gz: 1c0654c533b4939cf5c265bfbab0f4e9ce21ea5a5b5506d1ef224d6f6ca2623d
 SHA512:
-  metadata.gz: 185e56b171c6db9ed0822f57de19ac2fea395d075bc615cddf0795c82c2f044b5212e9eb210b90b3dbc4aa603ce6b1553a610924c9ce8b9f02ae860c1f0c873c
-  data.tar.gz: 277dc1f126ca440e3a8539491e1548511f1abfb66e6a21c615ab4ab8bfce67c76c2499b6c6a2ec9efe20050cd1ac732f70cd3870cff98aec927ae57f6f46e1e4
+  metadata.gz: 7385b186ea20acc6f6ba001de8e0498c20fddc41f12219ca8e81a5490dcdd2c3751b340fe7e0ad2c990bc1c48447a724a6d5d1831746708aa57aadf78a4a3f30
+  data.tar.gz: b0411b2b26c3b8caa035d6286559e2daa98ec86d8d9d328e2ea324971458f1f6754fedf809d6db6f9d50336c9bba1953b2ffa5b36c6fdddc3d0bce85f8bb3e87

data/README.md

@@ -32,6 +32,39 @@ necessary.
 - Null-modem cable required
 - Receiver socket is male
 
+The following table shows which Yamaha receivers have RS-232 connector
+and which do not:
+
+| Family   | RS-232C Present              | RS-232C Absent |
+| -------- | ---------------------------- | -------------- |
+| RX-Vx000 | RX-V3000, RX-V1000           |                |
+|          |                              | HTR-5280       |
+| RX-Vx200 | RX-V2200                     | RX-V1200       |
+|          |                              | HTR-5490       |
+| RX-Vx300 | RX-V2300                     | RX-V1300       |
+|          |                              | HTR-5590       |
+|          |                              | HTR-5660       |
+| RX-Vx400 | RX-V2400                     | RX-V1400       |
+|          |                              | HTR-5790       |
+| RX-Vx500 | RX-V2500, RX-V1500           |                |
+|          | HTR-5890                     | HTR-5860       |
+| RX-Vx600 | RX-V2600, RX-V1600           |                |
+|          | HTR-5990                     | HTR-5960       |
+| RX-Vx700 | RX-V2700, RX-V1700           |                |
+|          |                              | HTR-6090       |
+| RX-Vx800 | RX-V3800, RX-V1800           |                |
+|          | HTR-6190                     | HTR-6180       |
+| RX-Vx900 | RX-V3900, RX-V1900           |                |
+|          |                              | HTR-6290       |
+| RX-Vx67  | RX-V3067, RX-V2067, RX-V1067 | RX-V867        |
+
+RX-V2700, RX-V3800 and RX-V3900 have an Ethernet port in addition to
+RS-232C and should be controllable via the Yamaha YNCA protocol via the
+Ethernet port. Over time Yamaha has been adding networking functionality
+to lower tier models, for example it is present in RX-V867, RX-V671 and RX-V475.
+
+Models lower than 1000 level receivers have never had RS-232C to my knowledge.
+
 ### Denon AVR-2308CI
 
 - Straight cable required
@@ -111,6 +144,10 @@ Serial port communication in Ruby:
 - [rubyserial](https://github.com/hybridgroup/rubyserial)
 - [Ruby/SerialPort](https://github.com/hparra/ruby-serialport)
 
+Yamaha YNCA protocol:
+
+- [yamaha_ynca](https://github.com/mvdwetering/yamaha_ynca)
+
 ## Helpful Links
 
 - [Serial port programming in Ruby](https://www.thegeekdiary.com/serial-port-programming-reading-writing-status-of-control-lines-dtr-rts-cts-dsr/)

data/lib/seriamp/detect.rb

@@ -21,7 +21,7 @@ module Seriamp
       Thread.new do
         Timeout.timeout(timeout * 2, CommunicationTimeout) do
           logger&.debug("Trying #{device}")
-          client_cls.new(device: device, logger: logger).present?
+          client_cls.new(device: device, logger: logger, retries: false).present?
           logger&.debug("Found #{mod} device at #{device}")
           queue << device
         end

data/lib/seriamp/sonamp/client.rb

@@ -224,6 +224,15 @@ module Seriamp
         logger&.debug("Opening #{device}")
         @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
 
+        warned = false
+        while IO.select([@io.io], nil, nil, 0)
+          unless warned
+            logger&.warn("Serial device readable after opening - unread previous response?")
+            warned = true
+          end
+          IO.read(1)
+        end
+
         begin
           yield @io
         ensure
@@ -236,11 +245,13 @@ module Seriamp
         try = 1
         begin
           yield
-        rescue Seriamp::Error => exc
+        rescue Seriamp::Error, IOError, SystemCallError => exc
           if try <= retries
             logger&.warn("Error during operation: #{exc.class}: #{exc} - will retry")
             try += 1
-            @device = nil
+            if detect_device?
+              @device = nil
+            end
             retry
           else
             raise

data/lib/seriamp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Seriamp
-  VERSION = '0.1.12'
+  VERSION = '0.1.14'
 end

data/lib/seriamp/yamaha/client.rb

@@ -197,6 +197,15 @@ module Seriamp
         logger&.debug("Opening #{device}")
         @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
 
+        warned = false
+        while IO.select([@io.io], nil, nil, 0)
+          unless warned
+            logger&.warn("Serial device readable after opening - unread previous response?")
+            warned = true
+          end
+          IO.read(1)
+        end
+
         begin
           tries = 0
           begin
@@ -417,11 +426,13 @@ module Seriamp
         try = 1
         begin
           yield
-        rescue Seriamp::Error => exc
+        rescue Seriamp::Error, IOError, SystemCallError => exc
           if try <= retries
             logger&.warn("Error during operation: #{exc.class}: #{exc} - will retry")
             try += 1
-            @device = nil
+            if detect_device?
+              @device = nil
+            end
             retry
           else
             raise

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.12'
+  spec.version       = '0.1.14'
   spec.authors       = ['Oleg Pudeyev']
   spec.email         = ['code@olegp.name']
   spec.summary       = %q{Serial control for amplifiers & A/V receivers}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seriamp
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport