waterfurnace_aurora 0.3.5 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85309a61ae279d3255db42a0ff3d53a038c1fdcb3c7e02e3febf6b533992a2c3
-  data.tar.gz: be76ef3d6821fbd8535192fd4a55f770234f1736fb280a7a3736fa6c134a1085
+  metadata.gz: 6920a48439c274a9c5f7cec06ebeabf6c97a91018f107d090ce8be793f307f99
+  data.tar.gz: 4a7e518fcca1ec7c52d7bd1bee6d294a59b31e9f0d759270a1a2bcd2f8c75270
 SHA512:
-  metadata.gz: a45f409c8573e02e7b761c6363abfea445f6e86fe58fab96b5e2ed427564ba791ff83c8817c74d2ff90028eae0c35fb4f090c0a28d3e9c6931aab45e2658c580
-  data.tar.gz: b5d793acc1dbca113c11205198b6ad6623b29543b5c5cc095ab8f4ddf0d5d9fbcf98fc5ca586e534d516027bc446bec2ee164fd3bb7f36ba6309b63517b13524
+  metadata.gz: 504b790c101f15dc79f5985b3fdcab529f746d912aaef0865c59404240f95908ca72a70aa262af4917b7409ac9d5366f24167eddc33ba8ba5786d0213f7b3776
+  data.tar.gz: def8a5362616f511f514a0f3e3008302dfa0fa71d9e7ac4bd0d937cd76083ec6118cc8240e100bf5099cd610926dc912c8d4eaf50b4f7cb5149fcd5cdbbc88a8

data/exe/aurora_fetch

@@ -3,24 +3,51 @@
 
 require "aurora"
 require "ccutrer-serialport"
+require "logger"
+require "optparse"
 require "uri"
 
+debug_modbus = false
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: aurora_fetch /path/to/serial/port REGISTERS [options]"
+
+  opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
+  opts.on("-h", "--help", "Prints this help") do
+    puts opts
+    exit
+  end
+end
+
+opts.parse!
+
+unless ARGV.length == 2
+  puts opts
+  exit 1
+end
+
 uri = URI.parse(ARGV[0])
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
 
 client = ModBus::RTUClient.new(*args)
-client.logger = Logger.new($stdout, :debug)
-slave = client.with_slave(1)
+client.logger = Logger.new($stdout)
+client.logger.level = debug_modbus ? :debug : :warn
 
-registers = slave.holding_registers[ARGV[1].to_i]
+slave = client.with_slave(1)
+abc = Aurora::ABCClient.new(slave)
+registers = abc.query_registers(ARGV[1])
 
-puts registers.inspect
+puts Aurora.print_registers(registers)

data/exe/aurora_mock

@@ -8,12 +8,16 @@ require "yaml"
 
 uri = URI.parse(ARGV[0])
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end

data/exe/aurora_monitor

@@ -36,12 +36,16 @@ last_registers = {}
 SENSOR_REGISTERS = [16, 19, 20, 740, 900, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1147, 1149, 1151,
                     1153, 1165].freeze
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
@@ -49,7 +53,7 @@ args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
 server = ModBus::RTUServer.new(*args)
 server.promiscuous = true
 server.logger = Logger.new($stdout)
-server.logger.level = :debug if debug_modbus
+server.logger.level = debug_modbus ? :debug : :warn
 
 diff_and_print = lambda do |registers|
   registers = registers.slice(*(registers.keys - SENSOR_REGISTERS)) if ignore_sensors

data/exe/aurora_mqtt_bridge

@@ -10,12 +10,16 @@ require "aurora/core_ext/string"
 uri = URI.parse(ARGV[0])
 mqtt_uri = ARGV[1]
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
@@ -33,21 +37,7 @@ class MQTTBridge
       @mutex.synchronize do
         case topic
         when /\$modbus$/
-          query = value.split(",").map do |addr|
-            case addr
-            when "known"
-              Aurora::REGISTER_NAMES.keys
-            when /^(\d+)(?:\.\.|-)(\d+)$/
-              $1.to_i..$2.to_i
-            else
-              addr.to_i
-            end
-          end
-          queries = Aurora.normalize_ranges(query)
-          registers = {}
-          queries.each do |subquery|
-            registers.merge!(@abc.modbus_slave.read_multiple_holding_registers(*subquery))
-          end
+          registers = @abc.query_registers(value)
           Aurora.print_registers(registers) do |register, v|
             @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
           end

data/lib/aurora/abc_client.rb

@@ -42,6 +42,25 @@ module Aurora
                end
     end
 
+    def query_registers(query)
+      ranges = query.split(",").map do |addr|
+        case addr
+        when "known"
+          Aurora::REGISTER_NAMES.keys
+        when /^(\d+)(?:\.\.|-)(\d+)$/
+          $1.to_i..$2.to_i
+        else
+          addr.to_i
+        end
+      end
+      queries = Aurora.normalize_ranges(ranges)
+      registers = {}
+      queries.each do |subquery|
+        registers.merge!(@modbus_slave.read_multiple_holding_registers(*subquery))
+      end
+      registers
+    end
+
     def refresh
       registers_to_read = [19..20, 30, 340, 344, 347, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165, 3027,
                            31_003]

data/lib/aurora/modbus/slave.rb

@@ -49,7 +49,8 @@ module Aurora
         when 0x80..0xff
           msg += read(io, 3)
         else
-          raise ModBus::Errors::IllegalFunction, "Illegal function: #{function_code}"
+          log "Rx (#{msg.size} bytes): " + logging_bytes(msg)
+          raise ::ModBus::Errors::IllegalFunction, "Illegal function: #{function_code}"
         end
         msg
       end

data/lib/aurora/registers.rb

@@ -594,7 +594,10 @@ module Aurora
     12_619 => "Heating Setpoint (write)",
     12_620 => "Cooling Setpoint (write)",
     12_621 => "Fan Mode (write)",
+    3000 => "Compressor Speed?",
+    3001 => "Compressor Speed?",
     3027 => "Compressor Speed",
+    3904 => "Leaving Air Temperature?",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
     31_109 => "Humidifier Mode", # write to 21114

data/lib/aurora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aurora
-  VERSION = "0.3.5"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.9
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rmodbus-ccutrer
   requirement: !ruby/object:Gem::Requirement