waterfurnace_aurora 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a92c5ae13a08cf060e3c7f23613cc1302e20af0bc4bc7c77c610936bea48c2b5
-  data.tar.gz: 914c7c6371755e06524e063b5eb6820ca63f67844713d4d396cd08559fa62cc6
+  metadata.gz: 2d7a11b389793a826e3dc602b69ea7aea2ee73afc9839eb1b9df41f38895222e
+  data.tar.gz: c30fad75a07bded088cb3a961e88bf298f5c482eafcb681309693ae00b079de0
 SHA512:
-  metadata.gz: 384657c10727cf0a955cf4a4db5270d8ee021629e40c0dee65170e22206e3b0c21c85da2beade4f02143cdd5ff8d5631d5429c6a2957b96d933a3476cf83078c
-  data.tar.gz: 6ea98c0cd77e83158d8313a851b0fa155cc6ee7a042aa338abb27c3c57cec543017b1ab97953aedf11d4645fedd5a6423c35b2c4f75fae6c768cfd1d5e47635d
+  metadata.gz: 7b0d336748b78005248f5b9b64afb573345a6a0426346bb2d1053d3fdaa4a814a313e5f621ca632d02358f0ec3d2a0c4c2506cb4dada0551c344a595be1f944b
+  data.tar.gz: 0d46028195f215edfe1a1dcf0ec1b7ea50071ba1a7638ba9a2fd0bc3418cd4f451c88e7fb461c741970d683f94eef0c25ec5f2b64db4b80e1ae7ecc0b702a9f4

data/exe/aurora_fetch

@@ -28,28 +28,10 @@ unless ARGV.length == 2
   exit 1
 end
 
-uri = URI.parse(ARGV[0])
-
-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(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)
-client.logger.level = debug_modbus ? :debug : :warn
-
-slave = client.with_slave(1)
-abc = Aurora::ABCClient.new(slave)
+abc = Aurora::ABCClient.new(ARGV[0])
+abc.modbus_slave.logger = Logger.new($stdout)
+abc.modbus_slave.logger.level = debug_modbus ? :debug : :warn
+
 registers = abc.query_registers(ARGV[1])
 
 if yaml

data/exe/aurora_mock

@@ -2,29 +2,29 @@
 # frozen_string_literal: true
 
 require "aurora"
-require "ccutrer-serialport"
 require "uri"
 require "yaml"
 
 uri = URI.parse(ARGV[0])
 
-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(uri.host,
-                                   port: uri.port || 23,
-                                   baud: 19_200,
-                                   parity: :even)]
-       else
-         [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
-       end
+io = case uri.scheme
+     when "tcp"
+       require "socket"
+       TCPSocket.new(uri.host, uri.port)
+     when "telnet", "rfc2217"
+       require "net/telnet/rfc2217"
+       Net::Telnet::RFC2217.new(uri.host,
+                                port: uri.port || 23,
+                                baud: 19_200,
+                                parity: :even)
+     else
+       require "ccutrer-serialport"
+       CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)
+     end
 
 port = ARGV[1]&.to_i || 502
 
-server1 = ModBus::RTUServer.new(*args)
+server1 = ModBus::RTUServer.new(io)
 server1.logger = Logger.new($stdout, :debug)
 # AID Tool queries slave 1, AWL queries slave 2; just use both
 slave1 = server1.with_slave(1)
@@ -35,7 +35,7 @@ slave255 = server2.with_slave(255)
 r = slave1.holding_registers = slave2.holding_registers = slave255.holding_registers = Array.new(31_473, 0)
 
 # prepopulate some data
-registers = YAML.safe_load(File.read(File.expand_path("registers.yml", __dir__)))
+registers = YAML.safe_load(File.read(ARGV[2]))
 registers.each { |(k, v)| r[k] = v }
 
 server1.request_callback = lambda { |uid, func, req|

data/exe/aurora_monitor

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "aurora"
-require "ccutrer-serialport"
 require "logger"
 require "optparse"
 require "socket"
@@ -10,7 +9,7 @@ require "uri"
 
 diff_only = debug_modbus = ignore_awl_heartbeat = ignore_sensors = false
 
-OptionParser.new do |opts|
+options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_monitor /path/to/serial/port [options]"
 
   opts.on("-q", "--quiet",
@@ -27,7 +26,14 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
-end.parse!
+end
+
+options.parse!
+
+unless ARGV.length == 2
+  puts options
+  exit 1
+end
 
 uri = URI.parse(ARGV[0])
 
@@ -36,21 +42,22 @@ 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 = case uri.scheme
-       when "tcp"
-         require "socket"
-         [TCPSocket.new(uri.host, uri.port)]
-       when "telnet", "rfc2217"
-         require "net/telnet/rfc2217"
-         [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
-
-server = ModBus::RTUServer.new(*args)
+io = case uri.scheme
+     when "tcp"
+       require "socket"
+       TCPSocket.new(uri.host, uri.port)
+     when "telnet", "rfc2217"
+       require "net/telnet/rfc2217"
+       Net::Telnet::RFC2217.new(uri.host,
+                                port: uri.port || 23,
+                                baud: 19_200,
+                                parity: :even)
+     else
+       require "ccutrer-serialport"
+       CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)
+     end
+
+server = ModBus::RTUServer.new(io)
 server.promiscuous = true
 server.logger = Logger.new($stdout)
 server.logger.level = debug_modbus ? :debug : :warn

data/exe/aurora_mqtt_bridge

@@ -5,27 +5,34 @@ require "aurora"
 require "homie-mqtt"
 require "ccutrer-serialport"
 require "uri"
+require "optparse"
+require "yaml"
 require "aurora/core_ext/string"
 
-uri = URI.parse(ARGV[0])
+debug_modbus = false
+
+options = OptionParser.new do |opts|
+  opts.banner = "Usage: aurora_mqtt_bridge /path/to/serial/port [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
+
+options.parse!
+
+unless ARGV.length == 2
+  puts options
+  exit 1
+end
+
 mqtt_uri = ARGV[1]
 
-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(uri.host,
-                                   port: uri.port || 23,
-                                   baud: 19_200,
-                                   parity: :even)]
-       else
-         [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
-       end
-
-slave = ModBus::RTUClient.new(*args).with_slave(1)
-abc = Aurora::ABCClient.new(slave)
+abc = Aurora::ABCClient.new(ARGV[0])
+abc.modbus_slave.logger = Logger.new($stdout)
+abc.modbus_slave.logger.level = debug_modbus ? :debug : :warn
 
 class MQTTBridge
   def initialize(abc, homie)
@@ -71,6 +78,12 @@ class MQTTBridge
             property.value = @abc.public_send(property.id.tr("-", "_"))
           end
 
+          if @abc.dhw?
+            @dhw["enabled"].value = @abc.dhw_enabled
+            @dhw["water-temperature"].value = @abc.dhw_water_temperature
+            @dhw["set-point"].value = @abc.dhw_setpoint
+          end
+
           @abc.faults.each_with_index do |fault_count, i|
             @faults["e#{i + 1}"].value = fault_count
           end
@@ -92,10 +105,10 @@ class MQTTBridge
 
   def publish_basic_attributes
     @homie_abc = @homie.node("abc", "Aurora Basic Control", "ABC") do |node|
-      node.property("compressor-speed", "Compressor Speed", :integer, @abc.compressor_speed, format: 0..1)
+      node.property("compressor-speed", "Compressor Speed", :integer, @abc.compressor_speed,
+                    format: @abc.vs_drive? ? 0..12 : 0..2)
       node.property("current-mode", "Current Heating/Cooling Mode", :enum, @abc.current_mode,
-                    format: %w[lockout standby blower h1 h2 c1 c2 eh1 eh2])
-      node.property("dhw-water-temperature", "DHW Water Temperature", :float, @abc.dhw_water_temperature, unit: "ºF")
+                    format: %w[lockout standby blower heating cooling eh1 eh2 emergency waiting dehumidify])
       node.property("entering-air-temperature", "Entering Air Temperature", :float, @abc.entering_air_temperature,
                     unit: "ºF")
       node.property("entering-water-temperature", "Entering Water Temperature", :float,
@@ -129,6 +142,20 @@ class MQTTBridge
       end
     end
 
+    if @abc.dhw?
+      @dhw = @homie.node("dhw", "Domestic Hot Water Generator", "DHW") do |node|
+        node.property("enabled", "Enabled", :boolean, @abc.dhw_enabled) do |value, property|
+          @mutex.synchronize { property.value = @abc.dhw_enabled = value }
+        end
+        node.property("water-temperature", "DHW Water Temperature", :float,
+                      @abc.dhw_water_temperature, unit: "ºF")
+        node.property("set-point", "DHW Set Point", :float, @abc.dhw_setpoint, format: 100..140,
+                                                                               unit: "ºF") do |value, property|
+          @mutex.synchronize { property.value = @abc.dhw_setpoint = value }
+        end
+      end
+    end
+
     @faults = @homie.node("faults", "Fault History", "ABC") do |node|
       @abc.faults.each_with_index do |count, i|
         name = Aurora::FAULTS[i + 1]
@@ -191,7 +218,7 @@ end
 log_level = ARGV.include?("--debug") ? :debug : :warn
 logger = Logger.new($stdout)
 logger.level = log_level
-slave.logger = logger
+abc.modbus_slave.logger = logger
 
 device = "aurora-#{abc.serial_number}"
 homie = MQTT::Homie::Device.new(device, "Aurora MQTT Bridge", mqtt: mqtt_uri)

data/exe/web_aid_tool

@@ -7,17 +7,13 @@ require "logger"
 require "optparse"
 require "yaml"
 
-debug_modbus = monitor = mock = false
+debug_modbus = monitor = false
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: web_aid_tool /path/to/serial/port [options]"
 
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
-  opts.on("--mock",
-          "Instead of talking to an actual heat pump, mock it with registers from the given YAML file (instead of a serial port)") do # rubocop:disable Layout/LineLength
-    mock = true
-  end
-  opts.on("--monitor", "Print interperted registers as they are requested, like aurora_monitor") { monitor = true }
+  opts.on("--monitor", "Print interpreted registers as they are requested, like aurora_monitor") { monitor = true }
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit
@@ -31,51 +27,9 @@ unless ARGV.length == 1
   exit 1
 end
 
-class MockSlave
-  def initialize(registers)
-    @registers = registers
-  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
-
-if mock
-  slave = MockSlave.new(YAML.load_file(ARGV[0]))
-else
-  uri = URI.parse(ARGV[0])
-
-  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(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)
-  client.logger.level = debug_modbus ? :debug : :warn
-
-  slave = client.with_slave(1)
-end
+slave = Aurora::ABCClient.open_modbus_slave(ARGV[0])
+slave.logger = Logger.new($stdout)
+slave.logger.level = debug_modbus ? :debug : :warn
 
 def parse_query_string(query_string)
   query_string.split("&").map { |p| p.split("=") }.to_h
@@ -89,6 +43,7 @@ end
 require "sinatra"
 
 set :public_folder, "html"
+set :logging, false
 
 get "/" do
   send_file "html/index.htm"
@@ -138,7 +93,10 @@ get "/request.cgi" do
       start...(start + length)
     end
     registers = slave.read_multiple_holding_registers(*queries)
-    puts Aurora.print_registers(registers) if monitor
+    if monitor
+      puts "READING"
+      puts Aurora.print_registers(registers)
+    end
     result["values"] = registers.values.join(",")
   when "putregs"
     writes = params["regs"].split(";").map do |write|
@@ -147,7 +105,6 @@ get "/request.cgi" do
     if monitor
       puts "WRITING"
       puts Aurora.print_registers(writes)
-      puts "==="
     end
 
     writes.each do |(addr, value)|

data/lib/aurora/abc_client.rb

@@ -1,13 +1,45 @@
 # frozen_string_literal: true
 
+require "yaml"
+require "uri"
+
 module Aurora
   class ABCClient
+    class << self
+      def open_modbus_slave(uri)
+        uri = URI.parse(uri)
+
+        io = case uri.scheme
+             when "tcp"
+               require "socket"
+               TCPSocket.new(uri.host, uri.port)
+             when "telnet", "rfc2217"
+               require "net/telnet/rfc2217"
+               Net::Telnet::RFC2217.new(uri.host,
+                                        port: uri.port || 23,
+                                        baud: 19_200,
+                                        parity: :even)
+
+             else
+               return Aurora::MockABC.new(YAML.load_file(uri.path)) if File.file?(uri.path)
+
+               require "ccutrer-serialport"
+               CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)
+             end
+
+        client = ::ModBus::RTUClient.new(io)
+        client.with_slave(1)
+      end
+    end
+
     attr_reader :modbus_slave,
                 :serial_number,
                 :zones,
                 :faults,
                 :current_mode,
                 :fan_speed,
+                :dhw_enabled,
+                :dhw_setpoint,
                 :entering_air_temperature,
                 :relative_humidity,
                 :leaving_air_temperature,
@@ -27,13 +59,14 @@ module Aurora
                 :loop_pump_watts,
                 :total_watts
 
-    def initialize(modbus_slave)
-      @modbus_slave = modbus_slave
+    def initialize(uri)
+      @modbus_slave = self.class.open_modbus_slave(uri)
       @modbus_slave.read_retry_timeout = 15
       @modbus_slave.read_retries = 2
-      registers_array = @modbus_slave.holding_registers[105...110]
-      registers = registers_array.each_with_index.map { |r, i| [i + 105, r] }.to_h
-      @serial_number = Aurora.transform_registers(registers)[105]
+      registers = Aurora.transform_registers(@modbus_slave.holding_registers[88..91, 105...110, 1114])
+      @program = registers[88]
+      @serial_number = registers[105]
+      @dhw_water_temperature = registers[1114]
 
       @zones = if iz2?
                  iz2_zone_count = @modbus_slave.holding_registers[483]
@@ -79,8 +112,11 @@ module Aurora
     end
 
     def refresh
-      registers_to_read = [6, 19..20, 25, 30, 340, 344, 347, 362, 740..741, 900, 1110..1111, 1114, 1147..1153, 1165,
-                           3027, 31_003]
+      registers_to_read = [6, 19..20, 25, 30, 340, 344, 347, 740..741, 900, 1110..1111, 1114, 1147..1153, 1165,
+                           31_003]
+      registers_to_read << (400..401) if dhw?
+      registers_to_read.concat([362, 3001]) if vs_drive?
+
       if zones.first.is_a?(IZ2Zone)
         zones.each_with_index do |_z, i|
           base1 = 21_203 + i * 9
@@ -100,7 +136,11 @@ module Aurora
       registers = @modbus_slave.holding_registers[*registers_to_read]
       Aurora.transform_registers(registers)
 
+      outputs = registers[30]
+
       @fan_speed                  = registers[344]
+      @dhw_enabled                = registers[400]
+      @dhw_setpoint               = registers[401]
       @entering_air_temperature   = registers[740]
       @relative_humidity          = registers[741]
       @leaving_air_temperature    = registers[900]
@@ -108,7 +148,15 @@ module Aurora
       @entering_water_temperature = registers[1111]
       @dhw_water_temperature      = registers[1114]
       @waterflow                  = registers[1117]
-      @compressor_speed           = registers[3027]
+      @compressor_speed = if vs_drive?
+                            registers[3001]
+                          elsif outputs.include?(:cc2)
+                            2
+                          elsif outputs.include?(:cc)
+                            1
+                          else
+                            0
+                          end
       @outdoor_temperature        = registers[31_003]
       @fp1                        = registers[19]
       @fp2                        = registers[20]
@@ -124,15 +172,12 @@ module Aurora
       @loop_pump_watts            = registers[1165]
       @total_watts                = registers[1153]
 
-      outputs = registers[30]
       @current_mode = if outputs.include?(:lockout)
                         :lockout
                       elsif registers[362]
                         :dehumidify
-                      elsif outputs.include?(:cc2)
-                        outputs.include?(:rv) ? :c2 : :h2
-                      elsif outputs.include?(:cc)
-                        outputs.include?(:rv) ? :c1 : :h1
+                      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)
@@ -172,7 +217,9 @@ module Aurora
     end
 
     def dhw_setpoint=(value)
-      @modbus_slave.holding_registers[401] = value
+      raise ArgumentError unless (100..140).include?(value)
+
+      @modbus_slave.holding_registers[401] = (value * 10).to_i
     end
 
     def loop_pressure_trip=(value)
@@ -193,6 +240,12 @@ module Aurora
       @modbus_slave.holding_registers[322] = value
     end
 
+    def line_voltage=(value)
+      raise ArgumentError unless (90..635).include?(value)
+
+      @modbus_slave.holding_registers[112] = value
+    end
+
     def clear_fault_history
       @modbus_slave.holding_registers[47] = 0x5555
     end
@@ -224,6 +277,14 @@ module Aurora
       @modbus_slave.holding_registers[323] = pump_speed == :with_compressor ? 0x7fff : pump_speed
     end
 
+    def vs_drive?
+      @program == "ABCVSP"
+    end
+
+    def dhw?
+      (-999..999).include?(dhw_water_temperature)
+    end
+
     # config aurora system
     { thermostat: 800, axb: 806, iz2: 812, aoc: 815, moc: 818, eev2: 824 }.each do |(component, register)|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1

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

@@ -142,6 +142,45 @@ module Aurora
     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),
@@ -157,8 +196,8 @@ module Aurora
 
   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
 
@@ -169,17 +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
+    3 => :removed,
+    0xffff => :missing
   }.freeze
 
   SYSTEM_OUTPUTS = {
@@ -202,14 +242,14 @@ module Aurora
   #  Off
 
   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)
@@ -217,9 +257,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
@@ -266,13 +307,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 = {
@@ -338,6 +402,12 @@ module Aurora
     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,
@@ -411,11 +481,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,
-                  3327, 3522,
+                  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,
@@ -429,6 +499,7 @@ 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],
@@ -440,17 +511,23 @@ module Aurora
     ->(v) { from_bitmask(v, VS_EEV2) } => [280, 3804],
     method(:vs_manual_control) => [323],
     NEGATABLE => [346, 1146],
+    ->(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, 806, 812, 815, 818, 824, 827],
-    ->(v) { from_bitmask(v, AXB_INPUTS) } => [1103],
+    ->(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],
-    method(:to_int32) => [3422, 3424],
     ->(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],
@@ -468,10 +545,11 @@ module Aurora
   }.freeze
 
   REGISTER_FORMATS = {
-    "%ds" => [1, 6, 9, 15, 84, 85],
+    "%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, 1110, 1111, 1114, 1134, 1136,
-                  3327, 3522,
+    "%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,
@@ -482,16 +560,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, 3332, 3524],
-    "%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, 3422],
-    "%dBtuh" => [1157]
+    "%dW" => [1146, 1148, 1150, 1152, 1164, 3422],
+    "%dBtuh" => [1154, 1156]
   }.freeze
 
-  def ignore(range)
-    range = (range..range) if range.is_a?(Integer)
+  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
 
@@ -621,7 +700,9 @@ module Aurora
     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", # high bit set if locked out
@@ -630,6 +711,7 @@ module Aurora
     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
@@ -643,7 +725,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",
@@ -665,6 +748,7 @@ module Aurora
     321 => "VS Pump Min",
     322 => "VS Pump Max",
     323 => "VS Pump Speed Manual Control",
+    325 => "VS Pump Output",
     326 => "VS Pump Fault",
     340 => "Blower Only Speed",
     341 => "Lo Compressor ECM Speed",
@@ -673,21 +757,28 @@ 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
+    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 Alaram 2 Trigger",
+    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",
@@ -703,6 +794,9 @@ 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",
@@ -731,19 +825,29 @@ 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)",
@@ -761,6 +865,11 @@ module Aurora
     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",
@@ -769,7 +878,11 @@ module Aurora
     3523 => "VS Drive UDC Voltage",
     3524 => "VS Drive Fan Speed",
     3804 => "VS Drive Details (EEV2 Ctl)",
-    3904 => "Leaving Air Temperature?",
+    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
@@ -786,8 +899,8 @@ module Aurora
                    .merge(faults(601..699))
                    .merge(ignore(711..717))
                    .merge(zone_registers)
-                   .merge(ignore(3423))
-                   .merge(ignore(3425))
+                   .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))

data/lib/aurora/version.rb

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

data/lib/aurora.rb

@@ -4,6 +4,7 @@ require "rmodbus"
 
 require "aurora/abc_client"
 require "aurora/iz2_zone"
+require "aurora/mock_abc"
 require "aurora/thermostat"
 require "aurora/modbus/server"
 require "aurora/modbus/slave"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -136,6 +136,7 @@ files:
 - lib/aurora/abc_client.rb
 - lib/aurora/core_ext/string.rb
 - lib/aurora/iz2_zone.rb
+- lib/aurora/mock_abc.rb
 - lib/aurora/modbus/server.rb
 - lib/aurora/modbus/slave.rb
 - lib/aurora/registers.rb