waterfurnace_aurora 0.7.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037ee3ea9f7274fbc12400840c5f174a70e42361c686753728b31ef8c4c6faaf
-  data.tar.gz: 4ce5ddc17e4212d8a73f1c2f9255608d9d9a933da8d74e84af3552acd8bf7021
+  metadata.gz: 5a92e9aadd14ee0154443cea52907f793880242ce22a44f3df7912065074c3c8
+  data.tar.gz: 553a945493652a50f92f49e4e0620db8e03305c3ff0ab65823f20c15db2ac89d
 SHA512:
-  metadata.gz: d21f026be0e2d578b0a12064b5f90c71e039636d6fa7c21cb2a30c87fae2f2a0cc9eb9ffc65ca025cf415800abab3c32185a52ecc1e86ed5c15b93fe9516391c
-  data.tar.gz: 2dc36c52c465c776f95e6581f60c20816b06c76d392d485c5c14b7c85a82c16b141b68da569eda8bfce1ddfed60bf1027166951b9bbf17383fe8f410506c3e39
+  metadata.gz: 5fee6734f5e5752aec571c2c93a81e79be950af8c8f4a3ab3259f7d6b1d5e2540d4fd616be06d911a382c710b23ed43c1b1ecf23db23444022c24216faff52cb
+  data.tar.gz: c2e5a9f54f7bd0f6b869ffff94b4cd0a0bf9de65ea29d8342fe690f582893a9fe0a7b0f0ce94ba4c0ecf6595156d21a12e7e8203023aaadc923a56c0951f817f

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

@@ -93,6 +93,7 @@ class MQTTBridge
           @abc.refresh
 
           components = { @homie_abc => @abc,
+                         @aux_heat => @abc.aux_heat,
                          @compressor => @abc.compressor,
                          @blower => @abc.blower,
                          @pump => @abc.pump,
@@ -131,7 +132,7 @@ class MQTTBridge
     }
 
     @homie_abc = @homie.node("abc", "Heat Pump", "ABC") do |node|
-      allowed_modes = %w[lockout standby blower heating cooling eh1 eh2 emergency waiting]
+      allowed_modes = %w[lockout standby blower heating cooling waiting]
       allowed_modes << "dehumidify" if @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
       node.property("current-mode",
                     "Current Heating/Cooling Mode",
@@ -155,14 +156,16 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
-      node.property("leaving-air-temperature",
-                    "Leaving Air Temperature",
-                    :float,
-                    @abc.leaving_air_temperature,
-                    unit: "°F",
-                    hass: { sensor: { device_class: :temperature,
-                                      state_class: :measurement,
-                                      entity_category: :diagnostic } })
+      if @abc.awl_communicating?
+        node.property("leaving-air-temperature",
+                      "Leaving Air Temperature",
+                      :float,
+                      @abc.leaving_air_temperature,
+                      unit: "°F",
+                      hass: { sensor: { device_class: :temperature,
+                                        state_class: :measurement,
+                                        entity_category: :diagnostic } })
+      end
       node.property("leaving-water-temperature",
                     "Leaving Water Temperature",
                     :float,
@@ -171,7 +174,8 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
-      unless @abc.outdoor_temperature.zero? # TODO: figure out the config if this actually exists
+      # TODO: figure out the config if this actually exists
+      if @abc.awl_communicating? && !@abc.outdoor_temperature.zero?
         node.property("outdoor-temperature",
                       "Outdoor Temperature",
                       :float,
@@ -181,6 +185,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,
@@ -197,12 +209,11 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
-      %i[aux_heat total].each do |component|
-        component = "#{component}_watts"
-        node.property(component.tr("_", "-"),
-                      component.sub("_watts", " Power Usage").tr("_", " ").titleize,
+      if @abc.energy_monitoring?
+        node.property("watts",
+                      "Total Power Usage",
                       :integer,
-                      @abc.public_send(component),
+                      @abc.watts,
                       unit: "W",
                       hass: { sensor: { device_class: :power,
                                         state_class: :measurement } })
@@ -236,6 +247,30 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
+      node.property("drive-temperature",
+                    "Drive Temperature",
+                    :float,
+                    @abc.compressor.drive_temperature,
+                    unit: "°F",
+                    hass: { sensor: { device_class: :temperature,
+                                      state_class: :measurement,
+                                      entity_category: :diagnostic } })
+      node.property("inverter-temperature",
+                    "Inverter Temperature",
+                    :float,
+                    @abc.compressor.inverter_temperature,
+                    unit: "°F",
+                    hass: { sensor: { device_class: :temperature,
+                                      state_class: :measurement,
+                                      entity_category: :diagnostic } })
+      node.property("fan-speed",
+                    "Fan Speed",
+                    :integer,
+                    @abc.compressor.fan_speed,
+                    unit: "%",
+                    format: 0..100,
+                    hass: { sensor: { state_class: :measurement,
+                                      entity_category: :diagnostic } })
 
       next unless @abc.iz2?
 
@@ -248,6 +283,25 @@ class MQTTBridge
                                       entity_category: :diagnostic } })
     end
 
+    @aux_heat = @homie.node("aux-heat", "Aux Heater", "Aux Heater") do |node|
+      node.property("stage",
+                    "Current Stage",
+                    :integer,
+                    @abc.aux_heat.stage,
+                    format: 0..2,
+                    hass: { sensor: { state_class: :measurement } })
+
+      if @abc.energy_monitoring?
+        node.property("watts",
+                      "Power Usage",
+                      :integer,
+                      @abc.aux_heat.watts,
+                      unit: "W",
+                      hass: { sensor: { device_class: :power,
+                                        state_class: :measurement } })
+      end
+    end
+
     @blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
       node.property("running",
                     "Running",
@@ -325,15 +379,6 @@ class MQTTBridge
                     :boolean,
                     @abc.pump.running,
                     hass: { binary_sensor: { device_class: :running } })
-      node.property("speed",
-                    "Speed",
-                    :integer,
-                    @abc.pump.speed,
-                    format: 0..100,
-                    unit: "%",
-                    hass: { number: { entity_category: :diagnostic } }) do |value, property|
-        @mutex.synchronize { property.value = @abc.pump.speed = value }
-      end
       node.property("manual-control",
                     "Manual Control",
                     :boolean,
@@ -359,6 +404,17 @@ class MQTTBridge
                     hass: { number: { entity_category: :config } }) do |value, property|
         @mutex.synchronize { property.value = @abc.pump.maximum_speed = value }
       end
+      next unless @abc.awl_axb?
+
+      node.property("speed",
+                    "Speed",
+                    :integer,
+                    @abc.pump.speed,
+                    format: 0..100,
+                    unit: "%",
+                    hass: { number: { entity_category: :diagnostic } }) do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.speed = value }
+      end
     end
 
     if @abc.dhw
@@ -388,47 +444,41 @@ class MQTTBridge
                       @abc.dhw.set_point,
                       format: 100..140,
                       unit: "°F",
-                      hass: :number) do |value, property|
+                      hass: { number: { step: 5 } }) do |value, property|
           @mutex.synchronize { property.value = @abc.dhw.set_point = value }
         end
       end
     end
 
     @humidistat = @homie.node("humidistat", "Humidistat", "Humidistat") do |node|
-      node.property("relative-humidity",
-                    "Relative Humidity",
-                    :integer,
-                    @abc.humidistat.relative_humidity,
-                    unit: "%",
-                    format: 0..100,
-                    hass: { sensor: { device_class: :humidity,
-                                      state_class: :measurement } })
       if @abc.humidistat.humidifier?
         node.property("humidifier-running",
                       "Humidifier Running",
                       :boolean,
                       @abc.humidistat.humidifier_running?)
-        node.property("humidifier-mode",
-                      "Humidifier Mode",
-                      :enum,
-                      @abc.humidistat.humidifier_mode,
-                      format: %i[auto manual]) do |value, property|
-          @mutex.synchronize { property.value = @abc.humidistat.humidifier_mode = value.to_sym }
-        end
-        node.property("humidification-target",
-                      "Humidification Target Relative Humidity",
-                      :integer,
-                      @abc.humidistat.humidification_target,
-                      unit: "%",
-                      format: 15..50) do |value, property|
-          @mutex.synchronize { property.value = @abc.humidistat.humidification_target = value }
+        if @abc.awl_communicating?
+          node.property("humidifier-mode",
+                        "Humidifier Mode",
+                        :enum,
+                        @abc.humidistat.humidifier_mode,
+                        format: %i[auto manual]) do |value, property|
+            @mutex.synchronize { property.value = @abc.humidistat.humidifier_mode = value.to_sym }
+          end
+          node.property("humidification-target",
+                        "Humidification Target Relative Humidity",
+                        :integer,
+                        @abc.humidistat.humidification_target,
+                        unit: "%",
+                        format: 15..50) do |value, property|
+            @mutex.synchronize { property.value = @abc.humidistat.humidification_target = value }
+          end
+          node.hass_humidifier("humidifier-running",
+                               target_property: "humidification-target",
+                               mode_property: "humidifier-mode",
+                               id: "humidifier",
+                               name: "Humidifier",
+                               device_class: :humidifier)
         end
-        node.hass_humidifier("humidifier-running",
-                             target_property: "humidification-target",
-                             mode_property: "humidifier-mode",
-                             id: "humidifier",
-                             name: "Humidifier",
-                             device_class: :humidifier)
       end
 
       # VSDrive can perform active dehumidification, even without a dedicated dehumidifier
@@ -438,28 +488,40 @@ class MQTTBridge
                       "Dehumidifier Running",
                       :boolean,
                       @abc.humidistat.dehumidifier_running?)
-        node.property("dehumidifier-mode",
-                      "Dehumidifier Mode",
-                      :enum,
-                      @abc.humidistat.dehumidifier_mode,
-                      format: %i[auto manual]) do |value, property|
-          @mutex.synchronize { property.value = @abc.humidistat.dehumidifier_mode = value.to_sym }
-        end
-        node.property("dehumidification-target",
-                      "Dehumidification Target Relative Humidity",
-                      :integer,
-                      @abc.humidistat.dehumidification_target,
-                      unit: "%",
-                      format: 35..65) do |value, property|
-          @mutex.synchronize { property.value = @abc.humidistat.dehumidification_target = value }
+        if @abc.awl_communicating?
+          node.property("dehumidifier-mode",
+                        "Dehumidifier Mode",
+                        :enum,
+                        @abc.humidistat.dehumidifier_mode,
+                        format: %i[auto manual]) do |value, property|
+            @mutex.synchronize { property.value = @abc.humidistat.dehumidifier_mode = value.to_sym }
+          end
+          node.property("dehumidification-target",
+                        "Dehumidification Target Relative Humidity",
+                        :integer,
+                        @abc.humidistat.dehumidification_target,
+                        unit: "%",
+                        format: 35..65) do |value, property|
+            @mutex.synchronize { property.value = @abc.humidistat.dehumidification_target = value }
+          end
+          node.hass_humidifier("dehumidifier-running",
+                               target_property: "dehumidification-target",
+                               mode_property: "dehumidifier-mode",
+                               id: "dehumidifier",
+                               name: "Dehumidifier",
+                               device_class: :dehumidifier)
         end
-        node.hass_humidifier("dehumidifier-running",
-                             target_property: "dehumidification-target",
-                             mode_property: "dehumidifier-mode",
-                             id: "dehumidifier",
-                             name: "Dehumidifier",
-                             device_class: :dehumidifier)
       end
+      next unless @abc.awl_communicating?
+
+      node.property("relative-humidity",
+                    "Relative Humidity",
+                    :integer,
+                    @abc.humidistat.relative_humidity,
+                    unit: "%",
+                    format: 0..100,
+                    hass: { sensor: { device_class: :humidity,
+                                      state_class: :measurement } })
     end
 
     @faults = @homie.node("faults", "Fault History", "ABC") do |node|
@@ -487,6 +549,14 @@ class MQTTBridge
     @abc.zones.each_with_index do |zone, i|
       type = zone.is_a?(Aurora::IZ2Zone) ? "IntelliZone 2 Zone" : "Thermostat"
       @homie.node("zone#{i + 1}", "Zone #{i + 1}", type) do |node|
+        node.property("current-mode",
+                      "Current Heating/Cooling Mode Requested",
+                      :enum,
+                      zone.current_mode,
+                      format: %w[standby h1 h2 h3 c1 c2])
+
+        next unless @abc.awl_communicating?
+
         allowed_modes = %w[off auto cool heat]
         allowed_modes << "eheat" if i.zero?
         node.property("target-mode",
@@ -496,11 +566,6 @@ class MQTTBridge
                       format: allowed_modes) do |value, property|
           @mutex.synchronize { property.value = zone.target_mode = value.to_sym }
         end
-        node.property("current-mode",
-                      "Current Heating/Cooling Mode Requested",
-                      :enum,
-                      zone.current_mode,
-                      format: %w[standby h1 h2 h3 c1 c2])
         node.property("target-fan-mode",
                       "Target Fan Mode",
                       :enum,

data/lib/aurora/abc_client.rb

@@ -3,6 +3,7 @@
 require "yaml"
 require "uri"
 
+require "aurora/aux_heat"
 require "aurora/blower"
 require "aurora/compressor"
 require "aurora/dhw"
@@ -40,12 +41,57 @@ 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,
+                :abc_version,
                 :model,
                 :serial_number,
                 :zones,
+                :aux_heat,
                 :compressor,
                 :blower,
                 :pump,
@@ -60,21 +106,22 @@ module Aurora
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
-                :aux_heat_watts,
-                :total_watts
+                :line_voltage,
+                :watts
 
     def initialize(uri)
       @modbus_slave = self.class.open_modbus_slave(uri)
       @modbus_slave.read_retry_timeout = 15
       @modbus_slave.read_retries = 2
-      raw_registers = @modbus_slave.holding_registers[33, 88...110, 404, 412..413, 1103, 1114]
+      raw_registers = @modbus_slave.holding_registers[2, 33, 88...110, 404, 412..413, 813, 1103, 1114]
       registers = Aurora.transform_registers(raw_registers.dup)
+      @abc_version = registers[2]
       @program = registers[88]
       @model = registers[92]
       @serial_number = registers[105]
       @energy_monitor = raw_registers[412]
 
-      @zones = if iz2?
+      @zones = if iz2? && iz2_version >= 2.0
                  iz2_zone_count = @modbus_slave.holding_registers[483]
                  (0...iz2_zone_count).map { |i| IZ2Zone.new(self, i + 1) }
                else
@@ -83,6 +130,7 @@ module Aurora
 
       @abc_dipswitches = registers[33]
       @axb_dipswitches = registers[1103]
+      @aux_heat = AuxHeat.new(self)
       @compressor = if @program == "ABCVSP"
                       Compressor::VSDrive.new(self)
                     else
@@ -108,12 +156,13 @@ module Aurora
 
       @faults = []
 
-      @registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1104, 1110..1111, 1114, 1150..1153, 1165,
-                            31_003]
+      @registers_to_read = [6, 19..20, 25, 30, 112, 344, 567, 1104, 1110..1111, 1114, 1150..1153, 1165]
+      @registers_to_read.concat([741, 31_003]) if awl_communicating?
+      @registers_to_read << 900 if awl_axb?
       zones.each do |z|
         @registers_to_read.concat(z.registers_to_read)
       end
-      @components = [compressor, blower, pump, dhw, humidistat].compact
+      @components = [aux_heat, compressor, blower, pump, dhw, humidistat].compact
       @components.each do |component|
         @registers_to_read.concat(component.registers_to_read)
       end
@@ -122,37 +171,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
@@ -164,8 +183,8 @@ module Aurora
 
       outputs = registers[30]
 
-      @entering_air_temperature   = registers[740]
-      @leaving_air_temperature    = registers[900]
+      @entering_air_temperature   = registers[567]
+      @leaving_air_temperature    = registers[900] if awl_axb?
       @leaving_water_temperature  = registers[1110]
       @entering_water_temperature = registers[1111]
       @outdoor_temperature        = registers[31_003]
@@ -175,8 +194,8 @@ module Aurora
       @error                      = registers[25] & 0x7fff
       @derated                    = (41..46).cover?(@error)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@error)
-      @aux_heat_watts             = registers[1151]
-      @total_watts                = registers[1153]
+      @line_voltage               = registers[112]
+      @watts                      = registers[1153]
 
       @current_mode = if outputs.include?(:lockout)
                         :lockout
@@ -184,10 +203,6 @@ module Aurora
                         :dehumidify
                       elsif outputs.include?(:cc2) || outputs.include?(:cc)
                         outputs.include?(:rv) ? :cooling : :heating
-                      elsif outputs.include?(:eh2)
-                        outputs.include?(:rv) ? :eh2 : :emergency
-                      elsif outputs.include?(:eh1)
-                        outputs.include?(:rv) ? :eh1 : :emergency
                       elsif outputs.include?(:blower)
                         :blower
                       elsif registers[6]
@@ -255,13 +270,18 @@ module Aurora
     end
 
     # config aurora system
-    { thermostat: 800, axb: 806, iz2: 812, aoc: 815, moc: 818, eev2: 824 }.each do |(component, register)|
+    { thermostat: 800, axb: 806, iz2: 812, aoc: 815, moc: 818, eev2: 824, awl: 827 }.each do |(component, register)|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{component}?
           return @#{component} if instance_variable_defined?(:@#{component})
           @#{component} = @modbus_slave.holding_registers[#{register}] != 3
         end
 
+        def #{component}_version
+          return @#{component}_version if instance_variable_defined?(:@#{component}_version)
+          @#{component}_version = @modbus_slave.holding_registers[#{register + 1}].to_f / 100
+        end
+
         def add_#{component}
           @modbus_slave.holding_registers[#{register}] = 2
         end
@@ -272,6 +292,27 @@ module Aurora
       RUBY
     end
 
+    # see https://www.waterfurnace.com/literature/symphony/ig2001ew.pdf
+    # is there a communicating system compliant with AWL?
+    def awl_communicating?
+      awl_thermostat? || awl_iz2?
+    end
+
+    # is the thermostat AWL compliant?
+    def awl_thermostat?
+      thermostat? && thermostat_version >= 3.0
+    end
+
+    # is the IZ2 AWL compliant?
+    def awl_iz2?
+      iz2? && iz2_version >= 2.0
+    end
+
+    # is the AXB AWL compliant?
+    def awl_axb?
+      axb? && axb_version >= 2.0
+    end
+
     def inspect
       "#<Aurora::ABCClient #{(instance_variables - [:@modbus_slave]).map do |iv|
                                "#{iv}=#{instance_variable_get(iv).inspect}"

data/lib/aurora/aux_heat.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+class AuxHeat < Component
+    attr_reader :stage, :watts
+
+    def refresh(registers)
+    outputs = registers[30]
+    @stage = if outputs.include?(:eh2)
+                2
+                elsif outputs.include?(:eh1)
+                1
+                else
+                0
+                end
+    @watts = registers[1151] if abc.energy_monitoring?
+    end
+  end
+end

data/lib/aurora/blower.rb

@@ -36,7 +36,7 @@ module Aurora
 
       def refresh(registers)
         outputs = registers[30]
-        @speed = if outputs.include?(:eh1)
+        @speed = if outputs.include?(:eh1) || outputs.include?(:eh2)
                    4
                  elsif outputs.include?(:cc2)
                    3

data/lib/aurora/component.rb

@@ -6,6 +6,10 @@ module Aurora
       @abc = abc
     end
 
+    def registers_to_read
+      []
+    end
+
     def inspect
       "#<Aurora::#{self.class.name} #{(instance_variables - [:@abc]).map do |iv|
                                         "#{iv}=#{instance_variable_get(iv).inspect}"

data/lib/aurora/compressor.rb

@@ -42,7 +42,7 @@ module Aurora
     end
 
     class VSDrive < GenericCompressor
-      attr_reader :ambient_temperature, :iz2_desired_speed
+      attr_reader :drive_temperature, :inverter_temperature, :ambient_temperature, :iz2_desired_speed, :fan_speed
 
       def initialize(abc)
         super(abc, 12)
@@ -53,7 +53,7 @@ module Aurora
       end
 
       def registers_to_read
-        result = super + [209, 3001, 3326]
+        result = super + [209, 3001, 3326..3327, 3522, 3524]
         result << 564 if abc.iz2?
         result
       end
@@ -63,6 +63,10 @@ module Aurora
 
         @speed = registers[3001]
         @ambient_temperature = registers[3326]
+        @drive_temperature = registers[3327]
+        @inverter_temperature = registers[3522]
+        @fan_speed = registers[3524]
+
         @iz2_desired_speed = registers[564] if abc.iz2?
       end
     end

data/lib/aurora/humidistat.rb

@@ -29,6 +29,8 @@ module Aurora
     alias_method :dehumidifier_running?, :dehumidifier_running
 
     def registers_to_read
+      return [] unless @abc.awl_communicating?
+
       result = [741]
       if humidifier? || dehumidifier? || abc.compressor.is_a?(Compressor::VSDrive)
         result.concat(abc.iz2? ? [21_114, 31_109..31_110] : [12_309..12_310])

data/lib/aurora/mock_abc.rb

@@ -20,9 +20,14 @@ module Aurora
       if register.length == 1
         case register.first
         when Integer
+          missing_register(register.first) unless @registers.key?(register.first)
           @registers[register.first]
         when Range
-          @registers.values_at(*register.first.to_a)
+          registers = register.first.to_a
+          registers.each do |i|
+            missing_register(i) unless @registers.key?(i)
+          end
+          @registers.values_at(*registers)
         else
           raise ArgumentError, "Not implemented yet #{register.inspect}"
         end
@@ -35,6 +40,11 @@ module Aurora
       result = {}
       queries.each do |query|
         Array(query).each do |i|
+          unless @registers.key?(i)
+            missing_register(i)
+            next
+          end
+
           result[i] = @registers[i]
         end
       end
@@ -45,5 +55,11 @@ module Aurora
       @registers[addr] = value
     end
     alias_method :[]=, :write_holding_register
+
+    private
+
+    def missing_register(idx)
+      logger.warn("missing register #{idx}")
+    end
   end
 end

data/lib/aurora/pump.rb

@@ -31,7 +31,7 @@ module Aurora
       alias_method :manual_control?, :manual_control
 
       def registers_to_read
-        super + [321..325]
+        super + (@abc.awl_axb? ? [321..325] : [321..324])
       end
 
       def refresh(registers)
@@ -39,7 +39,7 @@ module Aurora
         @minimum_speed = registers[321]
         @maximum_speed = registers[322]
         @manual_control = registers[323] != :off
-        @speed = registers[325]
+        @speed = registers[325] if @abc.awl_axb?
       end
 
       def manual_control=(value)

data/lib/aurora/registers.rb

@@ -65,7 +65,7 @@ module Aurora
 
   def to_string(registers, idx, length)
     (idx...(idx + length)).map do |i|
-      raise ArgumentError, "Missing register #{i} for string starting at #{idx}" unless registers[i]
+      next "\ufffd" unless registers[i] # missing data? add unicode invalid character
 
       (registers[i] >> 8).chr + (registers[i] & 0xff).chr
     end.join.sub(/[ \0]+$/, "")
@@ -112,7 +112,7 @@ module Aurora
     53 => "Condensing Pressure Sensor", # Low condensing pressure (PD) or invalid (0 to 870 psi) Retry 10x.
     54 => "Low Supply Voltage", # Supply Voltage is <180 V (190V to reset) or powered off/on too quickly (<30 sec.).
     55 => "Out of Envelope", # Comp Operating out of envelope (P0) more than 90 sec. Retry 10x.
-    56 => "Drive Over Currnet", # Over current tripped by phase loss, earth fault, short circuit, low water flow, low air flow, or major drive fault. # rubocop:disable Layout/LineLength
+    56 => "Drive Over Current", # Over current tripped by phase loss, earth fault, short circuit, low water flow, low air flow, or major drive fault. # rubocop:disable Layout/LineLength
     57 => "Drive Over/Under Voltage", # DC Link Voltage to compressor is >450vdc or at minimum voltage (<185vdc).
     58 => "High Drive Temp", # Drive Temp has reached critical High Temp >239 F
     59 => "Internal Drive Error", # The MOC has encountered an internal fault or an internal error. Probably fatal.
@@ -867,11 +867,11 @@ module Aurora
     3225 => "VS Drive Details (Safemode 2)",
     3226 => "VS Drive Details (Alarm 1)",
     3227 => "VS Drive Details (Alarm 2)",
-    3327 => "VS Drive Temperature",
     3322 => "VS Drive Discharge Pressure",
     3323 => "VS Drive Suction Pressure",
     3325 => "VS Drive Discharge Temperature",
     3326 => "VS Drive Compressor Ambient Temperature",
+    3327 => "VS Drive Temperature",
     3330 => "VS Drive Entering Water Temperature",
     3331 => "VS Drive Line Voltage",
     3332 => "VS Drive Thermo Power",

data/lib/aurora/thermostat.rb

@@ -15,19 +15,23 @@ module Aurora
                 :fan_intermittent_off
 
     def registers_to_read
+      return [31] unless @abc.awl_thermostat?
+
       [31, 502, 745..746, 12_005..12_006]
     end
 
     def refresh(registers)
-      @ambient_temperature = registers[502]
-      @heating_target_temperature = registers[745]
-      @cooling_target_temperature = registers[746]
-      config1 = registers[12_005]
-      config2 = registers[12_006]
-      @target_fan_mode = config1[:fan]
-      @fan_intermittent_on = config1[:on_time]
-      @fan_intermittent_off = config1[:off_time]
-      @target_mode = config2[:mode]
+      if @abc.awl_thermostat?
+        @ambient_temperature = registers[502]
+        @heating_target_temperature = registers[745]
+        @cooling_target_temperature = registers[746]
+        config1 = registers[12_005]
+        config2 = registers[12_006]
+        @target_fan_mode = config1[:fan]
+        @fan_intermittent_on = config1[:on_time]
+        @fan_intermittent_off = config1[:off_time]
+        @target_mode = config2[:mode]
+      end
 
       inputs = registers[31]
       @current_fan_mode = inputs.include?(:g)

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -166,6 +166,7 @@ files:
 - exe/web_aid_tool
 - lib/aurora.rb
 - lib/aurora/abc_client.rb
+- lib/aurora/aux_heat.rb
 - lib/aurora/blower.rb
 - lib/aurora/component.rb
 - lib/aurora/compressor.rb