seriamp 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630564090e5fbf436a4384d2aff86c3f51d8dcd60e69e82121730107dcb82deb
-  data.tar.gz: 4dfffa50df36bf315fb476d472d9de125e01c670c823e1c881b66189e5a5351b
+  metadata.gz: 7afd42caaa8f0dd5815e908b40bfccd8ca042769fea3af431ae334b3d44aa140
+  data.tar.gz: af4041b6faf2f07ce204a15b99d4cc51b6f4bdfacc5c016006588d096513adef
 SHA512:
-  metadata.gz: 2abd880200ab09af611fe31b31ca8299d189cf05f1448cc59773972f6c4e8929c120fdc533f2b7c246cde8a3621fbeeb6d562ef18f233b8b1ae63536708c2678
-  data.tar.gz: f110bb9840aac1b485c8e12f42b34cbb0d4a578d9f6e3852591480b59f450715d08da33b166e3eb4381152139aef3e0b8e09a9fd2a65be31a41183cfd7b4fa70
+  metadata.gz: c09d03fe9b24e521eadffef9dc94305f61b90005e9719c349d9dba9ab7cb327a632352a62a3d2831f215374343147e3195fd958e01c4d750cce0a7ee4b7a8fda
+  data.tar.gz: a5a4f1b992fc6459ed7fa605daecc0715acb5e5938246b9915eb6af32415162b18650a6c45066602c22c27cf15f4879d91f63ab4b75eb05df82c02c0ee12760d

data/README.md

@@ -1,5 +1,46 @@
 # Yamaha Receiver Serial Control Ruby Library
 
+## Hardware Requirements
+
+I used USB to serial adapters with both Prolific PL2303 and FTDI chips.
+Both chipsets work under Linux. The FTDI chipset appears to buffer the
+incoming data - when reading from the device, it returns more than one
+character at a time, whereas with the Prolific chipset only one character at
+a time is returned. This means the FTDI chip can possibly offer faster
+communication. Adapters based on the FTDI chip are also more expensive.
+
+On Windows, FTDI provides drivers for at least Windows 7, however they
+are not signed. Windows can be booted with the option to skip driver
+signing enforcement, which makes the adapter work. I couldn't locate a
+working Prolific driver for Windows 7.
+
+These USB to serial adapters all have male connection on the RS232 end.
+As such, no additional cable is needed if communicating with a receiver
+that requires a straight cable and has a female terminal (such as the
+Denon AVR-2308CI). For other receivers a gender changer or a cable is
+necessary.
+
+### Sonance Sonamp 875D / 875D MK II
+
+- 3-pin cable should be sufficient according to manual
+- Null-modem cable required
+- Receiver socket is female
+
+### Yamaha RX-V**00
+
+- 5-pin cable required (with RTS pin connected)
+- Null-modem cable required
+- Receiver socket is male
+
+### Denon AVR-2308CI
+
+- Straight cable required
+- Receiver socket is female
+
+### Integra DTR
+
+- Straight cable required
+
 ## Protocol Notes
 
 ### RX-V1500 Power Values

data/lib/seriamp/version.rb

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

data/lib/seriamp/yamaha/app.rb

@@ -42,6 +42,34 @@ module Seriamp
           empty_response
         end
 
+        post "/#{zone}/volume/up" do
+          client.public_send("#{zone}_volume_up")
+          client.public_send("#{zone}_volume_up")
+          plain_response client.main_volume_db
+        end
+
+        post "/#{zone}/volume/up/:step" do |step|
+          client.public_send("#{zone}_volume_up")
+          step.to_i.times do
+            client.public_send("#{zone}_volume_up")
+          end
+          plain_response client.main_volume_db
+        end
+
+        post "/#{zone}/volume/down" do
+          client.public_send("#{zone}_volume_down")
+          client.public_send("#{zone}_volume_down")
+          plain_response client.main_volume_db
+        end
+
+        post "/#{zone}/volume/down/:step" do |step|
+          client.public_send("#{zone}_volume_down")
+          step.to_i.times do
+            client.public_send("#{zone}_volume_down")
+          end
+          plain_response client.main_volume_db
+        end
+
         put "/#{zone}/input" do
           value = request.body.read
           client.public_send("set_#{zone}_input", value)
@@ -71,6 +99,11 @@ module Seriamp
       def empty_response
         render_json({})
       end
+
+      def plain_response(data)
+        headers['content-type'] = 'text/plain'
+        data.to_s
+      end
     end
   end
 end

data/lib/seriamp/yamaha/client.rb

@@ -79,6 +79,9 @@ module Seriamp
         end
       end
 
+      alias main_input_name input_name
+      alias last_main_input_name last_input_name
+
       %i(
         multi_ch_input effect pure_direct speaker_a speaker_b
       ).each do |meth|

data/lib/seriamp/yamaha/cmd.rb

@@ -74,36 +74,54 @@ module Seriamp
         when 'volume'
           which = args.shift
           if %w(main zone2 zone3).include?(which)
-            prefix = "set_#{which}"
             value = args.shift
           else
-            prefix = 'set_main'
             value = which
+            which = 'main'
           end
-          if %w(. -).include?(value)
-            method = "#{prefix}_mute"
-            value = true
+          prefix = "set_#{which}"
+          if value.nil?
+            puts client.send("last_#{which}_volume_db")
+            return
+          end
+          value = value.downcase
+          if value == 'up'
+            # Just like with remote, the first volume up or down command
+            # doesn't do anything.
+            client.public_send("#{which}_volume_up")
+            client.public_send("#{which}_volume_up")
+          elsif value == 'down'
+            client.public_send("#{which}_volume_down")
+            client.public_send("#{which}_volume_down")
           else
-            method = "#{prefix}_volume_db"
-            if value[0] == ','
-              value = value[1..]
+            if %w(. - mute).include?(value)
+              method = "#{prefix}_mute"
+              value = true
+            elsif value == 'unmute'
+              method = "#{prefix}_mute"
+              value = false
+            else
+              method = "#{prefix}_volume_db"
+              if value[0] == ','
+                value = value[1..]
+              end
+              value = Float(value)
             end
-            value = Float(value)
+            client.public_send(method, value)
           end
-          client.public_send(method, value)
-          p client.get_main_volume_text
-          p client.get_zone2_volume_text
-          p client.get_zone3_volume_text
         when 'input'
           which = args.shift&.downcase
           if %w(main zone2 zone3).include?(which)
-            method = "set_#{which}_input"
             input = args.shift
           else
-            method = 'set_main_input'
             input = which
+            which = 'main'
+          end
+          if input.nil?
+            puts client.public_send("last_#{which}_input_name")
+            return
           end
-          client.public_send(method, input)
+          client.public_send("set_#{which}_input", input)
         when 'program'
           value = args.shift.downcase
           client.set_program(value)

data/lib/seriamp/yamaha/protocol/methods.rb

@@ -66,6 +66,14 @@ module Seriamp
           set_zone2_volume(value)
         end
 
+        def main_volume_up
+          remote_command('7A1A')
+        end
+
+        def main_volume_down
+          remote_command('7A1B')
+        end
+
         def zone2_volume_up
           remote_command('7ADA')
         end

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.4'
+  spec.version       = '0.1.6'
   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.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport