waterfurnace_aurora 0.4.5 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 792824de511d596a9c0cacc0ef0eae5385e0ec72e4c9da1765292d4825256769
-  data.tar.gz: 9cbd94692b1074e7430e6089348d07d5a31506f6e679d82aaa8762316efbf634
+  metadata.gz: a372b51d3240840ae96269020f73728fb049f3e6c0438613c9659d4158d21aa6
+  data.tar.gz: 249e26d5764a0ab670a60b5de7ed6da0796344fd71896c6c33d353fc4a7d95ed
 SHA512:
-  metadata.gz: cec2a4f8ef4353a3c824af4d701dc6fe8ccc904d2ead6176b3507828023430ff335a6d2f2a5132e764d21adf8242973677d0b857079c74f16e8b49ae14a45977
-  data.tar.gz: c52dfdbc4e6e18c636c3e61226b11f7b4cc056fd76413794a41235936783f07ea09f46db77a901c02957a50ba82555cf35e84794c8903d73b00cf2fd830b480b
+  metadata.gz: c5c5ef5a5e1d6ec3d393913ca1b717a5a53a5f17c51f2c9b8ea0f6aeb627cdc873fa25e22511a779d7b9c0e9a60fdc21bc63dbb1fb0d8f6baa41c3dada85cb91
+  data.tar.gz: ee787175c344db12fe11f0dab4131505e5692ca360adeee78bcd0931bd4b28660de9c0d09817c5f30632808b374a3695f8a8cbf9f1e965bf410648f411ffa958

data/exe/aurora_mqtt_bridge

@@ -46,8 +46,20 @@ class MQTTBridge
         when /\$modbus$/
           registers = @abc.query_registers(value)
           Aurora.print_registers(registers) do |register, v|
-            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, qos: 1)
           end
+        when %r{\$modbus/getregs}
+          query_id, query = value.split(":")
+          queries = query.split(";").map do |range|
+            start, length = range.split(",").map(&:to_i)
+            next start if length.nil?
+
+            start...(start + length)
+          end
+          registers = @abc.modbus_slave.read_multiple_holding_registers(*queries)
+          result = registers.values.join(",")
+          @homie.mqtt.publish("#{@homie.topic}/$modbus/getregs/response",
+                              "#{query_id}:#{result}", qos: 1)
         when %r{\$modbus/(\d+)/set$}
           register = $1.to_i
           value = case value
@@ -59,7 +71,7 @@ class MQTTBridge
           @abc.modbus_slave.holding_registers[register] = value if value
           registers = { register => @abc.modbus_slave.holding_registers[register] }
           Aurora.print_registers(registers) do |r, v|
-            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{r}", v, retain: false, qos: 1)
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{r}", v, qos: 1)
           end
         end
       end
@@ -76,8 +88,11 @@ class MQTTBridge
           @abc.refresh
 
           components = { @homie_abc => @abc,
+                         @compressor => @abc.compressor,
                          @blower => @abc.blower,
-                         @pump => @abc.pump }
+                         @pump => @abc.pump,
+                         @dhw => @abc.dhw,
+                         @humidifier => @abc.humidifier }.compact
           @abc.zones.each_with_index do |z, idx|
             homie_zone = @homie["zone#{idx + 1}"]
             components[homie_zone] = z
@@ -89,12 +104,6 @@ class MQTTBridge
             end
           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
@@ -109,8 +118,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,
@@ -128,13 +135,29 @@ class MQTTBridge
                                                                                                 format: 0..100)
       node.property("fp1", "FP1 Sensor", :float, @abc.fp1, unit: "ºF")
       node.property("fp2", "FP2 Sensor", :float, @abc.fp2, unit: "ºF")
-      %i[compressor aux_heat 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?)
@@ -154,10 +177,11 @@ class MQTTBridge
           @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: "%")
-      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|
@@ -183,21 +207,30 @@ class MQTTBridge
       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
 
+    if @abc.humidifier
+      @humidifier = @homie.node("humidifier", "Humidifier", "Humidifier") do |node|
+        node.property("running", "Humidifier is running", :boolean, @abc.humidifier.running?)
+      end
+    end
+
     @faults = @homie.node("faults", "Fault History", "ABC") do |node|
+      node.property("clear-history", "Reset fault counts", :enum, retained: false, format: "clear") do |_|
+        @mutex.synchronize { @abc.clear_fault_history }
+      end
       @abc.faults.each_with_index do |count, i|
         name = Aurora::FAULTS[i + 1]
         node.property("e#{i + 1}", name || "E#{i + 1}", :integer, count)
@@ -213,25 +246,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])
@@ -251,6 +280,7 @@ class MQTTBridge
 
     # direct access to modbus registers for debugging purposes
     @homie.mqtt.subscribe("#{@homie.topic}/$modbus")
+    @homie.mqtt.subscribe("#{@homie.topic}/$modbus/getregs")
     @homie.mqtt.subscribe("#{@homie.topic}/$modbus/+/set")
     @homie.publish
   end

data/lib/aurora/abc_client.rb

@@ -4,6 +4,9 @@ require "yaml"
 require "uri"
 
 require "aurora/blower"
+require "aurora/compressor"
+require "aurora/dhw"
+require "aurora/humidifier"
 require "aurora/iz2_zone"
 require "aurora/pump"
 require "aurora/thermostat"
@@ -24,7 +27,9 @@ module Aurora
                                         port: uri.port || 23,
                                         baud: 19_200,
                                         parity: :even)
-
+             when "mqtt", "mqtts"
+               require "aurora/mqtt_modbus"
+               return Aurora::MQTTModBus.new(uri)
              else
                return Aurora::MockABC.new(YAML.load_file(uri.path)) if File.file?(uri.path)
 
@@ -40,23 +45,21 @@ module Aurora
     attr_reader :modbus_slave,
                 :serial_number,
                 :zones,
+                :compressor,
                 :blower,
                 :pump,
+                :dhw,
+                :humidifier,
                 :faults,
                 :current_mode,
-                :dhw_enabled,
-                :dhw_setpoint,
                 :entering_air_temperature,
                 :relative_humidity,
                 :leaving_air_temperature,
                 :leaving_water_temperature,
                 :entering_water_temperature,
-                :dhw_water_temperature,
-                :compressor_speed,
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
-                :compressor_watts,
                 :aux_heat_watts,
                 :total_watts
 
@@ -64,13 +67,26 @@ module Aurora
       @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..413, 1114]
+      raw_registers = @modbus_slave.holding_registers[33, 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]
 
+      @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
+
+      @abc_dipswitches = registers[33]
+      @compressor = if @program == "ABCVSP"
+                      Compressor::VSDrive.new(self)
+                    else
+                      Compressor::GenericCompressor.new(self,
+                                                        @abc_dipswitches[:compressor])
+                    end
       @blower = case raw_registers[404]
                 when 1, 2 then Blower::ECM.new(self, registers[404])
                 when 3 then Blower::FiveSpeed.new(self, registers[404])
@@ -83,13 +99,9 @@ module Aurora
                 Pump::GenericPump.new(self,
                                       registers[413])
               end
+      @dhw = DHW.new(self) if (-999..999).include?(registers[1114])
+      @humidifier = Humidifier.new(self) if @abc_dipswitches[:accessory_relay] == :humidifier
 
-      @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
       @faults = []
     end
 
@@ -128,51 +140,32 @@ module Aurora
     end
 
     def refresh
-      registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1110..1111, 1114, 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?
+      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([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)
-      end
+      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]
+      faults = @modbus_slave.read_multiple_holding_registers(601..699)
+      @faults = Aurora.transform_registers(faults).values
 
       registers = @modbus_slave.holding_registers[*registers_to_read]
       Aurora.transform_registers(registers)
 
       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]
-      @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]
@@ -180,7 +173,6 @@ 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]
       @total_watts                = registers[1153]
 
@@ -202,12 +194,14 @@ module Aurora
                         :standby
                       end
 
-      blower.refresh(registers)
-      pump.refresh(registers)
-
       zones.each do |z|
         z.refresh(registers)
       end
+      compressor.refresh(registers)
+      blower.refresh(registers)
+      pump.refresh(registers)
+      dhw&.refresh(registers)
+      humidifier&.refresh(registers)
     end
 
     def cooling_airflow_adjustment=(value)
@@ -215,16 +209,6 @@ 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
@@ -270,14 +254,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,70 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Compressor
+    class GenericCompressor < Component
+      attr_reader :speed, :watts
+
+      def initialize(abc, stages)
+        super(abc)
+        @stages = stages
+      end
+
+      def type
+        "#{@stages == 2 ? 'Dual' : 'Single'} Stage Compressor"
+      end
+
+      def speed_range
+        0..@stages
+      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 initialize(abc)
+        super(abc, 12)
+      end
+
+      def type
+        "Variable Speed Drive"
+      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/humidifier.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  class Humidifier < Component
+    attr_reader :running
+    alias running? running
+
+    def refresh(registers)
+      outputs = registers[30]
+      @running = outputs.include?(:accessory)
+    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]
 

data/lib/aurora/mqtt_modbus.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "mqtt"
+require "securerandom"
+
+module Aurora
+  class MQTTModBus
+    attr_accessor :logger
+
+    def initialize(uri)
+      @mqtt = MQTT::Client.new(uri)
+      @mqtt.connect
+
+      @base_topic = uri.path[1..]
+      @mqtt.subscribe("#{@base_topic}/getregs/response")
+    end
+
+    def read_multiple_holding_registers(*queries)
+      query_id = SecureRandom.uuid
+      mqtt_query = queries.map { |m| m.is_a?(Range) ? "#{m.begin},#{m.count}" : m }.join(";")
+      @mqtt.publish("#{@base_topic}/getregs", "#{query_id}:#{mqtt_query}", qos: 1)
+      Timeout.timeout(15) do
+        result = {}
+        loop do
+          packet = @mqtt.get
+          response_id, registers_flat = packet.payload.split(":")
+          next unless response_id == query_id
+
+          values = registers_flat.split(",").map(&:to_i)
+          result_index = 0
+          queries.each do |query|
+            Array(query).each do |i|
+              result[i] = values[result_index]
+              result_index += 1
+            end
+          end
+          break
+        end
+        result
+      end
+    end
+
+    def write_holding_register(addr, value)
+      @mqtt.publish("#{@base_topic}/#{addr}/set", value, qos: 1)
+    end
+  end
+end

data/lib/aurora/registers.rb

@@ -194,24 +194,24 @@ module Aurora
     name ? "#{value} #{name}" : value.to_s
   end
 
-  AR_SETTINGS = {
-    0 => "Cycle with Compressor",
-    1 => "Slow Opening Water Valve",
-    2 => "Cycle with Thermostat Humidification Call",
-    3 => "Cycle with Blower"
+  ACCESSORY_RELAY_SETTINGS = {
+    0 => :compressor,
+    1 => :slow_opening_water_valve,
+    2 => :humidifier,
+    3 => :blower
   }.freeze
 
   def dipswitch_settings(value)
     return :manual if value == 0x7fff
 
     {
-      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) & 0x3],
-      cc: value & 0x20 == 0x20 ? "Single Stage" : "Dual Stage",
-      lo: value & 0x40 == 0x40 ? "Continouous" : "Pulse",
-      dh_rh: value & 0x80 == 0x80 ? "Dehumidifier On" : "Reheat On"
+      fp1: value & 0x01 == 0x01 ? 30 : 15,
+      fp2: value & 0x02 == 0x02 ? 30 : :off,
+      reversing_valve: value & 0x04 == 0x04 ? :o : :b, # cycle to cool on O, or !B
+      accessory_relay: ACCESSORY_RELAY_SETTINGS[(value >> 3) & 0x3],
+      compressor: value & 0x20 == 0x20 ? 1 : 2, # single or dual stage compressor
+      lockout: value & 0x40 == 0x40 ? :continuous : :pulse,
+      dehumidifier_reheat: value & 0x80 == 0x80 ? :dehumidifier : :reheat
     }
   end
 
@@ -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?
@@ -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],
@@ -514,6 +523,7 @@ module Aurora
     ->(v) { PUMP_TYPE[v] } => [413],
     ->(v) { PHASE_TYPE[v] } => [416],
     method(:iz2_fan_desired) => [565],
+    ->(v) { v == 0xffff ? 0 : v } => 601..699,
     ->(registers, idx) { to_string(registers, idx, 8) } => [710],
     ->(v) { COMPONENT_STATUS[v] } => [800, 803, 806, 812, 815, 818, 824, 827],
     method(:axb_inputs) => [1103],
@@ -521,12 +531,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],
@@ -876,10 +887,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[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.5"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -136,11 +136,15 @@ 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/humidifier.rb
 - lib/aurora/iz2_zone.rb
 - lib/aurora/mock_abc.rb
 - lib/aurora/modbus/server.rb
 - lib/aurora/modbus/slave.rb
+- lib/aurora/mqtt_modbus.rb
 - lib/aurora/pump.rb
 - lib/aurora/registers.rb
 - lib/aurora/thermostat.rb