waterfurnace_aurora 1.2.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf73ece152211ae227b1b628572d0dc43936b600c2d41a0a534178dc74385cd
-  data.tar.gz: d5ed42012eb9fc1e2aca036914cfd538e3342df0f34342e2c9c37d18ad6cce29
+  metadata.gz: e09071363ccbd485b256f1e79c2f363e03bc3b2d4d94af9149e50295d0f38d38
+  data.tar.gz: a092a806f450e77559de1899173b9b4cb63349a73220c17af6f67382daa30280
 SHA512:
-  metadata.gz: eaacad438ac440a004f8611b907f9eff3e453193884627178dc8608f66ff29640f5e355993069b34d83ef796cb6169f0d25bc4a1b06103a44194d339618f08a6
-  data.tar.gz: 00e3dfeba4fc12ec7804fcde37241ff93de9f60bb91f03e7182f309de383890454f83f959aeacfd5a3924874bd56ca1c5aaa853ca52b05abd56fd894aa3d0f38
+  metadata.gz: 7e915833530cbf2d78f9e4de98dda9efbcdd0c4eca386716ef4d455e030a28d1847c38d1df379773bff24581cfd4dee765e86bf6d61d5eec706e20dd8bafd4f8
+  data.tar.gz: 7cb9b9b8ca0b3f17a88cf2dc66c937c52a396eb52cfd955fb311732a432e7b648c5514b12b14faafe99f76d19243e837b24f2dade224f6177c14a1c543e60e01

data/exe/aurora_mqtt_bridge

@@ -282,6 +282,19 @@ class MQTTBridge
                       unit: "W",
                       hass: { sensor: { device_class: :power,
                                         state_class: :measurement } })
+        node.property("heat-of-extraction",
+                      "Heat of Extraction",
+                      :integer,
+                      @abc.compressor.heat_of_extraction,
+                      unit: "Btuh",
+                      hass: { sensor: { state_class: :measurement } })
+        node.property("heat-of-rejection",
+                      "Heat of Rejection",
+                      :integer,
+                      @abc.compressor.heat_of_rejection,
+                      unit: "Btuh",
+                      hass: { sensor: { state_class: :measurement } })
+
       end
 
       next unless @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
@@ -372,10 +385,18 @@ class MQTTBridge
                     hass: { sensor: { device_class: :temperature,
                                       state_class: :measurement,
                                       entity_category: :diagnostic } })
+      node.property("subcool-temperature",
+                    "SubCool Temperature",
+                    :float,
+                    @abc.compressor.subcool_temperature,
+                    unit: "°F",
+                    hass: { sensor: { device_class: :temperature,
+                                      state_class: :measurement,
+                                      entity_category: :diagnostic } })
       node.property("eev-open-percentage",
                     "Electronic Expansion Valve Open Percentage",
                     :integer,
-                    @abc.compressor.eev_percentage,
+                    @abc.compressor.eev_open_percentage,
                     unit: "%",
                     format: 0..100,
                     hass: { sensor: { state_class: :measurement,
@@ -437,8 +458,7 @@ class MQTTBridge
 
       next unless @abc.blower.is_a?(Aurora::Blower::ECM)
 
-      presets = %w[blower-only aux-heat]
-      presets.concat %w[low-compressor high-compressor] unless @abc.iz2?
+      presets = %w[blower-only aux-heat low-compressor high-compressor]
       presets.each do |setting|
         field = "#{setting.tr("-", "_")}_speed"
         node.property("#{setting}-speed",

data/lib/aurora/compressor.rb

@@ -5,7 +5,12 @@ require "aurora/component"
 module Aurora
   module Compressor
     class GenericCompressor < Component
-      attr_reader :speed, :watts, :cooling_liquid_line_temperature, :saturated_condensor_discharge_temperature
+      attr_reader :speed,
+                  :watts,
+                  :cooling_liquid_line_temperature,
+                  :saturated_condensor_discharge_temperature,
+                  :heat_of_extraction,
+                  :heat_of_rejection
 
       def initialize(abc, stages)
         super(abc)
@@ -22,7 +27,7 @@ module Aurora
 
       def registers_to_read
         result = [19, 1134]
-        result << (1146..1147) if abc.energy_monitoring?
+        result.concat([1146..1147, 1154..1157]) if abc.energy_monitoring?
         result
       end
 
@@ -37,7 +42,12 @@ module Aurora
                  end
         @cooling_liquid_line_temperature = registers[19]
         @saturated_condensor_discharge_temperature = registers[1134]
-        @watts = registers[1146] if abc.energy_monitoring?
+
+        return unless abc.energy_monitoring?
+
+        @watts = registers[1146]
+        @heat_of_extraction = registers[1154]
+        @heat_of_rejection = registers[1156]
       end
     end
 
@@ -54,7 +64,8 @@ module Aurora
                   :suction_temperature,
                   :saturated_evaporator_discharge_temperature,
                   :superheat_temperature,
-                  :eev_percentage
+                  :subcool_temperature,
+                  :eev_open_percentage
 
       def initialize(abc)
         super(abc, 12)
@@ -65,7 +76,7 @@ module Aurora
       end
 
       def registers_to_read
-        result = super + [209, 3000..3001, 3322..3327, 3522, 3524, 3808, 3903..3906]
+        result = super + [209, 1135..1136, 3000..3001, 3322..3327, 3522, 3524, 3808, 3903..3906]
         result << 564 if abc.iz2?
         result
       end
@@ -82,10 +93,11 @@ module Aurora
         @drive_temperature = registers[3327]
         @inverter_temperature = registers[3522]
         @fan_speed = registers[3524]
-        @eev_percentage = registers[3808]
+        @eev_open_percentage = registers[3808]
         @suction_temperature = registers[3903]
         @saturated_evaporator_discharge_temperature = registers[3905]
         @superheat_temperature = registers[3906]
+        @subcool_temperature = registers[registers[30].include?(:rv) ? 1136 : 1135]
 
         @iz2_desired_speed = registers[564] if abc.iz2?
       end

data/lib/aurora/registers.rb

@@ -44,10 +44,11 @@ module Aurora
     totals
   end
 
+  NEGATABLE = ->(v) { v & 0x8000 == 0x8000 ? v - 0x10000 : v }
   TO_HUNDREDTHS = ->(v) { v.to_f / 100 }
   TO_TENTHS = ->(v) { v.to_f / 10 }
+  TO_SIGNED_TENTHS = ->(v) { NEGATABLE.call(v).to_f / 10 }
   TO_LAST_LOCKOUT = ->(v) { v & 0x8000 == 0x8000 ? v & 0x7fff : nil }
-  NEGATABLE = ->(v) { v & 0x8000 == 0x8000 ? v - 0x10000 : v }
 
   def from_bitmask(value, flags)
     result = []
@@ -59,11 +60,16 @@ module Aurora
     result
   end
 
-  def to_int32(registers, idx)
+  def to_uint32(registers, idx)
     Aurora&.logger&.warn("Missing register #{idx + 1}") unless registers[idx + 1]
     (registers[idx] << 16) + registers[idx + 1]
   end
 
+  def to_int32(registers, idx)
+    v = to_uint32(registers, idx)
+    v & 0x80000000 == 0x80000000 ? v - 0x100000000 : v
+  end
+
   def to_string(registers, idx, length)
     (idx...(idx + length)).map do |i|
       next "\ufffd" unless registers[i] # missing data? add unicode invalid character
@@ -488,18 +494,20 @@ module Aurora
   REGISTER_CONVERTERS = {
     TO_HUNDREDTHS => [2, 3, 417, 418, 801, 804, 807, 813, 816, 817, 819, 820, 825, 828],
     method(:dipswitch_settings) => [4, 33],
-    TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900, 901, 903,
-                  1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1119, 1124, 1125, 1134,
-                  3322, 3323, 3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
+    TO_TENTHS => [401, 419, 745, 746, 901,
+                  1105, 1106, 1107, 1108, 1115, 1116, 1117, 1119,
+                  3322, 3323,
                   12_619, 12_620,
                   21_203, 21_204,
                   21_212, 21_213,
                   21_221, 21_222,
                   21_230, 22_131,
                   21_239, 21_240,
-                  21_248, 21_249,
-                  31_003,
-                  31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
+                  21_248, 21_249],
+    TO_SIGNED_TENTHS => [19, 20, 501, 502, 567, 740, 747, 900, 903,
+                         1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
+                         3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
+                         31_003, 31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
     TO_LAST_LOCKOUT => [26],
     ->(v) { from_bitmask(v, SYSTEM_OUTPUTS) } => [27, 30],
     ->(v) { from_bitmask(v, SYSTEM_INPUTS) } => [28],
@@ -530,8 +538,8 @@ module Aurora
     ->(v) { COMPONENT_STATUS[v] } => [800, 803, 806, 812, 815, 818, 824, 827],
     method(:axb_inputs) => [1103],
     ->(v) { from_bitmask(v, AXB_OUTPUTS) } => [1104],
-    ->(v) { TO_TENTHS.call(NEGATABLE.call(v)) } => [1135, 1136],
-    method(:to_int32) => [1146, 1148, 1150, 1152, 1154, 1156, 1164, 3422, 3424],
+    method(:to_uint32) => [1146, 1148, 1150, 1152, 1164, 3422, 3424],
+    method(:to_int32) => [1154, 1156],
     method(:manual_operation) => [3002],
     method(:thermostat_configuration2) => [12_006],
     ->(v) { HEATING_MODE[v] } => [12_606, 21_202, 21_211, 21_220, 21_229, 21_238, 21_247],

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport