waterfurnace_aurora 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c89c3d73941d7574fbe1088bf792676f772abfb98dab07be0de27a61323ec96
-  data.tar.gz: 13a5a82be919ee67bbbc87357eac1cf6aaba1b34514fbd808b9411dfc37bcb45
+  metadata.gz: a372b51d3240840ae96269020f73728fb049f3e6c0438613c9659d4158d21aa6
+  data.tar.gz: 249e26d5764a0ab670a60b5de7ed6da0796344fd71896c6c33d353fc4a7d95ed
 SHA512:
-  metadata.gz: ce768bdc79fc4cd2a406ebf15757f587d373030cec21efc64076b3951a7c97f631f1e47a0e810005b24553fdd78eb4aec869022c8e0f6f33e409522f473e942b
-  data.tar.gz: ab5cba75479435f32a42bca6fd8155a5954674996b75a4a2afe397241bce519720a083aaaf0ccf3976a8c289170ec39553f63e9ba036248bdadcf408022e7ffb
+  metadata.gz: c5c5ef5a5e1d6ec3d393913ca1b717a5a53a5f17c51f2c9b8ea0f6aeb627cdc873fa25e22511a779d7b9c0e9a60fdc21bc63dbb1fb0d8f6baa41c3dada85cb91
+  data.tar.gz: ee787175c344db12fe11f0dab4131505e5692ca360adeee78bcd0931bd4b28660de9c0d09817c5f30632808b374a3695f8a8cbf9f1e965bf410648f411ffa958

data/exe/aurora_mqtt_bridge

@@ -91,7 +91,8 @@ class MQTTBridge
                          @compressor => @abc.compressor,
                          @blower => @abc.blower,
                          @pump => @abc.pump,
-                         @dhw => @abc.dhw }.compact
+                         @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
@@ -220,6 +221,12 @@ class MQTTBridge
       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 }

data/lib/aurora/abc_client.rb

@@ -6,6 +6,7 @@ require "uri"
 require "aurora/blower"
 require "aurora/compressor"
 require "aurora/dhw"
+require "aurora/humidifier"
 require "aurora/iz2_zone"
 require "aurora/pump"
 require "aurora/thermostat"
@@ -48,6 +49,7 @@ module Aurora
                 :blower,
                 :pump,
                 :dhw,
+                :humidifier,
                 :faults,
                 :current_mode,
                 :entering_air_temperature,
@@ -65,7 +67,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, 1114]
       registers = Aurora.transform_registers(raw_registers.dup)
       @program = registers[88]
       @serial_number = registers[105]
@@ -78,7 +80,13 @@ module Aurora
                  [Thermostat.new(self)]
                end
 
-      @compressor = @program == "ABCVSP" ? Compressor::VSDrive.new(self) : Compressor::GenericCompressor.new(self)
+      @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])
@@ -92,6 +100,7 @@ module Aurora
                                       registers[413])
               end
       @dhw = DHW.new(self) if (-999..999).include?(registers[1114])
+      @humidifier = Humidifier.new(self) if @abc_dipswitches[:accessory_relay] == :humidifier
 
       @faults = []
     end
@@ -192,6 +201,7 @@ module Aurora
       blower.refresh(registers)
       pump.refresh(registers)
       dhw&.refresh(registers)
+      humidifier&.refresh(registers)
     end
 
     def cooling_airflow_adjustment=(value)

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/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/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
 

data/lib/aurora/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -139,6 +139,7 @@ files:
 - 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