waterfurnace_aurora 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e43967c61aa8b5c445ec2a6024e9da5ba8cc94205cc853ff07fed0374827dc3
-  data.tar.gz: 875004f5c9835f25f7c18d7e7e7d632f0877db6ac7a3fc8215fa28b68c5ce2b9
+  metadata.gz: 16b9a4ef085dc672bf6b360947c70a959f03b3406f0c2dae4eac614a2f12c412
+  data.tar.gz: 5a7ef967170bd5440b94407e05cfe6e2f1bae40d838a23de26d442a1e4fa9a14
 SHA512:
-  metadata.gz: f5d48422906f8dbac8aa83645ab3f46a9481f96d7e4720b75772dfbf2be2cf8456753f5d364a4cde3ad69fb778fd3ba29f23249ec08010806339039264bcbefc
-  data.tar.gz: 3a78e33d93f256e0153ae98b7f8df92da2f3138c246e1b5ef47550f4759d5502725a1d52acb6fe3f084b8a158962538ed73a3c1acf072cc151bf18ad9db2f75d
+  metadata.gz: d31c1d4a82dc9420adedd8b5043ebde59845eb5cc90c14109ad51d533687e0fa7010e91c04858773d9f40523f534118d72f891fb673344810244e2d121c0b764
+  data.tar.gz: b83b92e7b7ad9ecb2dda5eae57d2d460a82285420e169acc317c54390234cc123bead659fc56e2be53dbb602dd24e0b4cce66bd4223bd52badd7d543d641a4a7

data/exe/aurora_monitor

@@ -30,7 +30,7 @@ end
 
 options.parse!
 
-unless ARGV.length == 2
+unless ARGV.length == 1
   puts options
   exit 1
 end
@@ -39,8 +39,8 @@ uri = URI.parse(ARGV[0])
 
 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
+SENSOR_REGISTERS = [16, 19, 20, 740, 900, 901, 903, 908, 909, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117,
+                    1134, 1148, 1149, 1150, 1151, 1152, 1153, 1164, 1165, 3326, 3330].freeze
 
 io = case uri.scheme
      when "tcp"
@@ -76,7 +76,11 @@ diff_and_print = lambda do |registers|
 end
 
 server.request_callback = lambda { |uid, func, req|
-  if func == 68
+  if func == 6
+    puts "#{Time.now} ===== write register to #{uid}:"
+    registers = { req[:addr] => req[:val] }
+    puts Aurora.print_registers(registers)
+  elsif func == 68
     puts "#{Time.now} ===== no idea to #{uid}: #{req.inspect}" unless diff_only
   elsif func == 67
     puts "#{Time.now} ===== write discontiguous registers to #{uid}:"
@@ -125,7 +129,7 @@ server.response_callback = lambda { |uid, func, res, req|
     puts "#{Time.now} ===== read discontiguous registers from #{uid}" unless diff_only
     registers = req.zip(res).to_h
     diff_and_print.call(registers)
-  elsif [16, 67, 68].include?(func)
+  elsif [6, 16, 67, 68].include?(func)
     # no output
   else
     puts "#{Time.now} **** new func #{func}"

data/exe/aurora_mqtt_bridge

@@ -74,30 +74,26 @@ class MQTTBridge
       begin
         @mutex.synchronize do
           @abc.refresh
-          @homie_abc.each do |property|
-            property.value = @abc.public_send(property.id.tr("-", "_"))
-          end
 
-          @blower.each do |property|
-            property.value = @abc.blower.public_send(property.id.tr("-", "_"))
+          components = { @homie_abc => @abc,
+                         @compressor => @abc.compressor,
+                         @blower => @abc.blower,
+                         @pump => @abc.pump,
+                         @dhw => @abc.dhw }.compact
+          @abc.zones.each_with_index do |z, idx|
+            homie_zone = @homie["zone#{idx + 1}"]
+            components[homie_zone] = z
           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
+          components.each do |(node, object)|
+            node.each do |property|
+              property.value = object.public_send(property.id.tr("-", "_"))
+            end
           end
 
           @abc.faults.each_with_index do |fault_count, i|
             @faults["e#{i + 1}"].value = fault_count
           end
-
-          @abc.zones.each_with_index do |z, idx|
-            homie_zone = @homie["zone#{idx + 1}"]
-            homie_zone.each do |property|
-              property.value = z.public_send(property.id.tr("-", "_"))
-            end
-          end
         end
       rescue => e
         warn "got garbage: #{e}; #{e.backtrace}"
@@ -109,8 +105,6 @@ 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: @abc.vs_drive? ? 0..12 : 0..2)
       node.property("current-mode", "Current Heating/Cooling Mode", :enum, @abc.current_mode,
                     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,
@@ -126,16 +120,31 @@ class MQTTBridge
       end
       node.property("relative-humidity", "Relative Humidity", :integer, @abc.relative_humidity, unit: "%",
                                                                                                 format: 0..100)
-      node.property("waterflow", "Waterflow", :float, @abc.waterflow, unit: "gpm")
       node.property("fp1", "FP1 Sensor", :float, @abc.fp1, unit: "ºF")
       node.property("fp2", "FP2 Sensor", :float, @abc.fp2, unit: "ºF")
-      %i[compressor aux_heat loop_pump total].each do |component|
+      %i[aux_heat total].each do |component|
         component = "#{component}_watts"
         node.property(component.tr("_", "-"), component.tr("_", " ").titleize, :integer,
                       @abc.public_send(component), unit: "W")
       end
     end
 
+    @compressor = @homie.node("compressor", "Compressor", @abc.compressor.type) do |node|
+      node.property("speed", "Current compressor speed", :integer, @abc.compressor.speed,
+                    format: @abc.compressor.speed_range)
+      node.property("watts", "Energy Usage", :integer, @abc.compressor.watts, unit: "W") if @abc.energy_monitoring?
+
+      next unless @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
+
+      node.property("ambient-temperature", "Compressor ambient temperature", :float,
+                    @abc.compressor.ambient_temperature, unit: "ºF")
+
+      next unless @abc.iz2?
+
+      node.property("iz2-desired-speed", "IZ2 Desired Speed", :integer, @abc.compressor.iz2_desired_speed,
+                    format: 0..12)
+    end
+
     @blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
       if @abc.blower.respond_to?(:running)
         node.property("running", "Blower is running", :boolean, @abc.blower.running?)
@@ -143,31 +152,58 @@ class MQTTBridge
         node.property("speed", "Current blower speed", :integer, @abc.blower.speed, format: @abc.blower.speed_range)
       end
       node.property("watts", "Energy Usage", :integer, @abc.blower.watts, unit: "W") if @abc.energy_monitoring?
-      if @abc.blower.is_a?(Aurora::Blower::ECM)
-        %w[blower-only low-compressor high-compressor aux-heat].each do |setting|
-          field = "#{setting.tr('-', '_')}_speed"
-          node.property("#{setting}-speed", "#{setting.tr('-', ' ').titleize} Speed", :integer,
-                        @abc.blower.public_send(field), format: 1..12) do |value, property|
-            @mutex.synchronize { property.value = @abc.blower.public_send("#{field}=", value) }
-          end
-        end
-        if @abc.iz2?
-          node.property("iz2-desired-speed", "IZ2 Desired Speed", :integer, @abc.blower.iz2_desired_speed,
-                        format: 0..100, unit: "%")
+
+      next unless @abc.blower.is_a?(Aurora::Blower::ECM)
+
+      presets = %w[blower-only aux-heat]
+      presets.concat %w[low-compressor high-compressor] unless @abc.iz2?
+      presets.each do |setting|
+        field = "#{setting.tr('-', '_')}_speed"
+        node.property("#{setting}-speed", "#{setting.tr('-', ' ').titleize} Preset Speed", :integer,
+                      @abc.blower.public_send(field), format: 1..12) do |value, property|
+          @mutex.synchronize { property.value = @abc.blower.public_send("#{field}=", value) }
         end
       end
+
+      next unless @abc.iz2?
+
+      node.property("iz2-desired-speed", "IZ2 Desired Speed", :integer, @abc.blower.iz2_desired_speed,
+                    format: 0..100, unit: "%")
+    end
+
+    @pump = @homie.node("pump", "Loop Pump", @abc.pump.type) do |node|
+      node.property("waterflow", "Waterflow", :float, @abc.pump.waterflow, unit: "gpm")
+      node.property("watts", "Energy Usage", :integer, @abc.pump.watts, unit: "W") if @abc.energy_monitoring?
+
+      next unless @abc.pump.is_a?(Aurora::Pump::VSPump)
+
+      node.property("speed", "Speed", :integer, @abc.pump.speed, format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.speed = value }
+      end
+      node.property("manual-control", "If manual control is enabled", :boolean,
+                    @abc.pump.manual_control?) do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.manual_control = value }
+      end
+      node.property("minimum-speed", "Speed pump runs at compressor speed 0", :integer, @abc.pump.minimum_speed,
+                    format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.minimum_speed = value }
+      end
+      node.property("maximum-speed", "Speed pump runs at compressor speed 12", :integer, @abc.pump.minimum_speed,
+                    format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.maximum_speed = value }
+      end
     end
 
-    if @abc.dhw?
+    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 }
+        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 }
+        node.property("water-temperature", "Water Temperature", :float,
+                      @abc.dhw.water_temperature, unit: "ºF")
+        node.property("set-point", "Set Point", :float, @abc.dhw.set_point, format: 100..140,
+                                                                            unit: "ºF") do |value, property|
+          @mutex.synchronize { property.value = @abc.dhw.set_point = value }
         end
       end
     end
@@ -188,25 +224,21 @@ class MQTTBridge
                       format: allowed_modes) do |value, property|
           @mutex.synchronize { property.value = zone.target_mode = value.to_sym }
         end
-        if zone.respond_to?(:current_mode) # TODO: implement for non-IZ2
-          node.property("current-mode", "Current Heating/Cooling Mode Requested", :enum, zone.current_mode,
-                        format: %w[standby h1 h2 h3 c1 c2])
-        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, zone.target_fan_mode,
                       format: %w[auto continuous intermittent]) do |value, property|
           @mutex.synchronize { property.value = zone.target_fan_mode = value.to_sym }
         end
-        if zone.respond_to?(:current_fan_mode) # TODO: implement for non-IZ2
-          node.property("current-fan-mode", "Current Fan Status", :boolean, zone.current_fan_mode)
-          node.property("fan-intermittent-on", "Fan Intermittent Mode On Duration", :enum, zone.fan_intermittent_on,
-                        unit: "M", format: %w[0 5 10 15 20]) do |value, property|
-            @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
-          end
-          node.property("fan-intermittent-off", "Fan Intermittent Mode Off Duration", :enum, zone.fan_intermittent_on,
-                        unit: "M", format: %w[0 5 10 15 20 25 30 35 40]) do |value, property|
-            @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
-          end
+        node.property("fan-intermittent-on", "Fan Intermittent Mode On Duration", :enum, zone.fan_intermittent_on,
+                      unit: "M", format: %w[0 5 10 15 20]) do |value, property|
+          @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
+        end
+        node.property("fan-intermittent-off", "Fan Intermittent Mode Off Duration", :enum, zone.fan_intermittent_on,
+                      unit: "M", format: %w[0 5 10 15 20 25 30 35 40]) do |value, property|
+          @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
         end
+        node.property("current-fan-mode", "Current Fan Status", :boolean, zone.current_fan_mode)
         if zone.is_a?(Aurora::IZ2Zone)
           node.property("priority", "Zone Priority", :enum, zone.priority, format: %w[economy comfort])
           node.property("size", "Size", :enum, zone.size, format: %w[0 25 45 70])

data/lib/aurora/abc_client.rb

@@ -4,7 +4,10 @@ require "yaml"
 require "uri"
 
 require "aurora/blower"
+require "aurora/compressor"
+require "aurora/dhw"
 require "aurora/iz2_zone"
+require "aurora/pump"
 require "aurora/thermostat"
 
 module Aurora
@@ -39,50 +42,55 @@ module Aurora
     attr_reader :modbus_slave,
                 :serial_number,
                 :zones,
+                :compressor,
                 :blower,
+                :pump,
+                :dhw,
                 :faults,
                 :current_mode,
-                :dhw_enabled,
-                :dhw_setpoint,
                 :entering_air_temperature,
                 :relative_humidity,
                 :leaving_air_temperature,
                 :leaving_water_temperature,
                 :entering_water_temperature,
-                :dhw_water_temperature,
-                :waterflow,
-                :compressor_speed,
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
-                :compressor_watts,
                 :aux_heat_watts,
-                :loop_pump_watts,
                 :total_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[88..91, 105...110, 404, 412, 1114]
+      raw_registers = @modbus_slave.holding_registers[88..91, 105...110, 404, 412..413, 1114]
       registers = Aurora.transform_registers(raw_registers.dup)
       @program = registers[88]
       @serial_number = registers[105]
-      @dhw_water_temperature = registers[1114]
       @energy_monitor = raw_registers[412]
 
-      @blower = case raw_registers[404]
-                when 1, 2 then Blower::ECM.new(self, registers[404])
-                when 3 then Blower::FiveSpeed.new(self, registers[404])
-                else; Blower::PSC.new(self, registers[404])
-                end
-
       @zones = if iz2?
                  iz2_zone_count = @modbus_slave.holding_registers[483]
                  (0...iz2_zone_count).map { |i| IZ2Zone.new(self, i + 1) }
                else
                  [Thermostat.new(self)]
                end
+
+      @compressor = @program == "ABCVSP" ? Compressor::VSDrive.new(self) : Compressor::GenericCompressor.new(self)
+      @blower = case raw_registers[404]
+                when 1, 2 then Blower::ECM.new(self, registers[404])
+                when 3 then Blower::FiveSpeed.new(self, registers[404])
+                else; Blower::PSC.new(self, registers[404])
+                end
+      @pump = if (3..5).include?(raw_registers[413])
+                Pump::VSPump.new(self,
+                                 registers[413])
+              else
+                Pump::GenericPump.new(self,
+                                      registers[413])
+              end
+      @dhw = DHW.new(self) if (-999..999).include?(registers[1114])
+
       @faults = []
     end
 
@@ -121,25 +129,18 @@ module Aurora
     end
 
     def refresh
-      registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165,
+      registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1110..1111, 1114, 1150..1153, 1165,
                            31_003]
-      registers_to_read << (400..401) if dhw?
-      registers_to_read.concat(blower.registers_to_read)
-      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
-          base2 = 31_007 + i * 3
-          base3 = 31_200 + i * 3
-          registers_to_read << (base1..(base1 + 1))
-          registers_to_read << (base2..(base2 + 2))
-          registers_to_read << base3
-        end
-      else
-        registers_to_read << 502
-        registers_to_read << (745..746)
+      zones.each do |z|
+        registers_to_read.concat(z.registers_to_read)
       end
+      registers_to_read.concat(compressor.registers_to_read)
+      registers_to_read.concat(blower.registers_to_read)
+      registers_to_read.concat(pump.registers_to_read)
+      registers_to_read.concat(dhw.registers_to_read) if dhw
+      # need dehumidify mode to calculate final current mode;
+      # apparently non-VSD doesn't have this register at all?
+      registers_to_read.concat([362]) if compressor.is_a?(Compressor::VSDrive)
 
       @faults = @modbus_slave.holding_registers[601..699]
 
@@ -148,24 +149,11 @@ module Aurora
 
       outputs = registers[30]
 
-      @dhw_enabled                = registers[400]
-      @dhw_setpoint               = registers[401]
       @entering_air_temperature   = registers[740]
       @relative_humidity          = registers[741]
       @leaving_air_temperature    = registers[900]
       @leaving_water_temperature  = registers[1110]
       @entering_water_temperature = registers[1111]
-      @dhw_water_temperature      = registers[1114]
-      @waterflow                  = registers[1117]
-      @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]
@@ -173,9 +161,7 @@ module Aurora
       @error                      = registers[25] & 0x7fff
       @derated                    = (41..46).include?(@error)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@error)
-      @compressor_watts           = registers[1147]
       @aux_heat_watts             = registers[1151]
-      @loop_pump_watts            = registers[1165]
       @total_watts                = registers[1153]
 
       @current_mode = if outputs.include?(:lockout)
@@ -196,23 +182,13 @@ module Aurora
                         :standby
                       end
 
-      blower.refresh(registers)
-
       zones.each do |z|
         z.refresh(registers)
       end
-    end
-
-    def blower_only_ecm_speed=(value)
-      return unless (1..12).include?(value)
-
-      @modbus_slave.holding_registers[340] = value
-    end
-
-    def aux_heat_ecm_speed=(value)
-      return unless (1..12).include?(value)
-
-      @modbus_slave.holding_registers[347] = value
+      compressor.refresh(registers)
+      blower.refresh(registers)
+      pump.refresh(registers)
+      dhw&.refresh(registers)
     end
 
     def cooling_airflow_adjustment=(value)
@@ -220,34 +196,10 @@ module Aurora
       @modbus_slave.holding_registers[346] = value
     end
 
-    def dhw_enabled=(value)
-      @modbus_slave.holding_registers[400] = value ? 1 : 0
-    end
-
-    def dhw_setpoint=(value)
-      raise ArgumentError unless (100..140).include?(value)
-
-      @modbus_slave.holding_registers[401] = (value * 10).to_i
-    end
-
     def loop_pressure_trip=(value)
       @modbus_slave.holding_registers[419] = (value * 10).to_i
     end
 
-    def vs_pump_control=(value)
-      raise ArgumentError unless (value = VS_PUMP_CONTROL.invert[value])
-
-      @modbus_slave.holding_registers[323] = value
-    end
-
-    def vs_pump_min=(value)
-      @modbus_slave.holding_registers[321] = value
-    end
-
-    def vs_pump_max=(value)
-      @modbus_slave.holding_registers[322] = value
-    end
-
     def line_voltage=(value)
       raise ArgumentError unless (90..635).include?(value)
 
@@ -289,14 +241,6 @@ module Aurora
       @energy_monitor == 2
     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/component.rb

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

data/lib/aurora/compressor.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Compressor
+    class GenericCompressor < Component
+      attr_reader :speed, :watts
+
+      def type
+        "Compressor"
+      end
+
+      def speed_range
+        0..2
+      end
+
+      def registers_to_read
+        if abc.energy_monitoring?
+          [1146..1147]
+        else
+          []
+        end
+      end
+
+      def refresh(registers)
+        outputs = registers[30]
+        @speed = if outputs.include?(:cc2)
+                   2
+                 elsif outputs.include?(:cc)
+                   1
+                 else
+                   0
+                 end
+        @watts = registers[1146] if abc.energy_monitoring?
+      end
+    end
+
+    class VSDrive < GenericCompressor
+      attr_reader :ambient_temperature, :iz2_desired_speed
+
+      def type
+        "Variable Speed Drive"
+      end
+
+      def speed_range
+        0..12
+      end
+
+      def registers_to_read
+        result = super + [209, 3001, 3326]
+        result << 564 if abc.iz2?
+        result
+      end
+
+      def refresh(registers)
+        super
+
+        @speed = registers[3001]
+        @ambient_temperature = registers[3326]
+        @iz2_desired_speed = registers[564] if abc.iz2?
+      end
+    end
+  end
+end

data/lib/aurora/dhw.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  class DHW < Component
+    attr_reader :enabled, :set_point, :water_temperature
+
+    def registers_to_read
+      [400..401, 1114]
+    end
+
+    def refresh(registers)
+      @enabled = registers[400]
+      @set_point = registers[401]
+      @water_temperature = registers[1114]
+    end
+
+    def enabled=(value)
+      holding_registers[400] = value ? 1 : 0
+    end
+
+    def set_point=(value) # rubocop:disable Naming/AccessorMethodName
+      raise ArgumentError unless (100..140).include?(value)
+
+      raw_value = (value * 10).to_i
+      holding_registers[401] = raw_value
+      @set_point = value
+    end
+  end
+end

data/lib/aurora/iz2_zone.rb

@@ -5,18 +5,22 @@ require "aurora/thermostat"
 module Aurora
   class IZ2Zone < Thermostat
     attr_reader :zone_number,
-                :current_mode,
-                :current_fan_mode,
-                :fan_intermittent_on,
-                :fan_intermittent_off,
                 :priority,
-                :size, :normalized_size
+                :size,
+                :normalized_size
 
     def initialize(abc, zone_number)
       super(abc)
       @zone_number = zone_number
     end
 
+    def registers_to_read
+      base1 = 21_203 + (zone_number - 1) * 9
+      base2 = 31_007 + (zone_number - 1) * 3
+      base3 = 31_200 + (zone_number - 1) * 3
+      [base1..(base1 + 1), base2..(base2 + 2), base3]
+    end
+
     def refresh(registers)
       @ambient_temperature = registers[31_007 + (zone_number - 1) * 3]
 
@@ -41,28 +45,28 @@ module Aurora
     def target_mode=(value)
       return unless (raw_value = Aurora::HEATING_MODE.invert[value])
 
-      @abc.modbus_slave.holding_registers[21_202 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_202 + (zone_number - 1) * 9] = raw_value
       @target_mode = value
     end
 
     def target_fan_mode=(value)
       return unless (raw_value = Aurora::FAN_MODE.invert[value])
 
-      @abc.modbus_slave.holding_registers[21_205 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_205 + (zone_number - 1) * 9] = raw_value
       @target_fan_mode = value
     end
 
     def fan_intermittent_on=(value)
       return unless value >= 0 && value <= 25 && (value % 5).zero?
 
-      @abc.modbus_slave.holding_registers[21_206 + (zone_number - 1) * 9] = value
+      holding_registers[21_206 + (zone_number - 1) * 9] = value
       @fan_intermittent_on = value
     end
 
     def fan_intermittent_off=(value)
       return unless value >= 0 && value <= 40 && (value % 5).zero?
 
-      @abc.modbus_slave.holding_registers[21_207 + (zone_number - 1) * 9] = value
+      holding_registers[21_207 + (zone_number - 1) * 9] = value
       @fan_intermittent_off = value
     end
 
@@ -70,7 +74,7 @@ module Aurora
       return unless value >= 40 && value <= 90
 
       raw_value = (value * 10).to_i
-      @abc.modbus_slave.holding_registers[21_203 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_203 + (zone_number - 1) * 9] = raw_value
       @heating_target_temperature = value
     end
 
@@ -78,8 +82,8 @@ module Aurora
       return unless value >= 54 && value <= 99
 
       raw_value = (value * 10).to_i
-      @abc.modbus_slave.holding_registers[21_204 + (zone_number - 1) * 9] = value
-      @cooling_target_temperature = raw_value
+      holding_registers[21_204 + (zone_number - 1) * 9] = raw_value
+      @cooling_target_temperature = value
     end
   end
 end

data/lib/aurora/mock_abc.rb

@@ -44,5 +44,6 @@ module Aurora
     def write_holding_register(addr, value)
       @registers[addr] = value
     end
+    alias []= write_holding_register
   end
 end

data/lib/aurora/pump.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Pump
+    class GenericPump < Component
+      attr_reader :type, :watts, :waterflow
+
+      def initialize(abc, type)
+        super(abc)
+        @type = type
+      end
+
+      def registers_to_read
+        result = [1117]
+        result.concat([1164..1165]) if abc.energy_monitoring?
+        result
+      end
+
+      def refresh(registers)
+        @waterflow = registers[1117]
+        @watts = registers[1164] if abc.energy_monitoring?
+      end
+    end
+
+    class VSPump < GenericPump
+      attr_reader :speed, :minimum_speed, :maximum_speed, :manual_control
+      alias manual_control? manual_control
+
+      def registers_to_read
+        super + [321..325]
+      end
+
+      def refresh(registers)
+        super
+        @minimum_speed = registers[321]
+        @maximum_speed = registers[322]
+        @manual_control = registers[323] != :off
+        @speed = registers[325]
+      end
+
+      def manual_control=(value)
+        holding_registers[323] = value ? speed : 0x7fff
+      end
+
+      { speed: 323,
+        minimum_speed: 321,
+        maximum_speed: 322 }.each do |(setting, register)|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{setting}=(value)
+            raise ArgumentError unless (1..100).include?(value)
+
+            holding_registers[#{register}] = value
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/aurora/registers.rb

@@ -420,6 +420,15 @@ module Aurora
     end
   end
 
+  def thermostat_configuration2(value)
+    result = {
+      mode: HEATING_MODE[(value >> 8) & 0x07]
+    }
+    leftover = value & ~0x0700
+    result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
+    result
+  end
+
   def zone_configuration1(value)
     fan = if value & 0x80 == 0x80
             :continuous
@@ -433,7 +442,7 @@ module Aurora
       on_time: ((value >> 9) & 0x7) * 5,
       off_time: (((value >> 12) & 0x7) + 1) * 5,
       cooling_target_temperature: ((value & 0x7e) >> 1) + 36,
-      heating_target_temperature_carry: value & 0o1
+      heating_target_temperature_carry: value & 0x01
     }
     leftover = value & ~0x7fff
     result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
@@ -476,7 +485,7 @@ module Aurora
   REGISTER_CONVERTERS = {
     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,
+    TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900, 901, 903,
                   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,
@@ -503,7 +512,7 @@ module Aurora
     ->(v) { from_bitmask(v, VS_ALARM2) } => [218, 3227],
     ->(v) { from_bitmask(v, VS_EEV2) } => [280, 3804],
     method(:vs_manual_control) => [323],
-    NEGATABLE => [346, 1146],
+    NEGATABLE => [346],
     ->(v) { BRINE_TYPE[v] } => [402],
     ->(v) { FLOW_METER_TYPE[v] } => [403],
     ->(v) { BLOWER_TYPE[v] } => [404],
@@ -521,12 +530,13 @@ module Aurora
     ->(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(:thermostat_configuration2) => [12_006],
     ->(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],
     ->(v) { { humidification_target: v >> 8, dehumidification_target: v & 0xff } } => [31_110],
     method(:iz2_demand) => [31_005],
-    method(:zone_configuration1) => [31_008, 31_011, 31_014, 31_017, 31_020, 31_023],
+    method(:zone_configuration1) => [12_005, 31_008, 31_011, 31_014, 31_017, 31_020, 31_023],
     method(:zone_configuration2) => [31_009, 31_012, 31_015, 31_018, 31_021, 31_024],
     method(:zone_configuration3) => [31_200, 31_203, 31_206, 31_209, 31_212, 31_215],
     ->(registers, idx) { to_string(registers, idx, 13) } => [31_400],
@@ -540,7 +550,7 @@ module Aurora
   REGISTER_FORMATS = {
     "%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,
+    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900, 903,
                   1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
                   3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
                   12_619, 12_620,
@@ -553,8 +563,8 @@ module Aurora
                   31_003,
                   31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
     "E%d" => [25, 26],
-    "%d%%" => [282, 321, 322, 325, 346, 565, 741, 1126, 3332, 3524, 3808],
-    "%0.1f psi" => [419, 1115, 1116, 1119, 3322, 3323],
+    "%d%%" => [282, 321, 322, 325, 346, 565, 741, 908, 1126, 3332, 3524, 3808],
+    "%0.1f psi" => [419, 901, 1115, 1116, 1119, 3322, 3323],
     "%0.1fA" => [1105, 1106, 1107, 1108],
     "%0.1fgpm" => [1117],
     "%dW" => [1146, 1148, 1150, 1152, 1164, 3422],
@@ -812,6 +822,10 @@ module Aurora
     828 => "AWL Version",
     829 => "AWL Revision",
     900 => "Leaving Air",
+    901 => "Suction Pressure",
+    903 => "SuperHeat Temperature",
+    908 => "EEV Open %",
+    909 => "SubCooling (Cooling)",
     1103 => "AXB Inputs",
     1104 => "AXB Outputs",
     1105 => "Blower Amps",
@@ -841,10 +855,6 @@ module Aurora
     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 Desired",
     3001 => "Compressor Speed Actual",
     3002 => "Manual Operation",
@@ -876,6 +886,14 @@ module Aurora
     3904 => "VS Drive Leaving Air Temperature?",
     3905 => "VS Drive Saturated Evaporator Discharge Temperature",
     3906 => "VS Drive SuperHeat Temperature",
+    12_005 => "Fan Configuration",
+    12_006 => "Heating Mode",
+    12_606 => "Heating Mode (write)",
+    12_619 => "Heating Setpoint (write)",
+    12_620 => "Cooling Setpoint (write)",
+    12_621 => "Fan Mode (write)",
+    12_622 => "Intermittent Fan On Time (write)",
+    12_623 => "Intermittent Fan Off Time (write)",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
     31_109 => "Humidifier Mode", # write to 21114

data/lib/aurora/thermostat.rb

@@ -5,15 +5,39 @@ require "aurora/component"
 module Aurora
   class Thermostat < Component
     attr_reader :target_mode,
+                :current_mode,
                 :target_fan_mode,
+                :current_fan_mode,
                 :ambient_temperature,
                 :cooling_target_temperature,
-                :heating_target_temperature
+                :heating_target_temperature,
+                :fan_intermittent_on,
+                :fan_intermittent_off
+
+    def registers_to_read
+      [31, 502, 745..746, 12_005..12_006]
+    end
 
     def refresh(registers)
       @ambient_temperature = registers[502]
-      @heating_target_temperature = registers[746]
-      @cooling_target_temperature = registers[745]
+      @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]
+
+      inputs = registers[31]
+      @current_fan_mode = inputs.include?(:g)
+      @current_mode = if inputs[:y2]
+                        inputs[:o] ? :c2 : :h2
+                      elsif inputs[:y1]
+                        inputs[:o] ? :c1 : :h1
+                      else
+                        :standby
+                      end
     end
 
     def target_mode=(value)
@@ -46,10 +70,18 @@ module Aurora
       @cooling_target_temperature = value
     end
 
-    def inspect
-      "#<Aurora::#{self.class.name} #{(instance_variables - [:@abc]).map do |iv|
-                                        "#{iv}=#{instance_variable_get(iv).inspect}"
-                                      end.join(', ')}>"
+    def fan_intermittent_on=(value)
+      return unless value >= 0 && value <= 25 && (value % 5).zero?
+
+      holding_registers[12_622] = value
+      @fan_intermittent_on = value
+    end
+
+    def fan_intermittent_off=(value)
+      return unless value >= 0 && value <= 40 && (value % 5).zero?
+
+      holding_registers[12_623] = value
+      @fan_intermittent_off = value
     end
   end
 end

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -136,11 +136,14 @@ files:
 - lib/aurora/abc_client.rb
 - lib/aurora/blower.rb
 - lib/aurora/component.rb
+- lib/aurora/compressor.rb
 - lib/aurora/core_ext/string.rb
+- lib/aurora/dhw.rb
 - lib/aurora/iz2_zone.rb
 - lib/aurora/mock_abc.rb
 - lib/aurora/modbus/server.rb
 - lib/aurora/modbus/slave.rb
+- lib/aurora/pump.rb
 - lib/aurora/registers.rb
 - lib/aurora/thermostat.rb
 - lib/aurora/version.rb