waterfurnace_aurora 0.3.12 → 0.4.2

data/lib/aurora/blower.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Blower
+    class GenericBlower < Component
+      attr_reader :type, :watts
+
+      def initialize(abc, type)
+        super(abc)
+        @type = type
+      end
+
+      def registers_to_read
+        if abc.energy_monitoring?
+          [1148..1149]
+        else
+          []
+        end
+      end
+
+      def refresh(registers)
+        @watts = registers[1148] if abc.energy_monitoring?
+      end
+    end
+
+    class PSC < GenericBlower
+      attr_reader :running
+      alias running? running
+
+      def refresh(registers)
+        @running = registers[30].include?(:g)
+      end
+    end
+
+    class FiveSpeed < GenericBlower
+      attr_reader :speed
+
+      def speed_range
+        0..4
+      end
+
+      def refresh(registers)
+        outputs = registers[30]
+        @speed = if outputs.include?(:eh1)
+                   4
+                 elsif outputs.include?(:cc2)
+                   3
+                 elsif outputs.include?(:cc)
+                   2
+                 elsif outputs.include?(:g)
+                   1
+                 else
+                   0
+                 end
+      end
+    end
+
+    class ECM < GenericBlower
+      attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
+                  :iz2_desired_speed
+
+      def speed_range
+        0..12
+      end
+
+      def registers_to_read
+        result = super + [340..342, 344, 347]
+        result << 565 if abc.iz2?
+        result
+      end
+
+      def refresh(registers)
+        super
+
+        @speed                  = registers[344]
+        @blower_only_speed      = registers[340]
+        @low_compressor_speed   = registers[341]
+        @high_compressor_speed  = registers[342]
+        @aux_heat_speed         = registers[347]
+        @iz2_desired_speed      = registers[565] if abc.iz2?
+      end
+
+      { blower_only: 340,
+        low_compressor: 341,
+        high_compressor: 342,
+        aux_heat: 347 }.each do |(setting, register)|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{setting}_speed=(value)
+            raise ArgumentError unless (1..12).include?(value)
+
+            holding_registers[#{register}] = value
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/aurora/component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Aurora
+  class Component
+    def initialize(abc)
+      @abc = abc
+    end
+
+    private
+
+    attr_reader :abc
+
+    def holding_registers
+      abc.modbus_slave.holding_registers
+    end
+  end
+end

data/lib/aurora/mock_abc.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Aurora
+  class MockABC
+    attr_accessor :logger
+
+    def initialize(registers)
+      @registers = registers
+    end
+
+    def read_retry_timeout=(_); end
+
+    def read_retries=(_); end
+
+    def holding_registers
+      self
+    end
+
+    def [](*register)
+      if register.length == 1
+        case register.first
+        when Integer
+          @registers[register.first]
+        when Range
+          @registers.values_at(*register.first.to_a)
+        else
+          raise ArgumentError, "Not implemented yet #{register.inspect}"
+        end
+      else
+        read_multiple_holding_registers(*register)
+      end
+    end
+
+    def read_multiple_holding_registers(*queries)
+      result = {}
+      queries.each do |query|
+        Array(query).each do |i|
+          result[i] = @registers[i]
+        end
+      end
+      result
+    end
+
+    def write_holding_register(addr, value)
+      @registers[addr] = value
+    end
+  end
+end

data/lib/aurora/registers.rb

@@ -59,69 +59,145 @@ module Aurora
     result
   end
 
+  def to_int32(registers, idx)
+    (registers[idx] << 16) + registers[idx + 1]
+  end
+
   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]
+
       (registers[i] >> 8).chr + (registers[i] & 0xff).chr
     end.join.sub(/[ \0]+$/, "")
   end
 
   FAULTS = {
-    1 => "Input Flt Limit",
-    2 => "High Pressure",
-    3 => "Low Pressure",
-    4 => "FP2",
-    5 => "FP1",
-    7 => "Condensate Limit",
-    8 => "Over/Under Voltage",
+    # ABC/AXB Basic Faults
+    1 => "Input Error", # Tstat input error. Autoreset upon condition removal.
+    2 => "High Pressure", # HP switch has tripped (>600 psi)
+    3 => "Low Pressure", # Low Pressure Switch has tripped (<40 psi for 30 continous sec.)
+    4 => "Freeze Detect FP2", # Freeze protection sensor has tripped (<15 or 30 degF for 30 continuous sec.)
+    5 => "Freeze Detect FP1", # Freeze protection sensor has tripped (<15 or 30 degF for 30 continuous sec.)
+    7 => "Condensate Overflow", # Condensate switch has shown continuity for 30 continuous sec.
+    8 => "Over/Under Voltage", # Instantaneous Voltage is out of range. **Controls shut down until resolved.
     9 => "AirF/RPM",
-    10 => "CompMon",
-    11 => "FP1/2 Snr Limit",
-    12 => "RefPerfrm Limit",
-    13 => "NCrtAxbSr Limit",
-    14 => "CrtAxbSnr Limit",
-    15 => "HW Limit",
-    16 => "VSPumpFlt Limit",
-    17 => "CommTStat Limit",
-    18 => "NCritComm Limit",
-    19 => "Crit Comm Limit",
-    21 => "Low Loop Pressure",
-    22 => "ComEcmErr Limit",
-    23 => "HAGenAlrm1 Limit",
-    24 => "HAGenAlrm2 Limit",
-    25 => "AxbEevErr Limit",
-    41 => "High Drive Temp Limit",
-    42 => "High Discharge Temp Limit",
-    43 => "Low Suction Pressure Limit",
-    44 => "Low Con Pressure Limit",
-    45 => "High Con Pressure Limit",
-    46 => "Out Power Limit",
-    47 => "EevIDComm Limit",
-    48 => "EevODComm Limit",
-    49 => "CabTmpSnr Limit",
-    51 => "Discharge Temp Sensor Limit",
-    52 => "Suction Presure Sensor Limit",
-    53 => "Con Pressure Sensor Limit",
-    54 => "Low Supply Voltage Limit",
-    55 => "OutEnvelp Limit",
-    56 => "Suction Pressure Sensor Limit",
-    57 => "Drive Over/Under Voltage Limit",
-    58 => "High Drive Temp Limit",
-    59 => "Internal Drive Error Limit",
-    61 => "MultSafm",
-    71 => "ChrgLoss",
-    72 => "Suction Temp Sensor Limit",
-    73 => "Leaving Air Temp Sensor Limit",
-    74 => "Maximum Operating Pressure Limit",
-    75 => "Charge Loss",
-    76 => "Suction Temperatur Sensor Limit",
-    77 => "Leaving Air Temperature Sensor Limit",
-    78 => "Maximum Operating Pressure Limit"
+    10 => "Compressor Monitor", # Open Crkt, Run, Start or welded cont
+    11 => "FP1/2 Sensor Error",
+    12 => "RefPerfrm Error",
+    # Miscellaneous
+    13 => "Non-Critical AXB Sensor Error", # Any Other Sensor Error
+    14 => "Critical AXB Sensor Error", # Sensor Err for EEV or HW
+    15 => "Hot Water Limit", # HW over limit or logic lockout. HW pump deactivated.
+    16 => "VS Pump Error", # Alert is read from PWM feedback.
+    17 => "Communicating Thermostat Error",
+    18 => "Non-Critical Communications Error", # Any non-critical com error
+    19 => "Critical Communications Error", # Any critical com error. Auto reset upon condition removal
+    21 => "Low Loop Pressure", # Loop pressure is below 3 psi for more than 3 minutes
+    22 => "Communicating ECM Error",
+    23 => "HA Alarm 1", # Closed contact input is present on Dig 2 input - Text is configurable.
+    24 => "HA Alarm 2", # Closed contact input is present on Dig 3 input - Text is configurable.
+    25 => "AxbEev Error",
+    # VS Drive
+    41 => "High Drive Temp", # Drive Temp has reached critical High Temp (>239 ̊F/115 ̊C)
+    42 => "High Discharge Temp", # Discharge temperature has reached critical high temp (> 280 ̊F/138 ̊C)
+    43 => "Low Suction Pressure", # Suction Pressure is critically low (< 28 psig)
+    44 => "Low Condensing Pressure", # Condensing pressure is critically low (< 119 psig)
+    45 => "High Condensing Pressure", # Condensing pressure is critically high (> 654 psig)
+    46 => "Output Power Limit", # Supply Voltage is <208V or Max Pwr is reached due to high pressure
+    47 => "EEV ID Comm Error", # Com with EEV is interupted EEV has gone independent mode
+    48 => "EEV OD Comm Error", # Com with EEV is interupted EEV has gone independent mode
+    49 => "Cabinet Temperature Sensor", # Ambient Temperature (Tamb) is <-76 or > 212 F and out of range or invalid
+    51 => "Discharge Temp Sensor", # Discharge Sensor (Sd) is > 280 F or invalid (-76 to 392 F)
+    52 => "Suction Presure Sensor", # Suction Pressure (P0) is invalid (0 to 232 psi)
+    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
+    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.
+    61 => "Multiple Safe Mode", # More than one SafeMode condition is present requiring lockout
+    # EEV2
+    71 => "Loss of Charge", # High superheat and high EEV opening % for a long time will trigger a loss of charge fault
+    72 => "Suction Temperature Sensor", # Suction Temperature Sensor is invalid (-76 to 392 F)
+    73 => "Leaving Air Temperature Sensor", # Leaving Air Temperature Sensor is invalid (-76 to 392 F)
+    74 => "Maximum Operating Pressure", # Suction pressure has exceeded that maximum operating level for 90 sec.
+    99 => "System Reset"
+  }.freeze
+
+  SMARTGRID_ACTION = {
+    0 => :none,
+    1 => :unoccupied_set_points,
+    2 => :load_shed,
+    3 => :capacity_limiting,
+    4 => :off_time
+  }.freeze
+
+  HA_ALARM = {
+    0 => :none,
+    1 => :general,
+    2 => :security,
+    3 => :sump,
+    4 => :carbon_monoxide,
+    5 => :dirty_filter
+  }.freeze
+
+  BRINE_TYPE = Hash.new("Water").merge!(
+    485 => "Antifreeze"
+  ).freeze
+
+  FLOW_METER_TYPE = Hash.new("Other").merge!(
+    0 => "None",
+    1 => '3/4"',
+    2 => '1"'
+  ).freeze
+
+  PUMP_TYPE = Hash.new("Other").merge!(
+    0 => "Open Loop",
+    1 => "FC1",
+    2 => "FC2",
+    3 => "VS Pump",
+    4 => "VS Pump + 26-99",
+    5 => "VS Pump + UPS26-99",
+    6 => "FC1_GLNP",
+    7 => "FC2_GLNP"
+  ).freeze
+
+  PHASE_TYPE = Hash.new("Other").merge!(
+    0 => "Single",
+    1 => "Three"
+  ).freeze
+
+  BLOWER_TYPE = Hash.new("Other").merge!(
+    0 => "PSC",
+    1 => "ECM 208/230",
+    2 => "ECM 265/277",
+    3 => "5 Speed ECM 460"
+  ).freeze
+
+  ENERGY_MONITOR_TYPE = Hash.new("Other").merge!(
+    0 => "None",
+    1 => "Compressor Monitor",
+    2 => "Energy Monitor"
+  ).freeze
+
+  VS_FAULTS = {
+    "Under-Voltage Warning" => (71..77),
+    "RPM Sensor Signal Fault" => (78..82),
+    "Under-Voltage Stop" => (83..87),
+    "Rotor Locked" => (88..92),
+    "Standby" => (93..)
   }.freeze
 
+  def vs_fault(value)
+    name = VS_FAULTS.find { |(_, range)| range.include?(value) }&.first
+    name ? "#{value} #{name}" : value.to_s
+  end
+
   AR_SETTINGS = {
     0 => "Cycle with Compressor",
-    1 => "Cycle with Thermostat Humidification Call",
-    2 => "Slow Opening Water Valve",
+    1 => "Slow Opening Water Valve",
+    2 => "Cycle with Thermostat Humidification Call",
     3 => "Cycle with Blower"
   }.freeze
 
@@ -132,23 +208,18 @@ module Aurora
       fp1: value & 0x01 == 0x01 ? "30ºF" : "15ºF",
       fp2: value & 0x02 == 0x02 ? "30ºF" : "15ºF",
       rv: value & 0x04 == 0x04 ? "O" : "B",
-      ar: AR_SETTINGS[(value >> 3) & 0x7],
+      ar: AR_SETTINGS[(value >> 3) & 0x3],
       cc: value & 0x20 == 0x20 ? "Single Stage" : "Dual Stage",
       lo: value & 0x40 == 0x40 ? "Continouous" : "Pulse",
-      dh_rh: value & 0x80 == 0x80 ? "Dehumdifier On" : "Reheat On"
+      dh_rh: value & 0x80 == 0x80 ? "Dehumidifier On" : "Reheat On"
     }
   end
 
   COMPONENT_STATUS = {
     1 => :active,
     2 => :added,
-    3 => :removed
-  }.freeze
-
-  VS_PUMP_CONTROL = {
-    0x7fff => :off,
-    40 => :min,
-    100 => :max
+    3 => :removed,
+    0xffff => :missing
   }.freeze
 
   SYSTEM_OUTPUTS = {
@@ -164,14 +235,14 @@ module Aurora
   }.freeze
 
   SYSTEM_INPUTS = {
-    0x01 => "Y1",
-    0x02 => "Y2",
-    0x04 => "W",
-    0x08 => "O",
-    0x10 => "G",
-    0x20 => "Dehumidifer",
-    0x40 => "Emergency Shutdown",
-    0x200 => "Load Shed"
+    0x01 => :y1,
+    0x02 => :y2,
+    0x04 => :w,
+    0x08 => :o,
+    0x10 => :g,
+    0x20 => :dh_rh,
+    0x40 => :emergency_shutdown,
+    0x200 => :load_shed
   }.freeze
 
   def status(value)
@@ -179,9 +250,10 @@ module Aurora
       lps: value & 0x80 == 0x80 ? :closed : :open,
       hps: value & 0x100 == 0x100 ? :closed : :open
     }
-    result[:load_shed] = true if value & 0x0200 == 0x0200
-    result[:emergency_shutdown] = true if value & 0x0040 == 0x0040
-    leftover = value & ~0x03c0
+    SYSTEM_INPUTS.each do |(i, name)|
+      result[name] = true if value & i == i
+    end
+    leftover = value & ~0x03ff
     result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
     result
   end
@@ -228,13 +300,36 @@ module Aurora
 
   }.freeze
 
-  AXB_INPUTS = {
-  }.freeze
+  def axb_inputs(value)
+    result = {}
+    result["Smart Grid"] = value & 0x001 == 0x001
+    result["Home Automation 1"] = value & 0x002 == 0x002
+    result["Home Automation 2"] = value & 0x004 == 0x004
+    result["Pump Slave"] = value & 0x008 == 0x008
+
+    result[:mb_address] = value & 0x010 == 0x010 ? 3 : 4
+    result[:sw1_2] = value & 0x020 == 0x020 # future use # rubocop:disable Naming/VariableNumber
+    result[:sw1_3] = value & 0x040 == 0x040 # future use # rubocop:disable Naming/VariableNumber
+    result[:cycle_with] = if value & 0x080 == 0x080 && value & 0x100 == 0x100
+                            "Blower"
+                          elsif value & 0x100 == 0x100
+                            "Low Capacity Compressor"
+                          elsif value & 0x080 == 0x080
+                            "High Capacity Compressor"
+                          else
+                            "Thermostat Dehumidifier"
+                          end
+    leftover = value & ~0x1ff
+    result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
+    result
+  end
 
   AXB_OUTPUTS = {
-    0x10 => "Accessory 2",
-    0x02 => "Loop Pump",
-    0x01 => "DHW"
+    0x01 => :dhw,
+    0x02 => :loop_pump,
+    0x04 => :diverting_valve,
+    0x08 => :dehumidifer_reheat,
+    0x10 => :accessory2
   }.freeze
 
   HEATING_MODE = {
@@ -279,6 +374,33 @@ module Aurora
     0x7 => :unknown7
   }.freeze
 
+  def manual_operation(value)
+    return :off if value == 0x7fff
+
+    result = {
+      mode: value & 0x100 == 0x100 ? :cooling : :heating
+    }
+    result[:aux_heat] = true if value & 0x200 == 0x200
+    result[:compressor_speed] = value & 0xf
+    result[:blower_speed] = value & 0xf0
+    result[:blower_speed] = :with_compressor if value & 0xf0 == 0xf0
+    leftover = value & ~0x03ff
+    result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
+    result
+  end
+
+  def vs_manual_control(value)
+    return :off if value == 0x7fff
+
+    value
+  end
+
+  def thermostat_override(value)
+    return [:off] if value == 0x7fff
+
+    from_bitmask(value, SYSTEM_INPUTS)
+  end
+
   def iz2_demand(value)
     {
       fan_demand: value >> 8,
@@ -286,6 +408,18 @@ module Aurora
     }
   end
 
+  def iz2_fan_desired(value)
+    case value
+    when 1 then 25
+    when 2 then 40
+    when 3 then 55
+    when 4 then 70
+    when 5 then 85
+    when 6 then 100
+    else value
+    end
+  end
+
   def zone_configuration1(value)
     fan = if value & 0x80 == 0x80
             :continuous
@@ -340,10 +474,11 @@ module Aurora
   # intermittent off time allowed: 5, 10, 15, 20, 25, 30, 35, 40
 
   REGISTER_CONVERTERS = {
-    TO_HUNDREDTHS => [2, 3, 801, 807, 813, 816, 817, 819, 820, 825, 828],
+    TO_HUNDREDTHS => [2, 3, 417, 418, 801, 804, 807, 813, 816, 817, 819, 820, 825, 828],
     method(:dipswitch_settings) => [4, 33],
     TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900,
-                  1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1136,
+                  1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1119, 1124, 1125, 1134,
+                  3322, 3323, 3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
                   12_619, 12_620,
                   21_203, 21_204,
                   21_212, 21_213,
@@ -357,21 +492,35 @@ module Aurora
     ->(v) { from_bitmask(v, SYSTEM_OUTPUTS) } => [27, 30],
     ->(v) { from_bitmask(v, SYSTEM_INPUTS) } => [28],
     method(:status) => [31],
+    method(:thermostat_override) => [32],
+    ->(v) { !v.zero? } => [45, 362, 400],
     ->(registers, idx) { to_string(registers, idx, 4) } => [88],
     ->(registers, idx) { to_string(registers, idx, 12) } => [92],
     ->(registers, idx) { to_string(registers, idx, 5) } => [105],
-    ->(v) { from_bitmask(v, VS_DRIVE_DERATE) } => [214],
-    ->(v) { from_bitmask(v, VS_SAFE_MODE) } => [216],
-    ->(v) { from_bitmask(v, VS_ALARM1) } => [217],
-    ->(v) { from_bitmask(v, VS_ALARM2) } => [218],
-    ->(v) { from_bitmask(v, VS_EEV2) } => [280],
-    ->(v) { VS_PUMP_CONTROL[v] } => [323],
+    ->(v) { from_bitmask(v, VS_DRIVE_DERATE) } => [214, 3223],
+    ->(v) { from_bitmask(v, VS_SAFE_MODE) } => [216, 3225],
+    ->(v) { from_bitmask(v, VS_ALARM1) } => [217, 3226],
+    ->(v) { from_bitmask(v, VS_ALARM2) } => [218, 3227],
+    ->(v) { from_bitmask(v, VS_EEV2) } => [280, 3804],
+    method(:vs_manual_control) => [323],
     NEGATABLE => [346, 1146],
-    ->(v) { !v.zero? } => [400],
-    ->(v) { COMPONENT_STATUS[v] } => [800, 806, 812, 815, 818, 824, 827],
-    ->(v) { from_bitmask(v, AXB_INPUTS) } => [1103],
+    ->(v) { BRINE_TYPE[v] } => [402],
+    ->(v) { FLOW_METER_TYPE[v] } => [403],
+    ->(v) { BLOWER_TYPE[v] } => [404],
+    ->(v) { v.zero? ? :closed : :open } => [405, 408, 410],
+    ->(v) { SMARTGRID_ACTION[v] } => [406],
+    ->(v) { HA_ALARM[v] } => [409, 411],
+    ->(v) { ENERGY_MONITOR_TYPE[v] } => [412],
+    ->(v) { PUMP_TYPE[v] } => [413],
+    ->(v) { PHASE_TYPE[v] } => [416],
+    method(:iz2_fan_desired) => [565],
+    ->(registers, idx) { to_string(registers, idx, 8) } => [710],
+    ->(v) { COMPONENT_STATUS[v] } => [800, 803, 806, 812, 815, 818, 824, 827],
+    method(:axb_inputs) => [1103],
     ->(v) { from_bitmask(v, AXB_OUTPUTS) } => [1104],
-    ->(v) { TO_TENTHS.call(NEGATABLE.call(v)) } => [1136],
+    ->(v) { TO_TENTHS.call(NEGATABLE.call(v)) } => [1135, 1136],
+    method(:to_int32) => [1146, 1148, 1150, 1152, 1154, 1156, 1164, 3422, 3424],
+    method(:manual_operation) => [3002],
     ->(v) { HEATING_MODE[v] } => [12_606, 21_202, 21_211, 21_220, 21_229, 21_238, 21_247],
     ->(v) { FAN_MODE[v] } => [12_621, 21_205, 21_214, 21_223, 21_232, 21_241, 21_250],
     ->(v) { from_bitmask(v, HUMIDIFIER_SETTINGS) } => [31_109],
@@ -389,9 +538,11 @@ module Aurora
   }.freeze
 
   REGISTER_FORMATS = {
-    "%ds" => [1, 6, 9, 15, 84, 85],
-    "%dV" => [16, 112],
-    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900, 1110, 1111, 1114, 1134, 1136,
+    "%ds" => [1, 6, 9, 15, 84, 85, 110],
+    "%dV" => [16, 112, 3331, 3424, 3523],
+    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900,
+                  1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
+                  3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
                   12_619, 12_620,
                   21_203, 21_204,
                   21_212, 21_213,
@@ -402,15 +553,17 @@ module Aurora
                   31_003,
                   31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
     "E%d" => [25, 26],
-    "%d%%" => [282, 321, 322, 346, 565, 741],
-    "%0.1f psi" => [419],
+    "%d%%" => [282, 321, 322, 325, 346, 565, 741, 1126, 3332, 3524, 3808],
+    "%0.1f psi" => [419, 1115, 1116, 1119, 3322, 3323],
     "%0.1fA" => [1105, 1106, 1107, 1108],
     "%0.1fgpm" => [1117],
-    "%dW" => [1147, 1149, 1151, 1153, 1165],
-    "%dBtuh" => [1157]
+    "%dW" => [1146, 1148, 1150, 1152, 1164, 3422],
+    "%dBtuh" => [1154, 1156]
   }.freeze
 
-  def ignore(range)
+  def ignore(*range)
+    range = range.first if range.length == 1
+    range = [range] if range.is_a?(Integer)
     range.zip(Array.new(range.count)).to_h
   end
 
@@ -530,26 +683,32 @@ module Aurora
   ].freeze
 
   REGISTER_NAMES = {
+    0 => "Test Mode Flag", # 0x100 for enabled; this might have other flags
     1 => "Random Start Delay",
     2 => "ABC Program Version",
     3 => "??? Version?",
     4 => "DIP Switch Override",
     6 => "Compressor Anti-Short Cycle Delay",
-    8 => "Unit Type?",
+    8 => "ABC Program Revision",
     9 => "Compressor Minimum Run Time",
     15 => "Blower Off Delay",
     16 => "Line Voltage",
-    19 => "FP1",
+    17 => "Aux/E Heat Stage", # this has some complicated condition based on
+    # current inputs and outputs on if it should have a value (310 - v) or (130 - v), or be 0
+    19 => "FP1 (Cooling Liquid Line) Temperature",
     20 => "FP2",
     21 => "Condensate", # >= 270 normal, otherwise fault
-    25 => "Last Fault Number",
+    25 => "Last Fault Number", # high bit set if locked out
     26 => "Last Lockout",
     27 => "System Outputs (At Last Lockout)",
     28 => "System Inputs (At Last Lockout)",
     30 => "System Outputs",
     31 => "Status",
+    32 => "Thermostat Input Override",
     33 => "DIP Switch Status",
     36 => "ABC Board Rev",
+    45 => "Test Mode (write)", # 1 to enable
+    47 => "Clear Fault History", # 0x5555 to clear
     50 => "ECM Speed Low (== 5)",
     51 => "ECM Speed Med (== 5)",
     52 => "ECM Speed High (== 5)",
@@ -559,7 +718,8 @@ module Aurora
     88 => "ABC Program",
     92 => "Model Number",
     105 => "Serial Number",
-    112 => "Setup Line Voltage",
+    110 => "Reheat Delay",
+    112 => "Line Voltage Setting",
     201 => "Discharge Pressure", # I can't figure out how this number is represented;
     203 => "Suction Pressure",
     205 => "Discharge Temperature",
@@ -580,7 +740,9 @@ module Aurora
     284 => "Saturated Suction Temperature", ## ?? data format
     321 => "VS Pump Min",
     322 => "VS Pump Max",
-    323 => "VS Pump Control",
+    323 => "VS Pump Speed Manual Control",
+    325 => "VS Pump Output",
+    326 => "VS Pump Fault",
     340 => "Blower Only Speed",
     341 => "Lo Compressor ECM Speed",
     342 => "Hi Compressor ECM Speed",
@@ -588,20 +750,35 @@ module Aurora
     346 => "Cooling Airflow Adjustment",
     347 => "Aux Heat ECM Speed",
     362 => "Active Dehumidify", # any value is true
-    460 => "IZ2??",
-    461 => "IZ2??",
-    462 => "IZ2 Status", # 5 when online; 1 when in setup mode
     400 => "DHW Enabled",
     401 => "DHW Setpoint",
-    # 403 => "DHW Status", just a guess, based on AID Tool querying this register while showing DHW settings
-    414 => "On Peak/SmartGrid 2", # 0x0001 only
+    402 => "Brine Type",
+    403 => "Flow Meter Type",
+    404 => "Blower Type",
+    405 => "SmartGrid Trigger",
+    406 => "SmartGrid Action", # 0/1 for 1/2; see 414
+    407 => "Off Time Length",
+    408 => "HA Alarm 1 Trigger",
+    409 => "HA Alarm 1 Action",
+    410 => "HA Alarm 2 Trigger",
+    411 => "HA Alarm 2 Action",
+    412 => "Energy Monitor", # 0 none, 1 compressor monitor, 2 energy monitor
+    413 => "Pump Type",
+    414 => "On Peak/SmartGrid", # 0x0001 only
+    416 => "Energy Phase Type",
+    417 => "Power Adjustment Factor L",
+    418 => "Power Adjustment Factor H",
     419 => "Loop Pressure Trip",
+    460 => "IZ2 Heartbeat?",
+    461 => "IZ2 Heartbeat?",
+    462 => "IZ2 Status", # 5 when online; 1 when in setup mode
     483 => "Number of IZ2 Zones",
     501 => "Set Point", # only read by AID tool? this is _not_ heating/cooling set point
     502 => "Ambient Temperature",
     564 => "IZ2 Compressor Speed Desired",
     565 => "IZ2 Blower % Desired",
     567 => "Entering Air",
+    710 => "Fault Description",
     740 => "Entering Air",
     741 => "Relative Humidity",
     745 => "Heating Set Point",
@@ -610,9 +787,15 @@ module Aurora
     800 => "Thermostat Installed",
     801 => "Thermostat Version",
     802 => "Thermostat Revision",
+    803 => "??? Installed",
+    804 => "??? Version",
+    805 => "??? Revision",
     806 => "AXB Installed",
     807 => "AXB Version",
     808 => "AXB Revision",
+    809 => "AHB Installed",
+    810 => "AHB Version",
+    811 => "AHB Revision",
     812 => "IZ2 Installed",
     813 => "IZ2 Version",
     814 => "IZ2 Revision",
@@ -635,27 +818,64 @@ module Aurora
     1106 => "Aux Amps",
     1107 => "Compressor 1 Amps",
     1108 => "Compressor 2 Amps",
-    1109 => "Heating Liquid Line",
+    1109 => "Heating Liquid Line Temperature",
     1110 => "Leaving Water",
     1111 => "Entering Water",
-    1114 => "DHW Temp",
+    1112 => "Leaving Air Temperature",
+    1113 => "Suction Temperature",
+    1114 => "DHW Temperature",
+    1115 => "Discharge Pressure",
+    1116 => "Suction Pressure",
     1117 => "Waterflow",
-    1134 => "Saturated Discharge Temperature",
-    1135 => "SubCooling",
-    1147 => "Compressor Watts",
-    1149 => "Blower Watts",
-    1151 => "Aux Watts",
-    1153 => "Total Watts",
-    1157 => "Ht of Rej",
-    1165 => "VS Pump Watts",
+    1119 => "Loop Pressure", # only valid < 1000psi
+    1124 => "Saturated Evaporator Temperature",
+    1125 => "SuperHeat",
+    1126 => "Vaport Injector Open %",
+    1134 => "Saturated Condensor Discharge Temperature",
+    1135 => "SubCooling (Heating)",
+    1136 => "SubCooling (Cooling)",
+    1146 => "Compressor Watts",
+    1148 => "Blower Watts",
+    1150 => "Aux Watts",
+    1152 => "Total Watts",
+    1154 => "Heat of Extraction",
+    1156 => "Heat of Rejection",
+    1164 => "Pump Watts",
     12_606 => "Heating Mode (write)",
     12_619 => "Heating Setpoint (write)",
     12_620 => "Cooling Setpoint (write)",
     12_621 => "Fan Mode (write)",
-    3000 => "Compressor Speed?",
-    3001 => "Compressor Speed?",
+    3000 => "Compressor Speed Desired",
+    3001 => "Compressor Speed Actual",
+    3002 => "Manual Operation",
     3027 => "Compressor Speed",
-    3904 => "Leaving Air Temperature?",
+    3220 => "VS Drive Details (General 1)",
+    3221 => "VS Drive Details (General 2)",
+    3222 => "VS Drive Details (Derate 1)",
+    3223 => "VS Drive Details (Derate 2)",
+    3224 => "VS Drive Details (Safemode 1)",
+    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",
+    3330 => "VS Drive Entering Water Temperature",
+    3331 => "VS Drive Line Voltage",
+    3332 => "VS Drive Thermo Power",
+    3422 => "VS Drive Compressor Power",
+    3424 => "VS Drive Supply Voltage",
+    3522 => "VS Drive Inverter Temperature",
+    3523 => "VS Drive UDC Voltage",
+    3524 => "VS Drive Fan Speed",
+    3804 => "VS Drive Details (EEV2 Ctl)",
+    3808 => "VS Drive SuperHeat Percent",
+    3903 => "VS Drive Suction Temperature",
+    3904 => "VS Drive Leaving Air Temperature?",
+    3905 => "VS Drive Saturated Evaporator Discharge Temperature",
+    3906 => "VS Drive SuperHeat Temperature",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
     31_109 => "Humidifier Mode", # write to 21114
@@ -670,7 +890,10 @@ module Aurora
                    .merge(ignore(93..104))
                    .merge(ignore(106..109))
                    .merge(faults(601..699))
+                   .merge(ignore(711..717))
                    .merge(zone_registers)
+                   .merge(ignore(1147, 1149, 1151, 1153, 1155, 1157, 1165))
+                   .merge(ignore(3423, 3425))
                    .merge(ignore(31_401..31_412))
                    .merge(ignore(31_414..31_420))
                    .merge(ignore(31_422..31_433))