waterfurnace_aurora 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037ee3ea9f7274fbc12400840c5f174a70e42361c686753728b31ef8c4c6faaf
-  data.tar.gz: 4ce5ddc17e4212d8a73f1c2f9255608d9d9a933da8d74e84af3552acd8bf7021
+  metadata.gz: 6682276ad275ed03cc9985a993fb2b97830d4aee801d544797b7dbe4e34288db
+  data.tar.gz: 674d421a8729c071bab6de126757d993eb4940a0ee6e514b8e689397ceee1c56
 SHA512:
-  metadata.gz: d21f026be0e2d578b0a12064b5f90c71e039636d6fa7c21cb2a30c87fae2f2a0cc9eb9ffc65ca025cf415800abab3c32185a52ecc1e86ed5c15b93fe9516391c
-  data.tar.gz: 2dc36c52c465c776f95e6581f60c20816b06c76d392d485c5c14b7c85a82c16b141b68da569eda8bfce1ddfed60bf1027166951b9bbf17383fe8f410506c3e39
+  metadata.gz: a47a7971f42f9ad100cc756b06b6146fc2c315a4298af501478f7208697d31bbd535ee26e7cd1250f4391bb7df16cd07da5ea420e752cfb95d6c4e1192ae9021
+  data.tar.gz: 2fdd41be490e09ae5436508b972134ee3f51c2b07b24f21006fccec51fd9981a79715a380ef401ad76a5c5680cf329b023b8f2e2f3a53cf3b8f2a78c08a71c73

data/exe/aurora_fetch

@@ -9,11 +9,19 @@ require "uri"
 require "yaml"
 
 debug_modbus = yaml = false
+try_individual = nil
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_fetch /path/to/serial/port REGISTERS [options]"
 
+  opts.separator("")
+  opts.separator("Use `known` to fetch all identified registers. Use `valid` to fetch all registers that will respond.")
+  opts.separator("")
+
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
+  opts.on("--[no-]try-individual",
+          "Query registers one-by-one if a range has an illegal address. " \
+          "Defaults to true for `valid` and `known` special registers, false otherwise.") { |v| try_individual = v }
   opts.on("-y", "--yaml", "Output raw values as YAML") { yaml = true }
   opts.on("-v", "--version", "Print version") do
     puts Aurora::VERSION
@@ -32,11 +40,13 @@ unless ARGV.length == 2
   exit 1
 end
 
-abc = Aurora::ABCClient.new(ARGV[0])
-abc.modbus_slave.logger = Logger.new($stdout)
-abc.modbus_slave.logger.level = debug_modbus ? :debug : :warn
+modbus_slave = Aurora::ABCClient.open_modbus_slave(ARGV[0])
+modbus_slave.read_retry_timeout = 15
+modbus_slave.read_retries = 2
+modbus_slave.logger = Logger.new($stdout)
+modbus_slave.logger.level = debug_modbus ? :debug : :warn
 
-registers = abc.query_registers(ARGV[1])
+registers = Aurora::ABCClient.query_registers(modbus_slave, ARGV[1], try_individual: try_individual)
 
 if yaml
   puts YAML.dump(registers)

data/exe/aurora_mqtt_bridge

@@ -181,6 +181,14 @@ class MQTTBridge
                                         state_class: :measurement } })
       end
 
+      node.property("line-voltage",
+                    "Line Voltage Setting",
+                    :integer,
+                    @abc.line_voltage,
+                    format: 90..635,
+                    unit: "V") do |value, property|
+                      @mutex.synchronize { property.value = @abc.line_voltage = value }
+                    end
       node.property("fp1",
                     "FP1 Sensor",
                     :float,

data/lib/aurora/abc_client.rb

@@ -40,6 +40,49 @@ module Aurora
         client = ::ModBus::RTUClient.new(io)
         client.with_slave(1)
       end
+
+      def query_registers(modbus_slave, query, try_individual: false)
+        implicit = try_individual
+        ranges = query.split(",").map do |addr|
+          case addr
+          when "known"
+            implicit = true
+            try_individual = true if try_individual.nil?
+            Aurora::REGISTER_NAMES.keys
+          when "valid"
+            implicit = true
+            try_individual = true if try_individual.nil?
+            break Aurora::REGISTER_RANGES
+          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))
+        rescue ::ModBus::Errors::IllegalDataAddress
+          # maybe this unit doesn't respond to all the addresses we want?
+          raise unless implicit
+
+          # try each query individually
+          subquery.each do |subsubquery|
+            registers.merge!(modbus_slave.read_multiple_holding_registers(subsubquery))
+          rescue ::ModBus::Errors::IllegalDataAddress
+            next unless try_individual
+
+            # seriously?? try each register individually
+            subsubquery.each do |i|
+              registers[i] = modbus_slave.holding_registers[i]
+            rescue ::ModBus::Errors::IllegalDataAddress
+              next
+            end
+          end
+        end
+        registers
+      end
     end
 
     attr_reader :modbus_slave,
@@ -60,6 +103,7 @@ module Aurora
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
+                :line_voltage,
                 :aux_heat_watts,
                 :total_watts
 
@@ -108,7 +152,7 @@ module Aurora
 
       @faults = []
 
-      @registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1104, 1110..1111, 1114, 1150..1153, 1165,
+      @registers_to_read = [6, 19..20, 25, 30, 112, 344, 740..741, 900, 1104, 1110..1111, 1114, 1150..1153, 1165,
                             31_003]
       zones.each do |z|
         @registers_to_read.concat(z.registers_to_read)
@@ -122,37 +166,7 @@ module Aurora
     end
 
     def query_registers(query)
-      implicit = false
-      ranges = query.split(",").map do |addr|
-        case addr
-        when "known"
-          implicit = true
-          Aurora::REGISTER_NAMES.keys
-        when "valid"
-          implicit = true
-          break Aurora::REGISTER_RANGES
-        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))
-      rescue ::ModBus::Errors::IllegalDataAddress
-        # maybe this unit doesn't respond to all the addresses we want?
-        raise unless implicit
-
-        # try each query individually
-        subquery.each do |subsubquery|
-          registers.merge!(@modbus_slave.read_multiple_holding_registers(subsubquery))
-        rescue ::ModBus::Errors::IllegalDataAddress
-          next
-        end
-      end
-      registers
+      self.class.query_registers(@modbus_slave, query)
     end
 
     def refresh
@@ -175,6 +189,7 @@ module Aurora
       @error                      = registers[25] & 0x7fff
       @derated                    = (41..46).cover?(@error)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@error)
+      @line_voltage               = registers[112]
       @aux_heat_watts             = registers[1151]
       @total_watts                = registers[1153]
 

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport