seriamp 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d3d9290f5631bdd707dd435ef0f0e7abe7da345017bc92764cacb78f6e485e
-  data.tar.gz: 629ef868b42d3e0d50bf27fbc6a15fbfe036fdee9a4028aa03aae671a7c5e737
+  metadata.gz: 4e48ad0a8b0c004f0e7a931eed8b923bb06329af40db33c7d89b51831591531a
+  data.tar.gz: 292b04a8dca57285dbfea326a38b86bc6fb8e67e1ebb60215b49bdb236eecc94
 SHA512:
-  metadata.gz: 0f799dc584037d91ed46ab8abffa4c0ab2dfd9d8db131d2195b5fbd9b2222702e54002f5eb3a97c40fcb1dbe3902639f0cda195a6407d6a6a04db9e3542a2f49
-  data.tar.gz: a65df97c56a0d665f1636dafdbf323a75a4624d5669662cd5ad60b0d20780c5f30aa3bb7a261892db228c33da0f19c094d9c70727191f0a24c4e8e46b022675e
+  metadata.gz: bb8b19b6288bfe4b248aaaa1dffe26f801b64729af28923a8501222e05c8978747337c9d61b22d2794c2d6f33ebc16e831272569add01420c24ac9786674c5cd
+  data.tar.gz: f1fe372b20b6bd95f33637c3157d6cc210d03c3cd7e6047061657095ef07abc891c6a38b85c9788d0329898ff7e4506687cc9661ca411de0582c0367a9c5f6df

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/sonamp/app.rb

@@ -3,6 +3,7 @@
 require 'sinatra/base'
 require 'seriamp/utils'
 require 'seriamp/sonamp/client'
+require 'seriamp/detect'
 
 module Seriamp
   module Sonamp
@@ -12,6 +13,10 @@ module Seriamp
       set :logger, nil
       set :client, nil
 
+      get '/' do
+        render_json(client.status)
+      end
+
       get '/power' do
         render_json(client.get_zone_power)
       end
@@ -55,6 +60,7 @@ module Seriamp
       end
 
       def render_json(data)
+        headers['content-type'] = 'application/json'
         data.to_json
       end
     end

data/lib/seriamp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Seriamp
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 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

@@ -7,7 +7,8 @@ require 'seriamp/yamaha/protocol/methods'
 module Seriamp
   module Yamaha
 
-    RS232_TIMEOUT = 3
+    # The manual says response should be received in 500 ms.
+    RS232_TIMEOUT = 0.75
 
     class Client
       include Protocol::Methods
@@ -174,6 +175,29 @@ module Seriamp
         'R0178' => 'RX-V2500',
       }.freeze
 
+      PURE_DIRECT_FIELD = {
+        'R0177' => 28,
+        'R0178' => 126,
+      }.freeze
+
+      INPUT_MODE_R0178 = {
+        '0' => 'Auto',
+        '2' => 'DTS',
+        '4' => 'Analog',
+        '5' => 'Analog Only',
+      }.freeze
+
+      SAMPLE_RATE_R0178 = {
+        '0' => 'Analog',
+        '1' => 32000,
+        '2' => 44100,
+        '3' => 48000,
+        '4' => 64000,
+        '5' => 88200,
+        '6' => 96000,
+        '7' => 'Unknown',
+      }.freeze
+
       def do_status
         resp = nil
         loop do
@@ -240,12 +264,20 @@ module Seriamp
             sleep: SLEEP_GET.fetch(data[24]),
             night: night = data[27],
             night_name: NIGHT_GET.fetch(night),
-            pure_direct: data[28] == '1',
+            pure_direct: data[PURE_DIRECT_FIELD.fetch(@model_code)] == '1',
             speaker_a: data[29] == '1',
             speaker_b: data[30] == '1',
-            format: data[31..32],
-            sample_rate: data[33..34],
+            # 2 positions on RX-Vx700
+            #format: data[31..32],
+            #sampling: data[33..34],
           )
+          if @model_code == 'R0178'
+            @status.update(
+              input_mode: INPUT_MODE_R0178.fetch(data[11]),
+              sampling: data[32],
+              sample_rate: SAMPLE_RATE_R0178.fetch(data[32]),
+            )
+          end
         end
         @status
       end

data/lib/seriamp/yamaha/cmd.rb

@@ -74,26 +74,34 @@ 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}"
+          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(. -).include?(value)
+              method = "#{prefix}_mute"
+              value = true
+            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)
@@ -112,8 +120,11 @@ module Seriamp
           client.set_pure_direct(state)
         when 'status'
           pp client.last_status
-        when 'status_string'
-          puts client.last_status_string
+        when 'dev-status'
+          status = client.last_status_string
+          0.upto(status.length-1).each do |i|
+            puts "%3d  %s" % [i, status[i]]
+          end
         when 'test'
           client.set_power(false)
           [true, false].each do |main_state|

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.3'
+  spec.version       = '0.1.5'
   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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport