waterfurnace_aurora 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77762dc2957715e4f0a1dc4f608158b5f17a4801624f50d8af01ba26c8dc7410
-  data.tar.gz: 338fd829fb1bb364900242d2a4cdacada3e08a3b87214377f81f04b0c5f9eb66
+  metadata.gz: cc02021d49b86596b6f1d40c244b3e3671280c578cc9cd869fc936f2c219a0bf
+  data.tar.gz: 795aa42ff626534a4750eb181e5299f82d0603f677a6b9d1fb2d8418046643c6
 SHA512:
-  metadata.gz: 1a16b1f69d3b5720bdc323ae27b7de9908573e6a959857dce575273129fcfa5a42e7754ea87a072d28afbc47aa5e8ec9e46b40682fcc9a88dca30c36ec2aa207
-  data.tar.gz: 0d221ae7e69561ab79dd0f9591751492c4282dc4fd33a658cc8bf99ee6973587616f199c6228e7ca2506eb99fb7a622bc77a33d0272cea942ff99177dae22c90
+  metadata.gz: 978a3a910d919a85a79f1d272ecec65b68908472492e25dcc8f7bc8f1ddc414f82ef1c22268e092ce026c0dbb90f48c73e9ede9f30144df3f2978fb5abf70b6b
+  data.tar.gz: 93336e684ab033ca48539738634e8835deffaac4fb5c7275269086e21a134f1f5ad2793c4ae859a806c385dec88811ed720ec837dda0c5f7cd4a068e24cb3338

data/exe/aurora_mqtt_bridge

@@ -162,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?

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

@@ -42,9 +42,10 @@ module Aurora
       @dehumidifer_running = dehumidifier? && outputs.include?(:accessory2)
 
       base = abc.iz2? ? 31_109 : 12_309
-      @humidifier_settings = registers[abc.iz2? ? 21_114 : 12_309]
-      @humidifier_mode = @humidifier_settings&.include?(:auto_humidification) ? :auto : :manual
-      @dehumidifier_mode = @humidifier_settings&.include?(:auto_dehumidification) ? :auto : :manual
+      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)
@@ -64,7 +65,7 @@ module Aurora
 
       # start with the prior value of the register, since I'm not sure what
       # else is stuffed in there
-      raw_value = @humidifier_settings &= ~0xc000
+      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
@@ -84,7 +85,7 @@ module Aurora
       raise ArgumentError unless (15..50).include?(humidification_target)
       raise ArgumentError unless (35..65).include?(dehumidification_target)
 
-      holding_registers[iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
+      holding_registers[abc.iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
       @humidification_target = humidification_target
       @dehumidification_target = dehumidification_target
     end

data/lib/aurora/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Cody Cutrer