seriamp 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7afd42caaa8f0dd5815e908b40bfccd8ca042769fea3af431ae334b3d44aa140
-  data.tar.gz: af4041b6faf2f07ce204a15b99d4cc51b6f4bdfacc5c016006588d096513adef
+  metadata.gz: 25ded6fbd5f32c13385dc7704f60d9d88c46bf528f79e7c67d41f295800b596d
+  data.tar.gz: 7c2cab83327cf081c73c28743d46406213bdfaccd18f177d632f3c0922b55466
 SHA512:
-  metadata.gz: c09d03fe9b24e521eadffef9dc94305f61b90005e9719c349d9dba9ab7cb327a632352a62a3d2831f215374343147e3195fd958e01c4d750cce0a7ee4b7a8fda
-  data.tar.gz: a5a4f1b992fc6459ed7fa605daecc0715acb5e5938246b9915eb6af32415162b18650a6c45066602c22c27cf15f4879d91f63ab4b75eb05df82c02c0ee12760d
+  metadata.gz: 5484fe172a3d65fb4d9778fc3734dd0a2aa5b24f459f864b5d8bc68a4766b06e5d6f2fd3ccc234b21b27fdc534abeb76655cdf29c68e1dca7afacf476e847186
+  data.tar.gz: 64cb7cfed4265a174020f59a04671e9865739d4f573b361f560c88051fad4a63355e2401cd0d84cc2aa394babed6cc5efa6ae775573362fb3da6e09dfa716840

data/lib/seriamp/sonamp/app.rb

@@ -21,31 +21,51 @@ module Seriamp
         render_json(client.get_zone_power)
       end
 
+      get '/volume' do
+        payload = {
+          zone_volume: client.get_zone_volume,
+          zone_mute: client.get_zone_mute,
+          channel_volume: client.get_channel_volume,
+          channel_mute: client.get_channel_mute,
+        }
+        render_json(payload)
+      end
+
       get '/zone/:zone/power' do |zone|
-        render_json(client.get_zone_power(zone.to_i))
+        render_json(client.get_zone_power(Integer(zone)))
       end
 
       put '/zone/:zone/power' do |zone|
         state = Utils.parse_on_off(request.body.read)
-        client.set_zone_power(zone.to_i, state)
+        client.set_zone_power(Integer(zone), state)
       end
 
       get '/zone/:zone/volume' do |zone|
-        render_json(client.get_zone_volume(zone.to_i))
+        render_json(client.get_zone_volume(Integer(zone)))
       end
 
       put '/zone/:zone/volume' do |zone|
         volume = request.body.read.to_i
-        client.set_zone_volume(zone.to_i, volume)
+        client.set_zone_volume(Integer(zone), volume)
+      end
+
+      put '/zone/:zone/mute' do |zone|
+        state = Utils.parse_on_off(request.body.read)
+        client.set_zone_mute(Integer(zone), state)
       end
 
       get '/channel/:channel/volume' do |channel|
-        render_json(client.get_channel_volume(channel.to_i))
+        render_json(client.get_channel_volume(Integer(channel)))
       end
 
       put '/channel/:channel/volume' do |channel|
         volume = request.body.read.to_i
-        client.set_channel_volume(channel.to_i, volume)
+        client.set_channel_volume(Integer(channel), volume)
+      end
+
+      put '/channel/:channel/mute' do |channel|
+        state = Utils.parse_on_off(request.body.read)
+        client.set_channel_mute(Integer(channel), state)
       end
 
       post '/' do

data/lib/seriamp/sonamp/client.rb

@@ -101,14 +101,30 @@ module Seriamp
         get_zone_state('FP', zone)
       end
 
+      def set_bbe(zone, state)
+        set_zone_value('BP', zone, state ? 1 : 0)
+      end
+
       def get_bbe(zone = nil)
         get_zone_state('BP', zone)
       end
 
+      def set_bbe_boost(zone, state)
+        set_zone_value('BB', zone, convert_boolean_out(state))
+      end
+
+      def set_bbe_high_boost(zone, state)
+        set_zone_value('BH', zone, convert_boolean_out(state))
+      end
+
       def get_bbe_high_boost(zone = nil)
         get_zone_state('BH', zone)
       end
 
+      def set_bbe_low_boost(zone, state)
+        set_zone_value('BL', zone, convert_boolean_out(state))
+      end
+
       def get_bbe_low_boost(zone = nil)
         get_zone_state('BL', zone)
       end
@@ -258,7 +274,6 @@ module Seriamp
           resp = dispatch(":#{cmd_prefix}#{zone}?")
           typecast_value(resp[cmd_prefix.length + 1..], boolize)
         else
-          index = 1
           hashize_query_result(dispatch(":#{cmd_prefix}G?", 4), cmd_prefix, boolize)
         end
       end
@@ -309,6 +324,17 @@ module Seriamp
         end
         value
       end
+
+      def convert_boolean_out(value)
+        case value
+        when true, 1
+          1
+        when false, 0
+          0
+        else
+          raise ArgumentError, "Invalid boolean value: #{value}"
+        end
+      end
     end
   end
 end

data/lib/seriamp/utils.rb

@@ -13,5 +13,9 @@ module Seriamp
         raise ArgumentError, "Invalid on/off value: #{value}"
       end
     end
+
+    module_function def monotime
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
   end
 end

data/lib/seriamp/version.rb

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

data/lib/seriamp/yamaha/app.rb

@@ -4,6 +4,7 @@ require 'sinatra/base'
 require 'seriamp/utils'
 require 'seriamp/detect'
 require 'seriamp/yamaha/client'
+require 'seriamp/yamaha/executor'
 
 module Seriamp
   module Yamaha
@@ -14,7 +15,16 @@ module Seriamp
       set :client, nil
 
       get '/' do
-        render_json(client.status)
+        render_json(client.last_status)
+      end
+
+      post '/' do
+        executor = Executor.new
+        request.body.read.split("\n").each do |line|
+          args = line.strip.split(/\s+/)
+          executor.run_command(args)
+        end
+        standard_response
       end
 
       get '/power' do
@@ -28,8 +38,15 @@ module Seriamp
 
         put "/#{zone}/power" do
           state = Utils.parse_on_off(request.body.read)
-          client.public_send("set_#{zone}_power", state)
-          empty_response
+          client.with_device do
+            client.public_send("set_#{zone}_power", state)
+            rs = request.env['HTTP_RETURN_STATUS']
+            if rs && Utils.parse_on_off(rs)
+              render_json(client.status)
+            else
+              empty_response
+            end
+          end
         end
 
         get "/#{zone}/volume" do
@@ -77,9 +94,49 @@ module Seriamp
         end
       end
 
-      put "/pure-direct" do
+      put "/pure_direct" do
         state = Utils.parse_on_off(request.body.read)
-        client.public_send("set_pure_direct", state)
+        client.set_pure_direct(state)
+        empty_response
+      end
+
+      put "/center_speaker_layout" do
+        client.set_center_speaker_layout(request.body.read)
+        empty_response
+      end
+
+      put "/front_speaker_layout" do
+        client.set_front_speaker_layout(request.body.read)
+        empty_response
+      end
+
+      put "/surround_speaker_layout" do
+        client.set_surround_speaker_layout(request.body.read)
+        empty_response
+      end
+
+      put "/surround_back_speaker_layout" do
+        client.set_surround_back_speaker_layout(request.body.read)
+        empty_response
+      end
+
+      put "/presence_speaker_layout" do
+        client.set_presence_speaker_layout(request.body.read)
+        empty_response
+      end
+
+      put "/bass_out" do
+        client.set_bass_out(request.body.read)
+        empty_response
+      end
+
+      put "/subwoofer_phase" do
+        client.set_subwoofer_phase(request.body.read)
+        empty_response
+      end
+
+      put "/subwoofer_crossover" do
+        client.set_subwoofer_crossover(Integer(request.body.read))
         empty_response
       end
 
@@ -97,13 +154,22 @@ module Seriamp
       end
 
       def empty_response
-        render_json({})
+        [204, '']
       end
 
       def plain_response(data)
         headers['content-type'] = 'text/plain'
         data.to_s
       end
+
+      def standart_response
+        rs = request.env['HTTP_X_RETURN_STATUS']
+        if rs && Utils.parse_on_off(rs)
+          render_json(client.status)
+        else
+          empty_response
+        end
+      end
     end
   end
 end

data/lib/seriamp/yamaha/client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'timeout'
+require 'seriamp/utils'
 require 'seriamp/backend/serial_port'
 require 'seriamp/yamaha/protocol/methods'
 
@@ -13,12 +14,22 @@ module Seriamp
     class Client
       include Protocol::Methods
 
-      def initialize(device: nil, glob: nil, logger: nil)
+      def initialize(device: nil, glob: nil, logger: nil, retries: true)
         @logger = logger
 
         @device = device
         @detect_device = device.nil?
         @glob = glob
+        @retries = case retries
+          when nil, false
+            0
+          when true
+            1
+          when Integer
+            retries
+          else
+            raise ArgumentError, "retries must be an integer, true, false or nil: #{retries}"
+          end
 
         if block_given?
           begin
@@ -32,6 +43,7 @@ module Seriamp
       attr_reader :device
       attr_reader :glob
       attr_reader :logger
+      attr_reader :retries
 
       def detect_device?
         @detect_device
@@ -94,12 +106,47 @@ module Seriamp
         end
       end
 
+      def with_device(&block)
+        if @io
+          yield @io
+        else
+          open_device(&block)
+        end
+      end
+
+      # Shows a message via the on-screen display. The message must be 16
+      # characters or fewer. The message is NOT displayed on the front panel,
+      # it is shown only on the connected TV's OSD.
+      def osd_message(msg)
+        if msg.length < 16
+          msg = msg.dup
+          while msg.length < 16
+            msg += ' '
+          end
+        elsif msg.length > 16
+          raise ArgumentError, "Message must be no more than 16 characters, #{msg.length} given"
+        end
+
+        with_retry do
+          with_device do
+            @io.syswrite("#{STX}21000#{ETX}".encode('ascii'))
+            @io.syswrite("#{STX}3#{msg[0..3]}#{ETX}".encode('ascii'))
+            @io.syswrite("#{STX}3#{msg[4..7]}#{ETX}".encode('ascii'))
+            @io.syswrite("#{STX}3#{msg[8..11]}#{ETX}".encode('ascii'))
+            @io.syswrite("#{STX}3#{msg[12..15]}#{ETX}".encode('ascii'))
+          end
+        end
+
+        nil
+      end
+
       private
 
       include Protocol::Constants
 
       def open_device
         if detect_device? && device.nil?
+          logger&.debug("Detecting device")
           @device = Seriamp.detect_device(Yamaha, *glob, logger: logger)
           if @device
             logger&.info("Using #{device} as TTY device")
@@ -108,6 +155,7 @@ module Seriamp
           end
         end
 
+        logger&.debug("Opening #{device}")
         @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
 
         begin
@@ -131,14 +179,6 @@ module Seriamp
         end
       end
 
-      def with_device(&block)
-        if @io
-          yield @io
-        else
-          open_device(&block)
-        end
-      end
-
       # ASCII table: https://www.asciitable.com/
       DC1 = ?\x11
       DC2 = ?\x12
@@ -151,9 +191,13 @@ module Seriamp
       ZERO_ORD = '0'.ord
 
       def dispatch(cmd)
+        start = Utils.monotime
         with_device do
           @io.syswrite(cmd.encode('ascii'))
           read_response
+        end.tap do
+          elapsed = Utils.monotime - start
+          logger&.debug("Yamaha: dispatched #{cmd} in #{'%.2f' % elapsed} s")
         end
       end
 
@@ -202,95 +246,101 @@ module Seriamp
       }.freeze
 
       def do_status
-        resp = nil
-        loop do
-          resp = dispatch(STATUS_REQ)
-          again = false
-          while @io && IO.select([@io.io], nil, nil, 0)
-            logger&.warn("Serial device readable after completely reading status response - concurrent access?")
-            read_response
-            again = true
+        with_retry do
+          resp = nil
+          loop do
+            resp = dispatch(STATUS_REQ)
+            again = false
+            while @io && IO.select([@io.io], nil, nil, 0)
+              logger&.warn("Serial device readable after completely reading status response - concurrent access?")
+              read_response
+              again = true
+            end
+            break unless again
           end
-          break unless again
-        end
-        payload = resp[1...-1]
-        @model_code = payload[0..4]
-        @version = payload[5]
-        length = payload[6..7].to_i(16)
-        data = payload[8...-2]
-        if data.length != length
-          raise HandshakeFailure, "Broken status response: expected #{length} bytes, got #{data.length} bytes; concurrent operation on device?"
-        end
-        unless data.start_with?('@E01900')
-          raise HandshakeFailure, "Broken status response: expected to start with @E01900, actual #{data[0..6]}"
-        end
-        @status_string = data
-        @status = {
-          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,
-          main_power: [1, 4, 5, 2].include?(power),
-          zone2_power: [1, 4, 3, 6].include?(power),
-          zone3_power: [1, 5, 3, 7].include?(power),
-        }
-        if data.length > 9
-          @status.update(
-            input: input = data[9],
-            input_name: MAIN_INPUTS_GET.fetch(input),
-            multi_ch_input: data[10] == '1',
-            audio_select: audio_select = data[11],
-            audio_select_name: AUDIO_SELECT_GET.fetch(audio_select),
-            mute: data[12] == '1',
-            # Volume values (0.5 dB increment):
-            # mute: 0
-            # -80.0 dB (min): 39
-            # 0 dB: 199
-            # +14.5 dB (max): 228
-            # Zone2 volume values (1 dB increment):
-            # mute: 0
-            # -33 dB (min): 39
-            # 0 dB (max): 72
-            main_volume: volume = data[15..16].to_i(16),
-            main_volume_db: int_to_half_db(volume),
-            zone2_volume: zone2_volume = data[17..18].to_i(16),
-            zone2_volume_db: int_to_full_db(zone2_volume),
-            zone3_volume: zone3_volume = data[129..130].to_i(16),
-            zone3_volume_db: int_to_full_db(zone3_volume),
-            program: program = data[19..20],
-            program_name: PROGRAM_GET.fetch(program),
-            # true: straight; false: effect
-            effect: data[21] == '1',
-            #extended_surround: data[22],
-            #short_message: data[23],
-            sleep: SLEEP_GET.fetch(data[24]),
-            night: night = data[27],
-            night_name: NIGHT_GET.fetch(night),
-            pure_direct: data[PURE_DIRECT_FIELD.fetch(@model_code)] == '1',
-            speaker_a: data[29] == '1',
-            speaker_b: data[30] == '1',
-            # 2 positions on RX-Vx700
-            #format: data[31..32],
-            #sampling: data[33..34],
-          )
-          if @model_code == 'R0178'
+          payload = resp[1...-1]
+          @model_code = payload[0..4]
+          @version = payload[5]
+          length = payload[6..7].to_i(16)
+          data = payload[8...-2]
+          if data.length != length
+            raise HandshakeFailure, "Broken status response: expected #{length} bytes, got #{data.length} bytes; concurrent operation on device?"
+          end
+          unless data.start_with?('@E01900')
+            raise HandshakeFailure, "Broken status response: expected to start with @E01900, actual #{data[0..6]}"
+          end
+          @status_string = data
+          @status = {
+            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,
+            main_power: [1, 4, 5, 2].include?(power),
+            zone2_power: [1, 4, 3, 6].include?(power),
+            zone3_power: [1, 5, 3, 7].include?(power),
+          }
+          if data.length > 9
             @status.update(
-              input_mode: INPUT_MODE_R0178.fetch(data[11]),
-              sampling: data[32],
-              sample_rate: SAMPLE_RATE_R0178.fetch(data[32]),
+              input: input = data[9],
+              input_name: MAIN_INPUTS_GET.fetch(input),
+              multi_ch_input: data[10] == '1',
+              audio_select: audio_select = data[11],
+              audio_select_name: AUDIO_SELECT_GET.fetch(audio_select),
+              mute: data[12] == '1',
+              # Volume values (0.5 dB increment):
+              # mute: 0
+              # -80.0 dB (min): 39
+              # 0 dB: 199
+              # +14.5 dB (max): 228
+              # Zone2 volume values (1 dB increment):
+              # mute: 0
+              # -33 dB (min): 39
+              # 0 dB (max): 72
+              main_volume: volume = data[15..16].to_i(16),
+              main_volume_db: int_to_half_db(volume),
+              zone2_volume: zone2_volume = data[17..18].to_i(16),
+              zone2_volume_db: int_to_full_db(zone2_volume),
+              zone3_volume: zone3_volume = data[129..130].to_i(16),
+              zone3_volume_db: int_to_full_db(zone3_volume),
+              program: program = data[19..20],
+              program_name: PROGRAM_GET.fetch(program),
+              # true: straight; false: effect
+              effect: data[21] == '1',
+              #extended_surround: data[22],
+              #short_message: data[23],
+              sleep: SLEEP_GET.fetch(data[24]),
+              night: night = data[27],
+              night_name: NIGHT_GET.fetch(night),
+              pure_direct: data[PURE_DIRECT_FIELD.fetch(@model_code)] == '1',
+              speaker_a: data[29] == '1',
+              speaker_b: data[30] == '1',
+              # 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
-        @status
       end
 
       def remote_command(cmd)
-        dispatch("#{STX}0#{cmd}#{ETX}")
+        with_retry do
+          dispatch("#{STX}0#{cmd}#{ETX}")
+        end
       end
 
       def system_command(cmd)
-        dispatch("#{STX}2#{cmd}#{ETX}")
+        with_retry do
+          dispatch("#{STX}2#{cmd}#{ETX}")
+        end
       end
 
       def extract_text(resp)
@@ -313,6 +363,22 @@ module Seriamp
           (value - 39) - 33
         end
       end
+
+      def with_retry
+        try = 1
+        begin
+          yield
+        rescue Seriamp::Error => exc
+          if try <= retries
+            logger&.warn("Error during operation: #{exc.class}: #{exc} - will retry")
+            try += 1
+            @device = nil
+            retry
+          else
+            raise
+          end
+        end
+      end
     end
   end
 end

data/lib/seriamp/yamaha/cmd.rb

@@ -6,6 +6,7 @@ require 'pp'
 require 'seriamp/utils'
 require 'seriamp/detect'
 require 'seriamp/yamaha/client'
+require 'seriamp/yamaha/executor'
 
 module Seriamp
   module Yamaha
@@ -61,100 +62,18 @@ module Seriamp
             STDERR.puts("Yamaha receiver not found")
             exit 3
           end
-        when 'power'
-          which = args.shift&.downcase
-          if %w(main zone2 zone3).include?(which)
-            method = "set_#{which}_power"
-            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 = args.shift
-          if %w(main zone2 zone3).include?(which)
-            value = args.shift
-          else
-            value = which
-            which = 'main'
-          end
-          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
-            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
-            client.public_send(method, value)
-          end
-        when 'input'
-          which = args.shift&.downcase
-          if %w(main zone2 zone3).include?(which)
-            input = args.shift
-          else
-            input = which
-            which = 'main'
-          end
-          if input.nil?
-            puts client.public_send("last_#{which}_input_name")
-            return
-          end
-          client.public_send("set_#{which}_input", input)
-        when 'program'
-          value = args.shift.downcase
-          client.set_program(value)
-        when 'pure-direct'
-          state = Utils.parse_on_off(args.shift)
-          client.set_pure_direct(state)
-        when 'status'
-          pp client.last_status
-        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|
-            [true, false].each do |zone2_state|
-              [true, false].each do |zone3_state|
-                client.set_main_power(main_state)
-                client.set_zone2_power(zone2_state)
-                client.set_zone3_power(zone3_state)
-                puts "#{main_state ?1:0} #{zone2_state ?1:0} #{zone3_state ?1:0} #{client.status[:power]}"
-              end
-            end
-          end
         else
-          raise ArgumentError, "Unknown command: #{cmd}"
+          executor.run_command(cmd, *args)
         end
       end
 
       private
 
       attr_reader :client
+
+      def executor
+        @executor ||= Executor.new(client)
+      end
     end
   end
 end

data/lib/seriamp/yamaha/executor.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module Seriamp
+  module Yamaha
+    class Executor
+      def initialize(client)
+        @client = client
+      end
+
+      attr_reader :client
+
+      def run_command(cmd, *args)
+        case cmd
+        when 'detect'
+          device = Seriamp.detect_device(Yamaha, *args, logger: logger)
+          if device
+            puts device
+            exit 0
+          else
+            STDERR.puts("Yamaha receiver not found")
+            exit 3
+          end
+        when 'power'
+          which = args.shift&.downcase
+          if %w(main zone2 zone3).include?(which)
+            method = "set_#{which}_power"
+            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 = args.shift
+          if %w(main zone2 zone3).include?(which)
+            value = args.shift
+          else
+            value = which
+            which = 'main'
+          end
+          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
+            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
+            client.public_send(method, value)
+          end
+        when 'input'
+          which = args.shift&.downcase
+          if %w(main zone2 zone3).include?(which)
+            input = args.shift
+          else
+            input = which
+            which = 'main'
+          end
+          if input.nil?
+            puts client.public_send("last_#{which}_input_name")
+            return
+          end
+          client.public_send("set_#{which}_input", input)
+        when 'program'
+          value = args.shift.downcase
+          client.set_program(value)
+        when 'pure-direct'
+          state = Utils.parse_on_off(args.shift)
+          client.set_pure_direct(state)
+        when 'center-speaker-layout'
+          client.set_center_speaker_layout(args.shift)
+        when 'surround-speaker-layout'
+          client.set_surround_speaker_layout(args.shift)
+        when 'surround-back-speaker-layout'
+          client.set_surround_back_speaker_layout(args.shift)
+        when 'front-speaker-layout'
+          client.set_front_speaker_layout(args.shift)
+        when 'presence-speaker-layout'
+          client.set_presence_speaker_layout(args.shift)
+        when 'bass-out'
+          client.set_bass_out(args.shift)
+        when 'subwoofer-phase'
+          client.set_subwoofer_phase(args.shift)
+        when 'subwoofer-crossover'
+          client.set_subwoofer_crossover(Integer(args.shift))
+        when 'status'
+          pp client.last_status
+        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|
+            [true, false].each do |zone2_state|
+              [true, false].each do |zone3_state|
+                client.set_main_power(main_state)
+                client.set_zone2_power(zone2_state)
+                client.set_zone3_power(zone3_state)
+                puts "#{main_state ?1:0} #{zone2_state ?1:0} #{zone3_state ?1:0} #{client.status[:power]}"
+              end
+            end
+          end
+        else
+          raise ArgumentError, "Unknown command: #{cmd}"
+        end
+      end
+    end
+  end
+end

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

@@ -177,6 +177,55 @@ module Seriamp
           '43' => 'Enhancer 7ch High',
           '80' => 'Straight',
         }.freeze
+
+        CENTER_SPEAKER_LAYOUTS = {
+          'large' => '00',
+          'small' => '01',
+          'none' => '02',
+        }.freeze
+
+        FRONT_SPEAKER_LAYOUTS = {
+          'large' => '00',
+          'small' => '01',
+        }.freeze
+
+        SURROUND_SPEAKER_LAYOUTS = CENTER_SPEAKER_LAYOUTS
+
+        SURROUND_BACK_SPEAKER_LAYOUTS = {
+          'large_x2' => '00',
+          'large_x1' => '01',
+          'small_x2' => '02',
+          'small_x1' => '03',
+          'none' => '04',
+        }.freeze
+
+        PRESENCE_SPEAKER_LAYOUTS = {
+          'yes' => '00',
+          'none' => '01',
+        }.freeze
+
+        BASS_OUTS = {
+          'subwoofer' => '00',
+          'front' => '01',
+          'both' => '02',
+        }.freeze
+
+        SUBWOOFER_PHASES = {
+          'normal' => '00',
+          'reverse' => '10',
+        }.freeze
+
+        SUBWOOFER_CROSSOVERS = {
+          40 => '00',
+          60 => '01',
+          80 => '02',
+          90 => '03',
+          100 => '04',
+          110 => '05',
+          120 => '06',
+          160 => '07',
+          200 => '08',
+        }.freeze
       end
     end
   end

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

@@ -139,6 +139,70 @@ module Seriamp
           source_code = ZONE3_INPUTS_SET.fetch(source.downcase.gsub(/[^a-z]/, '_'))
           remote_command("7A#{source_code}")
         end
+
+        def set_center_speaker_layout(layout)
+          value = CENTER_SPEAKER_LAYOUTS[layout.to_s]
+          unless value
+            raise ArgumentError, "Invalid center speaker layout: #{layout}; valid layouts: #{CENTER_SPEAKER_LAYOUTS.keys.join(', ')}"
+          end
+          system_command("70#{value}")
+        end
+
+        def set_front_speaker_layout(layout)
+          value = FRONT_SPEAKER_LAYOUTS[layout.to_s]
+          unless value
+            raise ArgumentError, "Invalid front speaker layout: #{layout}; valid layouts: #{FRONT_SPEAKER_LAYOUTS.keys.join(', ')}"
+          end
+          system_command("71#{value}")
+        end
+
+        def set_surround_speaker_layout(layout)
+          value = SURROUND_SPEAKER_LAYOUTS[layout.to_s]
+          unless value
+            raise ArgumentError, "Invalid surround speaker layout: #{layout}; valid layouts: #{SURROUND_SPEAKER_LAYOUTS.keys.join(', ')}"
+          end
+          system_command("72#{value}")
+        end
+
+        def set_surround_back_speaker_layout(layout)
+          value = SURROUND_BACK_SPEAKER_LAYOUTS[layout.to_s]
+          unless value
+            raise ArgumentError, "Invalid surround back speaker layout: #{layout}; valid layouts: #{SURROUND_BACK_SPEAKER_LAYOUTS.keys.join(', ')}"
+          end
+          system_command("73#{value}")
+        end
+
+        def set_presence_speaker_layout(layout)
+          value = PRESENCE_SPEAKER_LAYOUTS[layout.to_s]
+          unless value
+            raise ArgumentError, "Invalid presence speaker layout: #{layout}; valid layouts: #{PRESENCE_SPEAKER_LAYOUTS.keys.join(', ')}"
+          end
+          system_command("74#{value}")
+        end
+
+        def set_bass_out(v)
+          value = BASS_OUTS[v.to_s]
+          unless value
+            raise ArgumentError, "Invalid bass out value: #{v}; valid values: #{BASS_OUTS.keys.join(', ')}"
+          end
+          system_command("75#{value}")
+        end
+
+        def set_subwoofer_phase(v)
+          value = SUBWOOFER_PHASES[v.to_s]
+          unless value
+            raise ArgumentError, "Invalid subwoofer phase value: #{v}; valid values: #{SUBWOOFER_PHASES.keys.join(', ')}"
+          end
+          system_command("76#{value}")
+        end
+
+        def set_subwoofer_crossover(v)
+          value = SUBWOOFER_CROSSOVERS[v]
+          unless value
+            raise ArgumentError, "Invalid subwoofer crossover frequency: #{v}; valid freuencies: #{SUBWOOFER_CROSSOVERS.keys.join(', ')}"
+          end
+          system_command("7E#{value}")
+        end
       end
     end
   end

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.6'
+  spec.version       = '0.1.9'
   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.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-11 00:00:00.000000000 Z
+date: 2023-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
@@ -58,6 +58,7 @@ files:
 - lib/seriamp/yamaha/app.rb
 - lib/seriamp/yamaha/client.rb
 - lib/seriamp/yamaha/cmd.rb
+- lib/seriamp/yamaha/executor.rb
 - lib/seriamp/yamaha/protocol/constants.rb
 - lib/seriamp/yamaha/protocol/methods.rb
 - seriamp.gemspec