seriamp 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8d27d7818b801b6734b046fcc3682b1322bc03cfaa8d2472f4963d5974f7d5
-  data.tar.gz: 917a111090ce967b0c28684f60fc0ccf8dca627c0c5d6ae1699b97746be69afc
+  metadata.gz: 630564090e5fbf436a4384d2aff86c3f51d8dcd60e69e82121730107dcb82deb
+  data.tar.gz: 4dfffa50df36bf315fb476d472d9de125e01c670c823e1c881b66189e5a5351b
 SHA512:
-  metadata.gz: 166e4cc102b91987bcb244aee644b682757609ad19ea42eafb88216f09295b87344a7906d925ff0479fe58b4db477691404bcfb7211d9bab7b29d29fe41555f2
-  data.tar.gz: 4e4aac13144356caeb92bf05da4e50181f1f83613e5ed1bb857fe91c1562d6d352b81c9e9eb051f6f8f50cc348f4bb61f0e8f04887880480dbc6e8c19be513de
+  metadata.gz: 2abd880200ab09af611fe31b31ca8299d189cf05f1448cc59773972f6c4e8929c120fdc533f2b7c246cde8a3621fbeeb6d562ef18f233b8b1ae63536708c2678
+  data.tar.gz: f110bb9840aac1b485c8e12f42b34cbb0d4a578d9f6e3852591480b59f450715d08da33b166e3eb4381152139aef3e0b8e09a9fd2a65be31a41183cfd7b4fa70

data/bin/sonamp-web

@@ -25,7 +25,7 @@ logger = Logger.new(STDERR)
 
 #Sonamp::App.set :device, options[:device]
 #Sonamp::App.set :logger, logger
-Seriamp::Sonamp::App.set :client, Sonamp::Client.new(options[:device], logger: logger)
+Seriamp::Sonamp::App.set :client, Seriamp::Sonamp::Client.new(device: options[:device], logger: logger)
 
 options = Rack::Server::Options.new.parse!(ARGV)
-Rack::Server.start(options.merge(app: Sonamp::App))
+Rack::Server.start(options.merge(app: Seriamp::Sonamp::App))

data/bin/yamaha-web

@@ -25,7 +25,7 @@ logger = Logger.new(STDERR)
 
 #Yamaha::App.set :device, options[:device]
 #Yamaha::App.set :logger, logger
-Seriamp::Yamaha::App.set :client, Yamaha::Client.new(options[:device], logger: logger)
+Seriamp::Yamaha::App.set :client, Seriamp::Yamaha::Client.new(device: options[:device], logger: logger)
 
 options = Rack::Server::Options.new.parse!(ARGV)
-Rack::Server.start(options.merge(app: Yamaha::App))
+Rack::Server.start(options.merge(app: Seriamp::Yamaha::App))

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

@@ -69,11 +69,11 @@ module Seriamp
           client.set_zone_power(4, false)
         when 'power'
           zone = args.shift.to_i
-          state = Utils.parse_on_off(ARGV.shift)
+          state = Utils.parse_on_off(args.shift)
           client.set_zone_power(zone, state)
         when 'zvol'
           zone = args.shift.to_i
-          volume = ARGV.shift.to_i
+          volume = args.shift.to_i
           client.set_zone_volume(zone, volume)
         when 'cvol'
           channel = args.shift.to_i
@@ -81,7 +81,7 @@ module Seriamp
           client.set_channel_volume(channel, volume)
         when 'zmute'
           zone = args.shift.to_i
-          mute = ARGV.shift.to_i
+          mute = args.shift.to_i
           client.set_zone_mute(zone, mute)
         when 'cmute'
           channel = args.shift.to_i

data/lib/seriamp/version.rb

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

data/lib/seriamp/yamaha/app.rb

@@ -2,6 +2,7 @@
 
 require 'sinatra/base'
 require 'seriamp/utils'
+require 'seriamp/detect'
 require 'seriamp/yamaha/client'
 
 module Seriamp
@@ -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.last_status.fetch(:power) > 0)
       end
@@ -27,15 +32,27 @@ module Seriamp
           empty_response
         end
 
-        get '/#{zone}/volume' do
+        get "/#{zone}/volume" do
           render_json(client.public_send("get_#{zone}_volume"))
         end
 
-        put '/#{zone}/volume' do
+        put "/#{zone}/volume" do
           value = Float(request.body.read)
           client.public_send("set_#{zone}_volume_db", value)
           empty_response
         end
+
+        put "/#{zone}/input" do
+          value = request.body.read
+          client.public_send("set_#{zone}_input", value)
+          empty_response
+        end
+      end
+
+      put "/pure-direct" do
+        state = Utils.parse_on_off(request.body.read)
+        client.public_send("set_pure_direct", state)
+        empty_response
       end
 
       private
@@ -47,6 +64,7 @@ module Seriamp
       end
 
       def render_json(data)
+        headers['content-type'] = 'application/json'
         data.to_json
       end
 

data/lib/seriamp/yamaha/client.rb

@@ -2,13 +2,13 @@
 
 require 'timeout'
 require 'seriamp/backend/serial_port'
-require 'seriamp/yamaha/protocol/constants'
 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
@@ -170,6 +170,34 @@ module Seriamp
         resp
       end
 
+      MODEL_NAMES = {
+        'R0177' => 'RX-V1500',
+        '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
@@ -188,15 +216,15 @@ module Seriamp
         length = payload[6..7].to_i(16)
         data = payload[8...-2]
         if data.length != length
-          raise BadStatus, "Broken status response: expected #{length} bytes, got #{data.length} bytes; concurrent operation on device?"
+          raise HandshakeFailure, "Broken status response: expected #{length} bytes, got #{data.length} bytes; concurrent operation on device?"
         end
         unless data.start_with?('@E01900')
-          raise BadStatus, "Broken status response: expected to start with @E01900, actual #{data[0..6]}"
+          raise HandshakeFailure, "Broken status response: expected to start with @E01900, actual #{data[0..6]}"
         end
         @status_string = data
         @status = {
-          # RX-V1500: model R0177
           model_code: @model_code,
+          model_name: MODEL_NAMES[@model_code],
           firmware_version: @version,
           system_status: data[7].ord - ZERO_ORD,
           power: power = data[8].ord - ZERO_ORD,
@@ -236,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

@@ -62,20 +62,20 @@ module Seriamp
             exit 3
           end
         when 'power'
-          which = ARGV.shift&.downcase
+          which = args.shift&.downcase
           if %w(main zone2 zone3).include?(which)
             method = "set_#{which}_power"
-            state = Utils.parse_on_off(ARGV.shift)
+            state = Utils.parse_on_off(args.shift)
           else
             method = 'set_power'
             state = Utils.parse_on_off(which)
           end
           client.public_send(method, state)
         when 'volume'
-          which = ARGV.shift
+          which = args.shift
           if %w(main zone2 zone3).include?(which)
             prefix = "set_#{which}"
-            value = ARGV.shift
+            value = args.shift
           else
             prefix = 'set_main'
             value = which
@@ -95,25 +95,28 @@ module Seriamp
           p client.get_zone2_volume_text
           p client.get_zone3_volume_text
         when 'input'
-          which = ARGV.shift&.downcase
+          which = args.shift&.downcase
           if %w(main zone2 zone3).include?(which)
             method = "set_#{which}_input"
-            input = ARGV.shift
+            input = args.shift
           else
             method = 'set_main_input'
             input = which
           end
           client.public_send(method, input)
         when 'program'
-          value = ARGV.shift.downcase
+          value = args.shift.downcase
           client.set_program(value)
         when 'pure-direct'
-          state = Utils.parse_on_off(ARGV.shift)
+          state = Utils.parse_on_off(args.shift)
           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

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'seriamp/yamaha/protocol/constants'
+
 module Seriamp
   module Yamaha
     module Protocol
       module Methods
+        include Constants
 
         # Turns the receiver on or off.
         #
@@ -87,7 +90,7 @@ module Seriamp
         end
 
         def set_subwoofer_level(level)
-          dispatch("#{STX}249#{'%02x' % level}#{ETX}")
+          system_command("49#{'%02x' % level}")
         end
 
         def get_main_volume_text
@@ -106,7 +109,7 @@ module Seriamp
         #
         # @param [ true | false ] state Desired state.
         def set_pure_direct(state)
-          dispatch("#{STX}07E8#{state ? '0' : '2'}#{ETX}")
+          remote_command("7E8#{state ? '0' : '2'}")
         end
 
         def set_program(value)

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.4'
   spec.authors       = ['Oleg Pudeyev']
   spec.email         = ['code@olegp.name']
   spec.summary       = %q{Serial control for amplifiers & A/V receivers}
@@ -14,4 +14,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  
+  spec.add_runtime_dependency 'serialport', '~> 1.0'
+  
+  # Optional dependencies: sinatra for the web apps
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: seriamp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-27 00:00:00.000000000 Z
-dependencies: []
+date: 2022-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Library for controlling Yamaha A/V receivers and Sonance Sonamp amplifiers
   via the serial port
 email: