onkyo_eiscp_ruby 0.0.3 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be075bcd7a1830e7614b8384d610ea59d0b7160f
-  data.tar.gz: 40cea299c77c937a786f387cfbf4c11e8696632c
+SHA256:
+  metadata.gz: 8e9c2fd0e9e79716c2b0a084a6dd7859597732f86fb71c1f4bcd4462c8e9297b
+  data.tar.gz: df71853616b26d2f62f6490b99f263d2a5bb2590c4de4bc7b1930fab14604ea5
 SHA512:
-  metadata.gz: 5066d43a66350cb39e84ddbae87038d4ba04057f2dd884eee1852c3dd108ed4a44842878157dfb854e7802d3e771cbe5789a70af936af0e338a36264e92332d6
-  data.tar.gz: 6c2c8bb4ba7d3b7e9fee332d448a054cf97480194192252965b363b7efaa8d8b095ae76d2f68ab6f064fbf68ec2bac75c63b2ba53a26e891b055c0751f776cc4
+  metadata.gz: 5377a5163b1219647c708b0d125b1359108d3ebbd91bd4f2c8916a002aa4b83363d2531e0340deddc77a2251e2701cd26cb4fe9ab3b4a4c551a496ed2c20d6b0
+  data.tar.gz: fabc67566fb94c98b743c1db76173f86e3de03333ccad16dda9e5dbeb09747a2bad4ec62867593de404633065819644f0574e22c2c492e209d6f0bf17a609482

data/README.md

@@ -1,21 +1,42 @@
 onkyo_eiscp_ruby
 ================
 [![Gem Version](https://badge.fury.io/rb/onkyo_eiscp_ruby.png)](http://badge.fury.io/rb/onkyo_eiscp_ruby)
+[![GitHub version](https://badge.fury.io/gh/mikerodrigues%2Fonkyo_eiscp_ruby.png)](http://badge.fury.io/gh/mikerodrigues%2Fonkyo_eiscp_ruby)
 
-A Ruby implementation of eISCP for controlling Onkyo receivers.
+*A Ruby implementation of eISCP for controlling Onkyo receivers.*
+
+**This code is not really still under development and using it might still make you sick.**
+
+**The python version linked below sees much more activity.**
+
+Automatically discover receivers in the broadcast domain
+
+Send commands to receivers and parse returned messages
+
+Open a TCP socket to receive solicited and non-solicited status updates.
 
-**This code is still under heavy development and using it might make you sick.**
-Create ISCP messages and eISCP packets
-Automatically discover receiver's in the broadcast domain
-Send/Recieve eISCP messages
-Open a TCP socket to send commands and receive solicited and non-solicited status updates.
 Mock reciever (currently only responds to discovery)
 
+Human-readable commands
+
 **Inspired by https://github.com/miracle2k/onkyo-eiscp
 
 **Protocol information from http://michael.elsdoerfer.name/onkyo/ISCP-V1.21_2011.xls
 
+What's missing?
+---------------
+* Command validation
+
+* Parsing of all human readable commands (run the tests to see some commands that aren't parsable in human readable form yet.
 
+* Reasonable variants for human-readable commands (ex. `main-volume` or`volume
+` as opposed to `master-volume`)
+
+* Model compatability checking
+
+* Logging
+
+* Exhaustive testing and documentation
 
 Using the Library
 -----------------
@@ -23,53 +44,182 @@ Using the Library
 
 		require 'eiscp'
 
-* Discover local receivers
-
+* You might want to `include EISCP` if you know you won't pollute your namespace
+  with Constants under `EISCP` (`Dictionary`, `Message`, `Parser`, `Receiver`,
+  `VERSION`)
+
+* You can do most everything through the `Receiver` and `Message` objects. If you
+  want to accept user input you will probably want to use the Parser module. Be
+  sure to check out the RDocs or dig through the source code. I try to keep it
+  well commented/documented, and there's more functionality to the library than
+  is shown here:
+
+* The `Message` object is pretty self explanatory. `Message.new` is mostly used
+  internally, but you're better off using `Parser.parse` to create them. You
+  probably will want to interact with `Message` objects to get information:
+
+```ruby		
+		msg = EISCP::Message.new(command: 'PWR', value: '01')
+		msg.zone                => 'main'
+		msg.command             => "PWR"
+		msg.value               => "01"
+		msg.command_name        => "system-power"
+		msg.command_description => "System Power Command"
+		msg.value_name          => "on"
+		msg.value_description   => "sets System On"
+```
+
+* Discover local receivers (returns an `Array` of `Receiver` objects)
+
+```ruby		
 		EISCP::Receiver.discover
+```
 
-* Create Receiver object from first discovered
+* Create `Receiver` object from first discovered Receiver on the LAN
 
-		Receiver.new
+```ruby		
+		receiver = EISCP::Receiver.new
+```
 
-* Open a TCP connection to monitor solicited updates
+* Or create one manually by IP address or hostname
 
-		receiver = Receiver.new('10.0.0.1')
-		receiver.connect
+```ruby		
+		receiver = EISCP::Receiver.new('10.0.0.132')
+```
 
-* You can also pass a block and operate on received packet strings:
+* When you create a `Receiver` object with a callback block it will
+  connect and call your block on each message received.:
 
-		receiver.connect do |data|
-		  puts EISCP::Receiver.parse(data).iscp_message
+```ruby
+		receiver = EISCP::Receiver.new do |msg|
+		  puts msg.command
+		  puts msg.value
 		end
+```
 
-* Turn on the receiver
+* Receivers created without a block will not connect automatically. You can use
+  the `connect` method to create a socket and connect to the receiver.
 
-		message = EISCP::Message.parse("PWR", "01")
-		message.send(message.to_eiscp)
+```ruby
+		receiver.connect
+```
 
-* New 'parse' method makes creating EISCP objects more flexible.
-This parses messages from command line or raw eiscp data from the socket
-        
-		iscp_message = EISCP::Message.parse "PWR01"
-		iscp_message = EISCP::Message.parse "PWR 01"
-		iscp_message = EISCP::Message.parse "!1PWR01"
-		iscp_message = EISCP::Message.parse "!1PWR 01"
+* You can also set or change the callback block later. This will kill the 
+  existing callback thread, recreate the socket if necessary and start
+  a new callback thread using the provided block:
 
-* Parsing raw socket data
+```ruby		
+		receiver.connect do |msg|
+		  puts "Received: #{msg.command_name}:#{msg.value_name}"
+		end
+```
+
+* You can also disconnect, which will close the socket and kill the connection
+  thread:
+
+```ruby
+		receiver.disconnect
+```
+
+* Get information about the Receiver:
+	
+```ruby		
+		receiver.model => "TX-NR609"
+		receiver.host  => "10.0.0.111"
+		receiver.port  => 60128
+		receiver.mac_address => "001122334455"
+		receiver.area => "DX"
+```
+
+* Receivers now have a `@state` hash that contains a mapping of commands and
+  values received. You can use this see the Receiver's last known state without
+  querying. Use the `#update_state` method to run every 'QSTN' command in the
+  Dictionary and update the state hash, but do note that it will take a few
+  seconds to finish:
+
+```ruby
+		receiver.update_state
+		receiver.state["MVL"] => "22"
+		receiver.human_readable_state["master-volume"] => 34
+```
+		
+
+* You can use `CommandMethods` to easily send a message and return the reply as
+  a Message object. Once `Receiver#connect`is called, a method is defined for each command listed in the
+  `Dictionary` using the `@command_name` attribute which is 'human readable'.
+  You can check the included yaml file or look at the output of 
+  `EISCP::Dictionary.commands`. Here a few examples:
+		
+```ruby		
+		# Turn on receiver
+		receiver.system_power "on"
+
+		# Query current input source
+		receiver.input_selector "query"
+		
+		# Turn the master volume up one level
+		receiver.master_volume "level-up"
+
+		# Set the master volume to 45
+		receiver.master_volume "45"
+```
+
+* Parse ISCP and human readable strings:
+
+```ruby     		
+		# Parse various ISCP strings 
+		iscp_message = EISCP::Parser.parse "PWR01"
+		iscp_message = EISCP::Parser.parse "PWR 01"
+		iscp_message = EISCP::Parser.parse "!1PWR01"
+		iscp_message = EISCP::Parser.parse "!1PWR 01"
+
+		# Parse human readable,
+		EISCP::Parser.parse("main-volume 34")
+```
+
+* `Parser.parse` is also used internally by `Receiver` to parse raw eISCP socket
+  data.
 
-		iscp_message_from_raw_eiscp = EISCP::Message.parse iscp_message.to_eiscp
 
 Using the Binaries
 ------------------
 
 * Discover local receivers
 
-		$ onkyo.rb -d
+	`$ onkyo.rb -d`
+		
+* Send a human-readable command
+
+	`$ onkyo.rb system-power on  # uses Parser.parse`
+
+* Or send a raw command
 
-* Connect to the first discovered receiver to see status updates
+	`$ onkyo.rb PWRQSTN   # Also tries to use Parser.parse`
 
-		$ onkyo.rb -c
+* Monitor the first discovered receiver to see status updates
+
+	`$ onkyo.rb -m`
 
 * Start the mock server (only responds to 'ECNQSTN')
 
-		$ onkyo-server.rb
+	`$ onkyo-server.rb`
+
+* Turn off the first receiver discovered:
+
+	`$ onkyo.rb system-power off`
+
+* List all known commands and values:
+
+	`$ onkyo.rb -L`
+
+* List all known commands known to work with discovered models:
+
+	`$ onkyo.rb -l`
+
+Contributing
+------------
+
+* Open an issue describing bug or feature
+* Fork repo
+* Create a branch
+* Send pull request

data/VERSION

@@ -1 +1 @@
-0.0.3
+2.1.2

data/bin/mock_receiver.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'socket'
+require_relative './receiver'
+require_relative './message'
+
+# Mock server that only responds to ECNQSTN.
+
+module EISCP
+  # This class acts as an Onkyo Stereo. It can be used for testing
+  #
+  class MockReceiver
+    DISCOVERY_IP = '255.255.255.255'
+    ONKYO_DISCOVERY_RESPONSE = Message.new('ECN', "TX-NR609/60128/DX/14DAE9E967C8\x19\r\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
+
+    # Create/start the server object.
+
+    def initialize
+      Socket.udp_server_loop(DISCOVERY_IP, Receiver::ONKYO_PORT) do |msg, src|
+        src.reply "ISCP\x00\x00\x00\x10\x00\x00\x00&\x01\x00\x00\x00!1ECNTX-NR609/60128/DX/14DAE9E967C8\x19\r\n\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        puts msg
+      end
+    end
+  end
+end

data/bin/onkyo.rb

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'eiscp'
 require 'optparse'
 require 'ostruct'
+
+# This object parses ARGV and returns an @option hash
+#
 class Options
-  DEFAULT_OPTIONS = { verbose: true, all: false }
+  DEFAULT_OPTIONS = { verbose: true, all: false }.freeze
   USAGE = ' Usage: onkyo_rb [options]'
 
   def self.parse(args)
     @options = OpenStruct.new
 
     options = OptionParser.new do |opts|
-
       opts.banner = USAGE
 
       opts.on '-d', '--discover', 'Find Onkyo Receivers on the local broadcast domain' do |d|
@@ -34,53 +37,110 @@ class Options
         @options.list_all = l
       end
 
-      opts.on '-c', '--connect', 'Connect to the first discovered reciever and show updates' do |c|
-        @options.connect = c
+      opts.on '-m', '--monitor', 'Connect to the first discovered reciever and monitor updates' do |m|
+        @options.monitor = m
       end
-
     end
 
     options.parse!(args)
 
-    if @options == nil && ARGV == []
-      puts options
-    end
+    puts options if @options.nil? && ARGV == []
 
     if @options.discover
-      EISCP::Receiver.discover.each do |receiver|
-        puts  EISCP::Message.parse(receiver[0]).to_iscp
-      end
+      EISCP::Receiver.discover.each { |rec| puts "#{rec.host}:#{rec.port} - #{rec.model} - #{rec.mac_address}" }
       exit 0
     end
 
     if @options.help
       puts options
-      exit 0 
+      exit 0
+    end
+
+    if @options.monitor
+      begin
+        rec = EISCP::Receiver.new do |reply|
+          puts "#{Time.now} #{rec.host} "\
+               "#{reply.zone}: "\
+               "#{reply.command_description || reply.command} "\
+               "-> #{reply.value_description || reply.value}"
+        end
+        rec.thread.join
+      rescue Interrupt
+        raise 'Exiting...'
+      rescue Exception => e
+        puts 'bummer...'
+        puts e
+      end
     end
 
-    if @options.connect
-      eiscp = EISCP::Receiver.new(EISCP::Receiver.discover[0][1])
-      eiscp.connect do |data|
-        puts msg = EISCP::Receiver.parse(data).to_iscp
+    if @options.list
+      models =  []
+      modelsets = []
+      EISCP::Receiver.discover.each do |rec|
+        models << rec.model
+      end
+      models.each do |model|
+        EISCP::Dictionary.modelsets.each do |modelset, list|
+          modelsets << modelset unless list.select { |x| x.match model }.empty?
+        end
+      end
+      EISCP::Dictionary.zones.each do |zone|
+        EISCP::Dictionary.commands[zone].each do |command, command_hash|
+          puts 'Command - Description'
+          puts "\n"
+          puts "  '#{Dictionary.command_to_name(command)}' - "\
+            "#{Dictionary.description_from_command(command)}"
+          puts "\n"
+          puts '    Value - Description>'
+          puts "\n"
+          command_hash[:values].each do |_value, attr_hash|
+            if modelsets.include? attr_hash[:models]
+              puts "      '#{EISCP::Dictionary.command_value_to_value_name(command, _value)}' - "\
+                " #{attr_hash[:description]}"
+            end
+          end
+          puts "\n"
+        end
       end
     end
 
+    if @options.list_all
+      EISCP::Dictionary.zones.each do |zone|
+        EISCP::Dictionary.commands[zone].each do |command, command_hash|
+          puts 'Command - Description'
+          puts "\n"
+          puts "  '#{Dictionary.command_to_name(command)}' - "\
+            "#{Dictionary.description_from_command(command)}"
+          puts "\n"
+          puts '    Value - Description>'
+          puts "\n"
+          command_hash[:values].each do |_value, attr_hash|
+          puts "      '#{EISCP::Dictionary.command_value_to_value_name(command, _value)}' - "\
+              " #{attr_hash[:description]}"
+          end
+          puts "\n"
+        end
+      end
+      exit 0
+    end
+
     if ARGV == []
       puts options
       exit 0
     end
   end
-
 end
 
+include EISCP
 
 @options = Options.parse(ARGV)
 
-
-receiver = EISCP::Receiver.new(EISCP::Receiver.discover[0][1])
-message = (EISCP::Message.parse(ARGV.join(" ")).to_eiscp)
-puts receiver.send_recv message
-
-
-
-
+receiver = EISCP::Receiver.discover[0]
+receiver.connect
+begin
+  command = EISCP::Parser.parse(ARGV.join(' '))
+rescue StandardError
+  raise "Couldn't parse command"
+end
+reply = receiver.send_recv(command)
+puts "#{Time.now}: Response from #{receiver.host}: #{reply.zone.capitalize}   #{reply.command_description || reply.command} -> #{reply.value_description || reply.value}"