waterfurnace_aurora 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a92e9aadd14ee0154443cea52907f793880242ce22a44f3df7912065074c3c8
-  data.tar.gz: 553a945493652a50f92f49e4e0620db8e03305c3ff0ab65823f20c15db2ac89d
+  metadata.gz: 8311d85ee1e300bcfbb3228a65cb98a69301f25f27569c36d898faf97c25fbd5
+  data.tar.gz: 86eab096d17d12aa01bb56f253022d64bb806d5aec3b55c6efc16a895b75d111
 SHA512:
-  metadata.gz: 5fee6734f5e5752aec571c2c93a81e79be950af8c8f4a3ab3259f7d6b1d5e2540d4fd616be06d911a382c710b23ed43c1b1ecf23db23444022c24216faff52cb
-  data.tar.gz: c2e5a9f54f7bd0f6b869ffff94b4cd0a0bf9de65ea29d8342fe690f582893a9fe0a7b0f0ce94ba4c0ecf6595156d21a12e7e8203023aaadc923a56c0951f817f
+  metadata.gz: 7edd9fd909c0b9fe316f306bf00a56eff1108f467718d71c1645596675938abd67c5e727b4f6312d79c1d706df0f22f7d65f475c35061f7b66405add92eec342
+  data.tar.gz: b0a6f4af036ebcd003557777e1fd276e33e56e1cbfbde268ad42a5a5bfa729c9ffa718dd3fd08917aad8beba2bf4d894519de128a5ba1519b5988ba5ddc707f7

data/exe/aurora_mqtt_bridge

@@ -132,7 +132,7 @@ class MQTTBridge
     }
 
     @homie_abc = @homie.node("abc", "Heat Pump", "ABC") do |node|
-      allowed_modes = %w[lockout standby blower heating cooling waiting]
+      allowed_modes = %w[lockout standby blower heating heating_with_aux emergency_heat cooling waiting]
       allowed_modes << "dehumidify" if @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
       node.property("current-mode",
                     "Current Heating/Cooling Mode",
@@ -190,8 +190,8 @@ class MQTTBridge
                     :integer,
                     @abc.line_voltage,
                     format: 90..635,
-                    unit: "V") do |value, property|
-                      @mutex.synchronize { property.value = @abc.line_voltage = value }
+                    unit: "V") do |value|
+                      @mutex.synchronize { @abc.line_voltage = value }
                     end
       node.property("fp1",
                     "FP1 Sensor",
@@ -337,8 +337,8 @@ class MQTTBridge
                       :integer,
                       @abc.blower.public_send(field),
                       format: 1..12,
-                      hass: { number: { entity_category: :config } }) do |value, property|
-          @mutex.synchronize { property.value = @abc.blower.public_send("#{field}=", value) }
+                      hass: { number: { entity_category: :config } }) do |value|
+          @mutex.synchronize { @abc.blower.public_send("#{field}=", value) }
         end
       end
 
@@ -383,8 +383,8 @@ class MQTTBridge
                     "Manual Control",
                     :boolean,
                     @abc.pump.manual_control?,
-                    hass: { switch: { entity_category: :diagnostic } }) do |value, property|
-        @mutex.synchronize { property.value = @abc.pump.manual_control = value }
+                    hass: { switch: { entity_category: :diagnostic } }) do |value|
+        @mutex.synchronize { @abc.pump.manual_control = value }
       end
       node.property("minimum-speed",
                     "Actual Minimum Speed",
@@ -392,8 +392,8 @@ class MQTTBridge
                     @abc.pump.minimum_speed,
                     format: 0..100,
                     unit: "%",
-                    hass: { number: { entity_category: :config } }) do |value, property|
-        @mutex.synchronize { property.value = @abc.pump.minimum_speed = value }
+                    hass: { number: { entity_category: :config } }) do |value|
+        @mutex.synchronize { @abc.pump.minimum_speed = value }
       end
       node.property("maximum-speed",
                     "Actual Maximum Speed",
@@ -401,8 +401,8 @@ class MQTTBridge
                     @abc.pump.minimum_speed,
                     format: 0..100,
                     unit: "%",
-                    hass: { number: { entity_category: :config } }) do |value, property|
-        @mutex.synchronize { property.value = @abc.pump.maximum_speed = value }
+                    hass: { number: { entity_category: :config } }) do |value|
+        @mutex.synchronize { @abc.pump.maximum_speed = value }
       end
       next unless @abc.awl_axb?
 
@@ -412,8 +412,8 @@ class MQTTBridge
                     @abc.pump.speed,
                     format: 0..100,
                     unit: "%",
-                    hass: { number: { entity_category: :diagnostic } }) do |value, property|
-        @mutex.synchronize { property.value = @abc.pump.speed = value }
+                    hass: { number: { entity_category: :diagnostic } }) do |value|
+        @mutex.synchronize { @abc.pump.speed = value }
       end
     end
 
@@ -423,8 +423,8 @@ class MQTTBridge
                       "Enabled",
                       :boolean,
                       @abc.dhw.enabled,
-                      hass: { switch: { icon: "mdi:water-boiler" } }) do |value, property|
-          @mutex.synchronize { property.value = @abc.dhw.enabled = value }
+                      hass: { switch: { icon: "mdi:water-boiler" } }) do |value|
+          @mutex.synchronize { @abc.dhw.enabled = value }
         end
         node.property("running",
                       "Pump Running",
@@ -444,8 +444,8 @@ class MQTTBridge
                       @abc.dhw.set_point,
                       format: 100..140,
                       unit: "°F",
-                      hass: { number: { step: 5 } }) do |value, property|
-          @mutex.synchronize { property.value = @abc.dhw.set_point = value }
+                      hass: { number: { step: 5 } }) do |value|
+          @mutex.synchronize { @abc.dhw.set_point = value }
         end
       end
     end
@@ -461,16 +461,16 @@ class MQTTBridge
                         "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 }
+                        format: %i[auto manual]) do |value|
+            @mutex.synchronize { @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 }
+                        format: 15..50) do |value|
+            @mutex.synchronize { @abc.humidistat.humidification_target = value }
           end
           node.hass_humidifier("humidifier-running",
                                target_property: "humidification-target",
@@ -493,16 +493,16 @@ class MQTTBridge
                         "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 }
+                        format: %i[auto manual]) do |value|
+            @mutex.synchronize { @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 }
+                        format: 35..65) do |value|
+            @mutex.synchronize { @abc.humidistat.dehumidification_target = value }
           end
           node.hass_humidifier("dehumidifier-running",
                                target_property: "dehumidification-target",
@@ -563,15 +563,15 @@ class MQTTBridge
                       "Target Heating/Cooling Mode",
                       :enum,
                       zone.target_mode,
-                      format: allowed_modes) do |value, property|
-          @mutex.synchronize { property.value = zone.target_mode = value.to_sym }
+                      format: allowed_modes) do |value|
+          @mutex.synchronize { zone.target_mode = value.to_sym }
         end
         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 }
+                      format: %w[auto continuous intermittent]) do |value|
+          @mutex.synchronize { zone.target_fan_mode = value.to_sym }
         end
         node.property("fan-intermittent-on",
                       "Fan Intermittent Mode On Duration",
@@ -579,8 +579,8 @@ class MQTTBridge
                       zone.fan_intermittent_on,
                       unit: "M",
                       format: %w[0 5 10 15 20],
-                      hass: { select: { entity_category: :config } }) do |value, property|
-          @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
+                      hass: { select: { entity_category: :config } }) do |value|
+          @mutex.synchronize { zone.fan_intermittent_on = value.to_i }
         end
         node.property("fan-intermittent-off",
                       "Fan Intermittent Mode Off Duration",
@@ -588,8 +588,8 @@ class MQTTBridge
                       zone.fan_intermittent_on,
                       unit: "M",
                       format: %w[0 5 10 15 20 25 30 35 40],
-                      hass: { select: { entity_category: :config } }) do |value, property|
-          @mutex.synchronize { property.value = zone.fan_intermittent_on = value.to_i }
+                      hass: { select: { entity_category: :config } }) do |value|
+          @mutex.synchronize { zone.fan_intermittent_on = value.to_i }
         end
         node.property("current-fan-mode",
                       "Current Fan Status",
@@ -630,15 +630,15 @@ class MQTTBridge
                       :integer,
                       zone.heating_target_temperature,
                       unit: "°F",
-                      format: 40..90) do |value, property|
-          @mutex.synchronize { property.value = zone.heating_target_temperature = value }
+                      format: 40..90) do |value|
+          @mutex.synchronize { zone.heating_target_temperature = value }
         end
         node.property("cooling-target-temperature",
                       "Cooling Target Temperature", :integer,
                       zone.cooling_target_temperature,
                       unit: "°F",
-                      format: 54..99) do |value, property|
-          @mutex.synchronize { property.value = zone.cooling_target_temperature = value }
+                      format: 54..99) do |value|
+          @mutex.synchronize { zone.cooling_target_temperature = value }
         end
         node.hass_climate(action_property: "current-mode",
                           current_temperature_property: "ambient-temperature",

data/lib/aurora/abc_client.rb

@@ -202,10 +202,18 @@ module Aurora
                       elsif registers[362]
                         :dehumidify
                       elsif outputs.include?(:cc2) || outputs.include?(:cc)
-                        outputs.include?(:rv) ? :cooling : :heating
+                        if outputs.include?(:rv)
+                          :cooling
+                        elsif outputs.include?(:eh2) || outputs.include?(:eh1)
+                          :heating_with_aux
+                        else
+                          :heating
+                        end
+                      elsif outputs.include?(:eh2) || outputs.include?(:eh1)
+                        :emergency_heat
                       elsif outputs.include?(:blower)
                         :blower
-                      elsif registers[6]
+                      elsif !registers[6].zero?
                         :waiting
                       else
                         :standby

data/lib/aurora/aux_heat.rb

@@ -3,19 +3,19 @@
 require "aurora/component"
 
 module Aurora
-class AuxHeat < Component
+  class AuxHeat < Component
     attr_reader :stage, :watts
 
     def refresh(registers)
-    outputs = registers[30]
-    @stage = if outputs.include?(:eh2)
-                2
-                elsif outputs.include?(:eh1)
-                1
-                else
-                0
-                end
-    @watts = registers[1151] if abc.energy_monitoring?
+      outputs = registers[30]
+      @stage = if outputs.include?(:eh2)
+                 2
+               elsif outputs.include?(:eh1)
+                 1
+               else
+                 0
+               end
+      @watts = registers[1151] if abc.energy_monitoring?
     end
   end
 end

data/lib/aurora/dhw.rb

@@ -27,7 +27,6 @@ module Aurora
 
       raw_value = (value * 10).to_i
       holding_registers[401] = raw_value
-      @set_point = value
     end
   end
 end

data/lib/aurora/humidistat.rb

@@ -75,8 +75,6 @@ module Aurora
       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)
@@ -92,8 +90,6 @@ module Aurora
       raise ArgumentError unless (35..65).cover?(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/iz2_zone.rb

@@ -46,28 +46,24 @@ module Aurora
       return unless (raw_value = Aurora::HEATING_MODE.invert[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])
 
       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?
 
       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?
 
       holding_registers[21_207 + ((zone_number - 1) * 9)] = value
-      @fan_intermittent_off = value
     end
 
     def heating_target_temperature=(value)
@@ -75,7 +71,6 @@ module Aurora
 
       raw_value = (value * 10).to_i
       holding_registers[21_203 + ((zone_number - 1) * 9)] = raw_value
-      @heating_target_temperature = value
     end
 
     def cooling_target_temperature=(value)
@@ -83,7 +78,6 @@ module Aurora
 
       raw_value = (value * 10).to_i
       holding_registers[21_204 + ((zone_number - 1) * 9)] = raw_value
-      @cooling_target_temperature = value
     end
   end
 end

data/lib/aurora/registers.rb

@@ -229,6 +229,8 @@ module Aurora
     0x08 => :blower,
     0x10 => :eh1,
     0x20 => :eh2,
+    # 0x40 => ??, # this turns on and off quite a bit during normal operation
+    # 0x80 => ??, # this turns on occasionally during normal operation; I've only seen it when aux heat is on
     0x200 => :accessory,
     0x400 => :lockout,
     0x800 => :alarm
@@ -703,8 +705,9 @@ module Aurora
     9 => "Compressor Minimum Run Time",
     15 => "Blower Off Delay",
     16 => "Line Voltage",
-    17 => "Aux/E Heat Stage", # this has some complicated condition based on
-    # current inputs and outputs on if it should have a value (310 - v) or (130 - v), or be 0
+    17 => "Aux/E Heat Stage", # this is how long aux/eheat have been requested in seconds
+    # when in eheat mode (explicit on the thermostat), it will stage up to eh2 after 130s
+    # when in aux mode (thermostat set to heat; compressor at full capacity), it will stage up to eh2 after 310s
     19 => "FP1 (Cooling Liquid Line) Temperature",
     20 => "FP2",
     21 => "Condensate", # >= 270 normal, otherwise fault

data/lib/aurora/thermostat.rb

@@ -48,14 +48,12 @@ module Aurora
       return unless (raw_value = HEATING_MODE.invert[value])
 
       @abc.modbus_slave.holding_registers[12_606] = raw_value
-      @target_mode = value
     end
 
     def target_fan_mode=(value)
       return unless (raw_value = FAN_MODE.invert[value])
 
       @abc.modbus_slave.holding_registers[12_621] = raw_value
-      @target_fan_mode = value
     end
 
     def heating_target_temperature=(value)
@@ -63,7 +61,6 @@ module Aurora
 
       raw_value = (value * 10).to_i
       @abc.modbus_slave.holding_registers[12_619] = raw_value
-      @heating_target_temperature = value
     end
 
     def cooling_target_temperature=(value)
@@ -71,21 +68,18 @@ module Aurora
 
       raw_value = (value * 10).to_i
       @abc.modbus_slave.holding_registers[12_620] = raw_value
-      @cooling_target_temperature = value
     end
 
     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 = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

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