sonamp 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b63474ec681132cd0674f5f2772e59494a585188e20b241af83fe865461adcd
-  data.tar.gz: 0d066e5ef22315e64ae704ddba85735fa996c8c6e7f818ed9f41e38b645a1aaa
+  metadata.gz: 816d27d5e7d9e1e5c1ab289d18dce3fdddb18a8fa15bb19ca51f776adfe0fdd0
+  data.tar.gz: faffd6868c0c625f8a7ae839cbc00a53f9d1d8d75124c00691c035f18c1af8e5
 SHA512:
-  metadata.gz: 3903c43f129e3a48f74e4a610f9cf3fd5b2e38d176508126c201370e6f171cbe929185f8bd6cc179bdff8d5188334aa157273127fa06df7fb50558ade4fa4a22
-  data.tar.gz: b8d88a7775bca97209ebdda191939ee4b4e1bc0de2f3a5629665051506e2f083a3c3fa0ec4a9a734da113969166de9e65b5f7ccef44721ee04285c5edd44eb22
+  metadata.gz: 1335f8bf639400ad932b0672919160b4754c41dbd46dbcd7107145d8147a648b4f29705a3eff322ffb39c21d5c13229e6f622c2885c5a792ad9aba8420566bfe
+  data.tar.gz: 8cbf78ea9632fdefa9d50270890396c3722bbb94654f003fad5746c4e341456f4c66c4cd6d4f5fd7202c1f59dd951afef96aa201079388d8ae818d457c7de63e

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2022 Oleg Pudeyev
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/bin/sonamp

@@ -1,49 +1,10 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'sonamp'
+  require 'sonamp/cmd'
 rescue LoadError
   $: << File.join(File.dirname(__FILE__), '../lib')
-  require 'sonamp'
+  require 'sonamp/cmd'
 end
-require 'optparse'
-require 'logger'
-require 'sonamp/utils'
 
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: sonamp [-d device] command arg..."
-
-  opts.on("-d", "--device DEVICE", "TTY to use (default autodetect)") do |v|
-    options[:device] = v
-  end
-end.parse!
-
-logger = Logger.new(STDERR)
-client = Sonamp::Client.new(options[:device], logger: logger)
-
-cmd = ARGV.shift
-unless cmd
-  raise ArgumentError, "No command given"
-end
-
-include Sonamp::Utils
-
-case cmd
-when 'power'
-  zone = ARGV.shift.to_i
-  state = parse_on_off(ARGV.shift)
-  client.set_zone_power(zone, state)
-when 'zvol'
-  zone = ARGV.shift.to_i
-  volume = ARGV.shift.to_i
-  client.set_zone_volume(zone, volume)
-when 'cvol'
-  channel = ARGV.shift.to_i
-  volume = ARGV.shift.to_i
-  client.set_channel_volume(channel, volume)
-when 'status'
-  client.status
-else
-  raise ArgumentError, "Unknown command: #{cmd}"
-end
+Sonamp::Cmd.new(ARGV).run

data/lib/sonamp/client.rb

@@ -43,11 +43,10 @@ module Sonamp
         if zone < 1 || zone > 4
           raise ArgumentError, "Zone must be between 1 and 4: #{zone}"
         end
-        resp = dispatch(":V#{zone}?")
-        resp[2...].to_i
+        Integer(dispatch_extract_suffix(":V#{zone}?", 'V'))
       else
         dispatch(":VG?", 4).map do |resp|
-          resp[2...].to_i
+          Integer(extract_suffix(resp, 'V'))
         end
       end
     end
@@ -64,6 +63,10 @@ module Sonamp
       dispatch_assert(cmd, expected)
     end
 
+    def get_channel_volume(channel = nil)
+      get_channel_value('VC', channel)
+    end
+
     def set_channel_volume(channel, volume)
       if channel < 1 || channel > 8
         raise ArgumentError, "Channel must be between 1 and 4: #{channel}"
@@ -80,6 +83,18 @@ module Sonamp
       get_zone_state('M', zone)
     end
 
+    def get_channel_mute(channel = nil)
+      get_channel_value('MC', channel)
+    end
+
+    def get_channel_front_panel_level(channel = nil)
+      get_channel_value('TVL', channel)
+    end
+
+    def get_zone_fault(zone = nil)
+      get_zone_state('FP', zone)
+    end
+
     def get_bbe(zone = nil)
       get_zone_state('BP', zone)
     end
@@ -100,26 +115,35 @@ module Sonamp
       get_zone_state('VTI', zone)
     end
 
+    def get_firmware_version
+      global_query('VER')
+    end
+
+    def get_temperature
+      Integer(global_query('TP'))
+    end
+
     def status
       # Reusing the opened device file makes :VTIG? fail even with a delay
       # in front.
       #open_device do
-        p dispatch(':VER?')
-        p dispatch(':TP?')
-        p get_power
-        p dispatch(':FPG?', 4)
-        p get_zone_volume
-        p dispatch(':VCG?', 8)
-        p get_auto_trigger_input
-        sleep 0.1
-        p get_voltage_trigger_input
-        p dispatch(':TVLG?', 8)
-        p get_zone_mute
-        p dispatch(':MCG?', 8)
-        p get_bbe
-        p get_bbe_high_boost
-        p get_bbe_low_boost
       #end
+      {
+        firmware_version: get_firmware_version,
+        temperature: get_temperature,
+        zone_power: get_zone_power,
+        zone_fault: get_zone_fault,
+        zone_volume: get_zone_volume,
+        channel_volume: get_channel_volume,
+        zone_mute: get_zone_mute,
+        channel_mute: get_channel_mute,
+        bbe: get_bbe,
+        bbe_high_boost: get_bbe_high_boost,
+        bbe_low_boost: get_bbe_low_boost,
+        auto_trigger_input: get_auto_trigger_input,
+        voltage_trigger_input: get_voltage_trigger_input,
+        channel_front_panel_level: get_channel_front_panel_level,
+      }
     end
 
     private
@@ -158,6 +182,22 @@ module Sonamp
       end
     end
 
+    def extract_suffix(resp, expected_prefix)
+      unless resp[0..expected_prefix.length-1] == expected_prefix
+        raise "Unexpected response: expected #{expected_prefix}..., actual #{resp}"
+      end
+      resp[expected_prefix.length..]
+    end
+
+    def dispatch_extract_suffix(cmd, expected_prefix)
+      resp = dispatch(cmd)
+      extract_suffix(resp, expected_prefix)
+    end
+
+    def global_query(cmd)
+      dispatch_extract_suffix(":#{cmd}?", cmd)
+    end
+
     def read_line(f, cmd)
       f.readline.strip.tap do |resp|
         if resp == 'ERR'
@@ -181,5 +221,21 @@ module Sonamp
         end
       end
     end
+
+    def get_channel_value(cmd_prefix, channel)
+      if channel
+        if channel < 1 || channel > 8
+          raise ArgumentError, "Channel must be between 1 and 8: #{channel}"
+        end
+        Integer(dispatch_extract_suffix(":#{cmd_prefix}#{channel}?", "#{cmd_prefix}#{channel}"))
+      else
+        index = 1
+        dispatch(":#{cmd_prefix}G?", 8).map do |resp|
+          Integer(extract_suffix(resp, "#{cmd_prefix}#{index}")).tap do
+            index += 1
+          end
+        end
+      end
+    end
   end
 end

data/lib/sonamp/cmd.rb

@@ -0,0 +1,63 @@
+require 'optparse'
+require 'logger'
+require 'sonamp/utils'
+require 'sonamp/client'
+
+module Sonamp
+  class Cmd
+    def initialize(args)
+      options = {}
+      OptionParser.new do |opts|
+        opts.banner = "Usage: sonamp [-d device] command arg..."
+
+        opts.on("-d", "--device DEVICE", "TTY to use (default autodetect)") do |v|
+          options[:device] = v
+        end
+      end.parse!(args)
+
+      @options = options
+
+      @logger = Logger.new(STDERR)
+      @client = Sonamp::Client.new(options[:device], logger: @logger)
+
+      @args = args
+    end
+
+    attr_reader :args
+
+    def run
+      cmd = args.shift
+      unless cmd
+        raise ArgumentError, "No command given"
+      end
+
+      case cmd
+      when 'off'
+        client.set_zone_power(1, false)
+        client.set_zone_power(2, false)
+        client.set_zone_power(3, false)
+        client.set_zone_power(4, false)
+      when 'power'
+        zone = args.shift.to_i
+        state = Utils.parse_on_off(ARGV.shift)
+        client.set_zone_power(zone, state)
+      when 'zvol'
+        zone = args.shift.to_i
+        volume = ARGV.shift.to_i
+        client.set_zone_volume(zone, volume)
+      when 'cvol'
+        channel = args.shift.to_i
+        volume = args.shift.to_i
+        client.set_channel_volume(channel, volume)
+      when 'status'
+        pp client.status
+      else
+        raise ArgumentError, "Unknown command: #{cmd}"
+      end
+    end
+
+    private
+
+    attr_reader :client
+  end
+end

data/lib/sonamp/version.rb

@@ -1,3 +1,3 @@
 module Sonamp
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

data/sonamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sonamp"
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.authors       = ['Oleg Pudeyev']
   spec.email         = ['code@olegp.name']
   spec.summary       = %q{Sonance Sonamp Amplifier Serial Control Interface}
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/p/sonamp-ruby"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z [A-Z]* bin lib *.gemspec`.split("\x0")
   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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonamp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies: []
 description: Library for controlling Sonance Sonamp 875D & 875D MkII amplifiers via
   the serial port
@@ -20,12 +20,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- LICENSE
 - bin/sonamp
 - bin/sonamp-web
 - lib/sonamp.rb
 - lib/sonamp/app.rb
 - lib/sonamp/client.rb
+- lib/sonamp/cmd.rb
 - lib/sonamp/utils.rb
 - lib/sonamp/version.rb
 - sonamp.gemspec

data/.gitignore

@@ -1 +0,0 @@
-*.gem