waterfurnace_aurora 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288c8dbc14788d26473f14dcfaf388f75c8aee92c2f3b4d388bfa8326cfd2842
-  data.tar.gz: c06f92936c81e402d08e01ae6b8c6c573acca46a85c9630914cb3c69f125a56a
+  metadata.gz: 5a92e9aadd14ee0154443cea52907f793880242ce22a44f3df7912065074c3c8
+  data.tar.gz: 553a945493652a50f92f49e4e0620db8e03305c3ff0ab65823f20c15db2ac89d
 SHA512:
-  metadata.gz: 5e64658afee912c8188af6d88bc98e208427b8dc4ef2ce1ea6ff1efcaca15ea2042ed4eef08ccfd764ec59ce0bb82013b0abd82173ec00f9ec61cbde07a66634
-  data.tar.gz: 6deff29644f83c329f1727d0a568c87536618ae63c7a27e58e4054eff187496c6f04bf3b63e2c35e649b2a0eb5b6395d81450a68b0096d1cacee9137c2f53c31
+  metadata.gz: 5fee6734f5e5752aec571c2c93a81e79be950af8c8f4a3ab3259f7d6b1d5e2540d4fd616be06d911a382c710b23ed43c1b1ecf23db23444022c24216faff52cb
+  data.tar.gz: c2e5a9f54f7bd0f6b869ffff94b4cd0a0bf9de65ea29d8342fe690f582893a9fe0a7b0f0ce94ba4c0ecf6595156d21a12e7e8203023aaadc923a56c0951f817f

data/exe/aurora_mqtt_bridge

@@ -93,6 +93,7 @@ class MQTTBridge
           @abc.refresh
 
           components = { @homie_abc => @abc,
+                         @aux_heat => @abc.aux_heat,
                          @compressor => @abc.compressor,
                          @blower => @abc.blower,
                          @pump => @abc.pump,
@@ -131,7 +132,7 @@ class MQTTBridge
     }
 
     @homie_abc = @homie.node("abc", "Heat Pump", "ABC") do |node|
-      allowed_modes = %w[lockout standby blower heating cooling eh1 eh2 emergency waiting]
+      allowed_modes = %w[lockout standby blower heating cooling waiting]
       allowed_modes << "dehumidify" if @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
       node.property("current-mode",
                     "Current Heating/Cooling Mode",
@@ -208,12 +209,11 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
-      %i[aux_heat total].each do |component|
-        component = "#{component}_watts"
-        node.property(component.tr("_", "-"),
-                      component.sub("_watts", " Power Usage").tr("_", " ").titleize,
+      if @abc.energy_monitoring?
+        node.property("watts",
+                      "Total Power Usage",
                       :integer,
-                      @abc.public_send(component),
+                      @abc.watts,
                       unit: "W",
                       hass: { sensor: { device_class: :power,
                                         state_class: :measurement } })
@@ -247,6 +247,30 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
+      node.property("drive-temperature",
+                    "Drive Temperature",
+                    :float,
+                    @abc.compressor.drive_temperature,
+                    unit: "°F",
+                    hass: { sensor: { device_class: :temperature,
+                                      state_class: :measurement,
+                                      entity_category: :diagnostic } })
+      node.property("inverter-temperature",
+                    "Inverter Temperature",
+                    :float,
+                    @abc.compressor.inverter_temperature,
+                    unit: "°F",
+                    hass: { sensor: { device_class: :temperature,
+                                      state_class: :measurement,
+                                      entity_category: :diagnostic } })
+      node.property("fan-speed",
+                    "Fan Speed",
+                    :integer,
+                    @abc.compressor.fan_speed,
+                    unit: "%",
+                    format: 0..100,
+                    hass: { sensor: { state_class: :measurement,
+                                      entity_category: :diagnostic } })
 
       next unless @abc.iz2?
 
@@ -259,6 +283,25 @@ class MQTTBridge
                                       entity_category: :diagnostic } })
     end
 
+    @aux_heat = @homie.node("aux-heat", "Aux Heater", "Aux Heater") do |node|
+      node.property("stage",
+                    "Current Stage",
+                    :integer,
+                    @abc.aux_heat.stage,
+                    format: 0..2,
+                    hass: { sensor: { state_class: :measurement } })
+
+      if @abc.energy_monitoring?
+        node.property("watts",
+                      "Power Usage",
+                      :integer,
+                      @abc.aux_heat.watts,
+                      unit: "W",
+                      hass: { sensor: { device_class: :power,
+                                        state_class: :measurement } })
+      end
+    end
+
     @blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
       node.property("running",
                     "Running",

data/lib/aurora/abc_client.rb

@@ -3,6 +3,7 @@
 require "yaml"
 require "uri"
 
+require "aurora/aux_heat"
 require "aurora/blower"
 require "aurora/compressor"
 require "aurora/dhw"
@@ -90,6 +91,7 @@ module Aurora
                 :model,
                 :serial_number,
                 :zones,
+                :aux_heat,
                 :compressor,
                 :blower,
                 :pump,
@@ -105,8 +107,7 @@ module Aurora
                 :fp1,
                 :fp2,
                 :line_voltage,
-                :aux_heat_watts,
-                :total_watts
+                :watts
 
     def initialize(uri)
       @modbus_slave = self.class.open_modbus_slave(uri)
@@ -129,6 +130,7 @@ module Aurora
 
       @abc_dipswitches = registers[33]
       @axb_dipswitches = registers[1103]
+      @aux_heat = AuxHeat.new(self)
       @compressor = if @program == "ABCVSP"
                       Compressor::VSDrive.new(self)
                     else
@@ -160,7 +162,7 @@ module Aurora
       zones.each do |z|
         @registers_to_read.concat(z.registers_to_read)
       end
-      @components = [compressor, blower, pump, dhw, humidistat].compact
+      @components = [aux_heat, compressor, blower, pump, dhw, humidistat].compact
       @components.each do |component|
         @registers_to_read.concat(component.registers_to_read)
       end
@@ -193,8 +195,7 @@ module Aurora
       @derated                    = (41..46).cover?(@error)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@error)
       @line_voltage               = registers[112]
-      @aux_heat_watts             = registers[1151]
-      @total_watts                = registers[1153]
+      @watts                      = registers[1153]
 
       @current_mode = if outputs.include?(:lockout)
                         :lockout
@@ -202,10 +203,6 @@ module Aurora
                         :dehumidify
                       elsif outputs.include?(:cc2) || outputs.include?(:cc)
                         outputs.include?(:rv) ? :cooling : :heating
-                      elsif outputs.include?(:eh2)
-                        outputs.include?(:rv) ? :eh2 : :emergency
-                      elsif outputs.include?(:eh1)
-                        outputs.include?(:rv) ? :eh1 : :emergency
                       elsif outputs.include?(:blower)
                         :blower
                       elsif registers[6]

data/lib/aurora/aux_heat.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+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?
+    end
+  end
+end

data/lib/aurora/blower.rb

@@ -36,7 +36,7 @@ module Aurora
 
       def refresh(registers)
         outputs = registers[30]
-        @speed = if outputs.include?(:eh1)
+        @speed = if outputs.include?(:eh1) || outputs.include?(:eh2)
                    4
                  elsif outputs.include?(:cc2)
                    3

data/lib/aurora/component.rb

@@ -6,6 +6,10 @@ module Aurora
       @abc = abc
     end
 
+    def registers_to_read
+      []
+    end
+
     def inspect
       "#<Aurora::#{self.class.name} #{(instance_variables - [:@abc]).map do |iv|
                                         "#{iv}=#{instance_variable_get(iv).inspect}"

data/lib/aurora/compressor.rb

@@ -42,7 +42,7 @@ module Aurora
     end
 
     class VSDrive < GenericCompressor
-      attr_reader :ambient_temperature, :iz2_desired_speed
+      attr_reader :drive_temperature, :inverter_temperature, :ambient_temperature, :iz2_desired_speed, :fan_speed
 
       def initialize(abc)
         super(abc, 12)
@@ -53,7 +53,7 @@ module Aurora
       end
 
       def registers_to_read
-        result = super + [209, 3001, 3326]
+        result = super + [209, 3001, 3326..3327, 3522, 3524]
         result << 564 if abc.iz2?
         result
       end
@@ -63,6 +63,10 @@ module Aurora
 
         @speed = registers[3001]
         @ambient_temperature = registers[3326]
+        @drive_temperature = registers[3327]
+        @inverter_temperature = registers[3522]
+        @fan_speed = registers[3524]
+
         @iz2_desired_speed = registers[564] if abc.iz2?
       end
     end

data/lib/aurora/registers.rb

@@ -867,11 +867,11 @@ module Aurora
     3225 => "VS Drive Details (Safemode 2)",
     3226 => "VS Drive Details (Alarm 1)",
     3227 => "VS Drive Details (Alarm 2)",
-    3327 => "VS Drive Temperature",
     3322 => "VS Drive Discharge Pressure",
     3323 => "VS Drive Suction Pressure",
     3325 => "VS Drive Discharge Temperature",
     3326 => "VS Drive Compressor Ambient Temperature",
+    3327 => "VS Drive Temperature",
     3330 => "VS Drive Entering Water Temperature",
     3331 => "VS Drive Line Voltage",
     3332 => "VS Drive Thermo Power",

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -166,6 +166,7 @@ files:
 - exe/web_aid_tool
 - lib/aurora.rb
 - lib/aurora/abc_client.rb
+- lib/aurora/aux_heat.rb
 - lib/aurora/blower.rb
 - lib/aurora/component.rb
 - lib/aurora/compressor.rb