waterfurnace_aurora 0.7.3 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022f7ed4808f1276a58c999584d2b4bd38dc756e85e018e41cb5e9c5a5535bcf
-  data.tar.gz: c428e4f7ef1c9bb3fb1a64d65be9ca76043305d250eaf434e453c0729bf3189e
+  metadata.gz: 7af20433d8163a332a3d09c36b23af07b95d9beb088d4a0ce69436a54e46e434
+  data.tar.gz: 29a7c84feb1f58ecb6b0a44538f1a530add179ea95b0285f1739f172730b2d24
 SHA512:
-  metadata.gz: 6732c28063980999e4b5feffd59eaee3829ca5785d53028b0c659567dc35aae4c32ddcb7770b5e4a094b1f5d5219ae6d04659920c631cea881bd077977f7a63a
-  data.tar.gz: 2c866d3d0c628a6a4f814f1a1fd78d4cbe62140787a43585e56cb8d749b3f6421dde793839d67d83bba268037a6493578b47eae23c669ad72296eabf5a584226
+  metadata.gz: 81c6604273350396388be239846997ee151f1b92ac47c270977e63347a5eeea81025eefece7d60cb3f2e374bca65816548bf3b8cc36bf249a1dbec57fbc0cb3a
+  data.tar.gz: 75ac82e3784f556b13274d5de4e64889023963286a3787e2521fef74ca5fb19ff0c49ea40a35fef7ea95bcae80b463ff84d15e67e4ddce098ffd69a3ead95843

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,
@@ -577,7 +585,8 @@ class MQTTBridge
         end
         node.hass_climate(action_property: "current-mode",
                           current_temperature_property: "ambient-temperature",
-                          fan_mode_property: "target-mode",
+                          fan_mode_property: "target-fan-mode",
+                          mode_property: "target-mode",
                           temperature_high_property: "cooling-target-temperature",
                           temperature_low_property: "heating-target-temperature",
                           templates: {

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, ::ModBus::Errors::IllegalFunction
+          # 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, ::ModBus::Errors::IllegalFunction
+            next unless try_individual
+
+            # seriously?? try each register individually
+            subsubquery.each do |i|
+              registers[i] = modbus_slave.holding_registers[i]
+            rescue ::ModBus::Errors::IllegalDataAddress, ::ModBus::Errors::IllegalFunction
+              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.3"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.7
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mqtt-homeassistant
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement