waterfurnace_aurora 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edeaa2444792af1f963829496d445f87a29b5a67efad7e741937ab0f7278b222
-  data.tar.gz: 37db08186651a5ee4486a9ee6dceb30f39ae4ca93122ae1c8e357b9b551c2929
+  metadata.gz: cc02021d49b86596b6f1d40c244b3e3671280c578cc9cd869fc936f2c219a0bf
+  data.tar.gz: 795aa42ff626534a4750eb181e5299f82d0603f677a6b9d1fb2d8418046643c6
 SHA512:
-  metadata.gz: eed8903a3416f39f393ee1ec77d81a6c3c8c3db14ae3253e22ebf884e1eed624a7869dea9c76ef086a359c657c4f63d20fa94a801622846e6914943e38e0f827
-  data.tar.gz: 5e326094aa14976dc8ba432944160c3073d47642bbdba272eca063ea00f6fdf0908f29a563b44f306b5af05754c6c77ae251c4cd225daaea9be8edc2c1101820
+  metadata.gz: 978a3a910d919a85a79f1d272ecec65b68908472492e25dcc8f7bc8f1ddc414f82ef1c22268e092ce026c0dbb90f48c73e9ede9f30144df3f2978fb5abf70b6b
+  data.tar.gz: 93336e684ab033ca48539738634e8835deffaac4fb5c7275269086e21a134f1f5ad2793c4ae859a806c385dec88811ed720ec837dda0c5f7cd4a068e24cb3338

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
@@ -79,7 +91,8 @@ class MQTTBridge
                          @compressor => @abc.compressor,
                          @blower => @abc.blower,
                          @pump => @abc.pump,
-                         @dhw => @abc.dhw }.compact
+                         @dhw => @abc.dhw,
+                         @humidistat => @abc.humidistat }.compact
           @abc.zones.each_with_index do |z, idx|
             homie_zone = @homie["zone#{idx + 1}"]
             components[homie_zone] = z
@@ -92,6 +105,8 @@ class MQTTBridge
           end
 
           @abc.faults.each_with_index do |fault_count, i|
+            next if fault_count == 0xffff
+
             @faults["e#{i + 1}"].value = fault_count
           end
         end
@@ -105,8 +120,10 @@ class MQTTBridge
 
   def publish_basic_attributes
     @homie_abc = @homie.node("abc", "Aurora Basic Control", "ABC") do |node|
+      allowed_modes = %w[lockout standby blower heating cooling eh1 eh2 emergency waiting]
+      allowed_modes << "dehumidify" if @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
       node.property("current-mode", "Current Heating/Cooling Mode", :enum, @abc.current_mode,
-                    format: %w[lockout standby blower heating cooling eh1 eh2 emergency waiting dehumidify])
+                    format: allowed_modes)
       node.property("entering-air-temperature", "Entering Air Temperature", :float, @abc.entering_air_temperature,
                     unit: "ºF")
       node.property("entering-water-temperature", "Entering Water Temperature", :float,
@@ -118,8 +135,7 @@ class MQTTBridge
       unless @abc.outdoor_temperature.zero? # TODO: figure out the config if this actually exists
         node.property("outdoor-temperature", "Outdoor Temperature", :float, @abc.outdoor_temperature, unit: "ºF")
       end
-      node.property("relative-humidity", "Relative Humidity", :integer, @abc.relative_humidity, unit: "%",
-                                                                                                format: 0..100)
+
       node.property("fp1", "FP1 Sensor", :float, @abc.fp1, unit: "ºF")
       node.property("fp2", "FP2 Sensor", :float, @abc.fp2, unit: "ºF")
       %i[aux_heat total].each do |component|
@@ -146,9 +162,8 @@ class MQTTBridge
     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?)
-      else
+      node.property("running", "Blower is running", :boolean, @abc.blower.running?)
+      if @abc.blower.respond_to?(:speed)
         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?
@@ -177,6 +192,7 @@ class MQTTBridge
 
       next unless @abc.pump.is_a?(Aurora::Pump::VSPump)
 
+      node.property("running", "Pump is running", :boolean, @abc.pump.running)
       node.property("speed", "Speed", :integer, @abc.pump.speed, format: 0..100, unit: "%") do |value, property|
         @mutex.synchronize { property.value = @abc.pump.speed = value }
       end
@@ -199,6 +215,7 @@ class MQTTBridge
         node.property("enabled", "Enabled", :boolean, @abc.dhw.enabled) do |value, property|
           @mutex.synchronize { property.value = @abc.dhw.enabled = value }
         end
+        node.property("running", "DHW Pump is running", :boolean, @abc.dhw.running?)
         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,
@@ -208,11 +225,45 @@ class MQTTBridge
       end
     end
 
+    @humidistat = @homie.node("humidistat", "Humidistat", "Humidistat") do |node|
+      node.property("relative-humidity", "Relative Humidity", :integer, @abc.humidistat.relative_humidity,
+         unit: "%", format: 0..100)
+      if @abc.humidistat.humidifier?
+        node.property("humidifier-running", "Humidifier is running", :boolean, @abc.humidistat.humidifier_running?)
+        node.property("humidifier-mode", "Humidifier Mode", :enum, @abc.humidistat.humidifier_mode,
+                      format: %i[auto manual]) do |value, property|
+          @mutex.synchronize { property.value = @abc.humidistat.humidifier_mode = value.to_sym }
+        end
+        node.property("humidification-target", "Humidification target relative humidity", :integer,
+                      @abc.humidistat.humidification_target, unit: "%", format: 15..50) do |value, property|
+          @mutex.synchronize { property.value = @abc.humidistat.humidification_target = value }
+        end
+      end
+
+      # VSDrive can perform active dehumidification, even without a dedicated dehumidifier
+      if @abc.humidistat.dehumidifier? || @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
+        node.property("dehumidifier-mode", "Dehumidifier Mode", :enum, @abc.humidistat.dehumidifier_mode,
+                      format: %i[auto manual]) do |value, property|
+          @mutex.synchronize { property.value = @abc.humidistat.dehumidifier_mode = value.to_sym }
+        end
+        node.property("dehumidification-target", "Dehumidification target relative humidity", :integer,
+                      @abc.humidistat.dehumidification_target, unit: "%", format: 35..65) do |value, property|
+          @mutex.synchronize { property.value = @abc.humidistat.dehumidification_target = value }
+        end
+      end
+
+      next unless @abc.humidistat.dehumidifier?
+
+      node.property("dehumidifier-running", "Dehumidifier is running", :boolean, @abc.humidistat.dehumidifier_running?)
+    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|
+        next if count == 0xffff
+
         name = Aurora::FAULTS[i + 1]
         node.property("e#{i + 1}", name || "E#{i + 1}", :integer, count)
       end
@@ -261,6 +312,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

@@ -6,6 +6,7 @@ require "uri"
 require "aurora/blower"
 require "aurora/compressor"
 require "aurora/dhw"
+require "aurora/humidistat"
 require "aurora/iz2_zone"
 require "aurora/pump"
 require "aurora/thermostat"
@@ -26,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)
 
@@ -46,10 +49,10 @@ module Aurora
                 :blower,
                 :pump,
                 :dhw,
+                :humidistat,
                 :faults,
                 :current_mode,
                 :entering_air_temperature,
-                :relative_humidity,
                 :leaving_air_temperature,
                 :leaving_water_temperature,
                 :entering_water_temperature,
@@ -63,7 +66,7 @@ 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, 1103, 1114]
       registers = Aurora.transform_registers(raw_registers.dup)
       @program = registers[88]
       @serial_number = registers[105]
@@ -76,7 +79,14 @@ module Aurora
                  [Thermostat.new(self)]
                end
 
-      @compressor = @program == "ABCVSP" ? Compressor::VSDrive.new(self) : Compressor::GenericCompressor.new(self)
+      @abc_dipswitches = registers[33]
+      @axb_dipswitches = registers[1103]
+      @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])
@@ -90,8 +100,23 @@ module Aurora
                                       registers[413])
               end
       @dhw = DHW.new(self) if (-999..999).include?(registers[1114])
+      @humidistat = Humidistat.new(self,
+                                   @abc_dipswitches[:accessory_relay] == :humidifier,
+                                   @axb_dipswitches[:accessory_relay2] == :dehumidifier)
 
       @faults = []
+
+      @registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1104, 1110..1111, 1114, 1150..1153, 1165,
+                            31_003]
+      zones.each do |z|
+        @registers_to_read.concat(z.registers_to_read)
+      end
+      @components = [compressor, blower, pump, dhw, humidistat].compact
+      @components.each do |component|
+        @registers_to_read.concat(component.registers_to_read)
+      end
+      # need dehumidify mode to calculate final current mode
+      @registers_to_read.concat([362]) if compressor.is_a?(Compressor::VSDrive)
     end
 
     def query_registers(query)
@@ -129,29 +154,15 @@ module Aurora
     end
 
     def refresh
-      registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1110..1111, 1114, 1150..1153, 1165,
-                           31_003]
-      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.read_multiple_holding_registers(601..699)
       @faults = Aurora.transform_registers(faults).values
 
-      registers = @modbus_slave.holding_registers[*registers_to_read]
+      registers = @modbus_slave.holding_registers[*@registers_to_read]
       Aurora.transform_registers(registers)
 
       outputs = registers[30]
 
       @entering_air_temperature   = registers[740]
-      @relative_humidity          = registers[741]
       @leaving_air_temperature    = registers[900]
       @leaving_water_temperature  = registers[1110]
       @entering_water_temperature = registers[1111]
@@ -186,10 +197,9 @@ module Aurora
       zones.each do |z|
         z.refresh(registers)
       end
-      compressor.refresh(registers)
-      blower.refresh(registers)
-      pump.refresh(registers)
-      dhw&.refresh(registers)
+      @components.each do |component|
+        component.refresh(registers)
+      end
     end
 
     def cooling_airflow_adjustment=(value)

data/lib/aurora/blower.rb

@@ -4,8 +4,9 @@ require "aurora/component"
 
 module Aurora
   module Blower
-    class GenericBlower < Component
-      attr_reader :type, :watts
+    class PSC < Component
+      attr_reader :type, :watts, :running
+      alias running? running
 
       def initialize(abc, type)
         super(abc)
@@ -22,19 +23,11 @@ module Aurora
 
       def refresh(registers)
         @watts = registers[1148] if abc.energy_monitoring?
+        @running = registers[30].include?(:blower)
       end
     end
 
-    class PSC < GenericBlower
-      attr_reader :running
-      alias running? running
-
-      def refresh(registers)
-        @running = registers[30].include?(:g)
-      end
-    end
-
-    class FiveSpeed < GenericBlower
+    class FiveSpeed < PSC
       attr_reader :speed
 
       def speed_range
@@ -49,7 +42,7 @@ module Aurora
                    3
                  elsif outputs.include?(:cc)
                    2
-                 elsif outputs.include?(:g)
+                 elsif outputs.include?(:blower)
                    1
                  else
                    0
@@ -57,7 +50,7 @@ module Aurora
       end
     end
 
-    class ECM < GenericBlower
+    class ECM < PSC
       attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
                   :iz2_desired_speed
 

data/lib/aurora/compressor.rb

@@ -7,12 +7,17 @@ module Aurora
     class GenericCompressor < Component
       attr_reader :speed, :watts
 
+      def initialize(abc, stages)
+        super(abc)
+        @stages = stages
+      end
+
       def type
-        "Compressor"
+        "#{@stages == 2 ? 'Dual' : 'Single'} Stage Compressor"
       end
 
       def speed_range
-        0..2
+        0..@stages
       end
 
       def registers_to_read
@@ -39,12 +44,12 @@ module Aurora
     class VSDrive < GenericCompressor
       attr_reader :ambient_temperature, :iz2_desired_speed
 
-      def type
-        "Variable Speed Drive"
+      def initialize(abc)
+        super(abc, 12)
       end
 
-      def speed_range
-        0..12
+      def type
+        "Variable Speed Drive"
       end
 
       def registers_to_read

data/lib/aurora/dhw.rb

@@ -4,7 +4,8 @@ require "aurora/component"
 
 module Aurora
   class DHW < Component
-    attr_reader :enabled, :set_point, :water_temperature
+    attr_reader :enabled, :running, :set_point, :water_temperature
+    alias running? running
 
     def registers_to_read
       [400..401, 1114]
@@ -12,6 +13,7 @@ module Aurora
 
     def refresh(registers)
       @enabled = registers[400]
+      @running = registers[1104].include?(:dhw)
       @set_point = registers[401]
       @water_temperature = registers[1114]
     end

data/lib/aurora/humidistat.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  class Humidistat < Component
+    attr_reader :humidifier_running, :humidifier_mode, :humidification_target,
+                :dehumidifier_running, :dehumidifier_mode, :dehumidification_target,
+                :relative_humidity
+    alias humidifier_running? humidifier_running
+    alias dehumidifer_running? dehumidifier_running
+
+    def initialize(abc, has_humidifier, has_dehumidifier)
+      super(abc)
+      @humidifier = has_humidifier
+      @dehumidifier = has_dehumidifier
+    end
+
+    def humidifier?
+      @humidifier
+    end
+
+    def dehumidifier?
+      @dehumidifier
+    end
+
+    def registers_to_read
+      result = [741]
+      if humidifier? || dehumidifier? || abc.compressor.is_a?(Compressor::VSDrive)
+        result.concat(abc.iz2? ? [21_114, 31_109..31_110] : [12_309..12_310])
+      end
+      result
+    end
+
+    def refresh(registers)
+      @relative_humidity = registers[741]
+
+      outputs = registers[30]
+      @humidifier_running = humidifier? && outputs.include?(:accessory)
+
+      outputs = registers[1104]
+      @dehumidifer_running = dehumidifier? && outputs.include?(:accessory2)
+
+      base = abc.iz2? ? 31_109 : 12_309
+      humidifier_settings_register = abc.iz2? ? 21_114 : 12_309
+      @humidifier_settings = registers[humidifier_settings_register]&.last&.[](2..)&.to_i(16)
+      @humidifier_mode = registers[humidifier_settings_register]&.include?(:auto_humidification) ? :auto : :manual
+      @dehumidifier_mode = registers[humidifier_settings_register]&.include?(:auto_dehumidification) ? :auto : :manual
+
+      @humidification_target = registers[base + 1]&.[](:humidification_target)
+      @dehumidification_target = registers[base + 1]&.[](:dehumidification_target)
+    end
+
+    def humidifier_mode=(mode)
+      set_humidistat_mode(mode, dehumidifier_mode)
+    end
+
+    def dehumidifier_mode=(mode)
+      set_humidistat_mode(humidifier_mode, mode)
+    end
+
+    def set_humidistat_mode(humidifier_mode, dehumidifier_mode)
+      allowed = %i[auto manual]
+      raise ArgumentError unless allowed.include?(humidifier_mode) && allowed.include?(dehumidifier_mode)
+
+      # start with the prior value of the register, since I'm not sure what
+      # else is stuffed in there
+      raw_value = @humidifier_settings
+      raw_value |= 0x4000 if humidifier_mode == :auto
+      raw_value |= 0x8000 if dehumidifier_mode == :auto
+      holding_registers[abc.iz2? ? 21_114 : 12_309] = raw_value
+      @humidifier_mode = humidifier_mode
+      @dehumidifier_mode = dehumidifier_mode
+    end
+
+    def humidification_target=(value)
+      set_humidistat_targets(value, dehumidification_target)
+    end
+
+    def dehumidification_target=(value)
+      set_humidistat_targets(humidification_target, value)
+    end
+
+    def set_humidistat_targets(humidification_target, dehumidification_target)
+      raise ArgumentError unless (15..50).include?(humidification_target)
+      raise ArgumentError unless (35..65).include?(dehumidification_target)
+
+      holding_registers[abc.iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
+      @humidification_target = humidification_target
+      @dehumidification_target = dehumidification_target
+    end
+  end
+end

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/pump.rb

@@ -5,7 +5,8 @@ require "aurora/component"
 module Aurora
   module Pump
     class GenericPump < Component
-      attr_reader :type, :watts, :waterflow
+      attr_reader :type, :watts, :waterflow, :running
+      alias running? running
 
       def initialize(abc, type)
         super(abc)
@@ -21,6 +22,7 @@ module Aurora
       def refresh(registers)
         @waterflow = registers[1117]
         @watts = registers[1164] if abc.energy_monitoring?
+        @running = registers[1104].include?(:loop_pump)
       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
 
@@ -302,23 +302,23 @@ module Aurora
 
   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[:smart_grid] = value & 0x001 == 0x001
+    result[:ha1] = value & 0x002 == 0x002
+    result[:ha2] = 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
+    result[:accessory_relay2] = if value & 0x080 == 0x080 && value & 0x100 == 0x100
+                                  :blower
+                                elsif value & 0x100 == 0x100
+                                  :low_capacity_compressor
+                                elsif value & 0x080 == 0x080
+                                  :high_capacity_compressor
+                                else
+                                  :dehumidifier
+                                end
     leftover = value & ~0x1ff
     result[:unknown] = format("0x%04x", leftover) unless leftover.zero?
     result
@@ -523,7 +523,6 @@ 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],
@@ -534,8 +533,8 @@ module Aurora
     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],
+    ->(v) { from_bitmask(v, HUMIDIFIER_SETTINGS) } => [12_309, 21_114, 31_109],
+    ->(v) { { humidification_target: v >> 8, dehumidification_target: v & 0xff } } => [12_310, 21_115, 31_110],
     method(:iz2_demand) => [31_005],
     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],
@@ -889,16 +888,20 @@ module Aurora
     3906 => "VS Drive SuperHeat Temperature",
     12_005 => "Fan Configuration",
     12_006 => "Heating Mode",
+    12_309 => "De/Humidifier Mode",
+    12_310 => "De/Humidifier Setpoints",
     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)",
+    21_114 => "IZ2 De/Humidifier Mode (write)",
+    21_115 => "IZ2 De/Humidifier Setpoints (write)",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
-    31_109 => "Humidifier Mode", # write to 21114
-    31_110 => "Manual De/Humidification Target", # write to 21115
+    31_109 => "De/Humidifier Mode",
+    31_110 => "Manual De/Humidification Setpoints",
     31_400 => "Dealer Name",
     31_413 => "Dealer Phone",
     31_421 => "Dealer Address 1",

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 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
@@ -139,10 +139,12 @@ files:
 - lib/aurora/compressor.rb
 - lib/aurora/core_ext/string.rb
 - lib/aurora/dhw.rb
+- lib/aurora/humidistat.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