seriamp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d3d9290f5631bdd707dd435ef0f0e7abe7da345017bc92764cacb78f6e485e
-  data.tar.gz: 629ef868b42d3e0d50bf27fbc6a15fbfe036fdee9a4028aa03aae671a7c5e737
+  metadata.gz: 630564090e5fbf436a4384d2aff86c3f51d8dcd60e69e82121730107dcb82deb
+  data.tar.gz: 4dfffa50df36bf315fb476d472d9de125e01c670c823e1c881b66189e5a5351b
 SHA512:
-  metadata.gz: 0f799dc584037d91ed46ab8abffa4c0ab2dfd9d8db131d2195b5fbd9b2222702e54002f5eb3a97c40fcb1dbe3902639f0cda195a6407d6a6a04db9e3542a2f49
-  data.tar.gz: a65df97c56a0d665f1636dafdbf323a75a4624d5669662cd5ad60b0d20780c5f30aa3bb7a261892db228c33da0f19c094d9c70727191f0a24c4e8e46b022675e
+  metadata.gz: 2abd880200ab09af611fe31b31ca8299d189cf05f1448cc59773972f6c4e8929c120fdc533f2b7c246cde8a3621fbeeb6d562ef18f233b8b1ae63536708c2678
+  data.tar.gz: f110bb9840aac1b485c8e12f42b34cbb0d4a578d9f6e3852591480b59f450715d08da33b166e3eb4381152139aef3e0b8e09a9fd2a65be31a41183cfd7b4fa70

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.4'
 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

@@ -112,8 +112,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/seriamp.gemspec

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