waterfurnace_aurora 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe09cd2a6e4d3dea0a4ebe3548c86fb5a0ed25025e07b11565c4706a82267ef
-  data.tar.gz: ded746f6e623b489ea364623307b7589b2d3b7002cd2b051b0be28f26d701252
+  metadata.gz: 85309a61ae279d3255db42a0ff3d53a038c1fdcb3c7e02e3febf6b533992a2c3
+  data.tar.gz: be76ef3d6821fbd8535192fd4a55f770234f1736fb280a7a3736fa6c134a1085
 SHA512:
-  metadata.gz: bbe91b347c1056af614f4290a52ec2f2eb3dc64883b30a129ea41d8353626835738fb8169b2081d56d5688f6910e584b1805403317ed4b29de7d6ee674ca8f9a
-  data.tar.gz: 1d6211ea820d958976201635bbfb239c53ab9a1818cc4779263ce6dda72aaaf669ae26751dd2abe5f82038bc21af7d6a6495b398e89bb4f9c1cc20b6cc876cb9
+  metadata.gz: a45f409c8573e02e7b761c6363abfea445f6e86fe58fab96b5e2ed427564ba791ff83c8817c74d2ff90028eae0c35fb4f090c0a28d3e9c6931aab45e2658c580
+  data.tar.gz: b5d793acc1dbca113c11205198b6ad6623b29543b5c5cc095ab8f4ddf0d5d9fbcf98fc5ca586e534d516027bc446bec2ee164fd3bb7f36ba6309b63517b13524

data/exe/aurora_mqtt_bridge

@@ -37,8 +37,8 @@ class MQTTBridge
             case addr
             when "known"
               Aurora::REGISTER_NAMES.keys
-            when /^(\d+)\.\.(\d+)$/
-              Regexp.last_match(1).to_i..Regexp.last_match(2).to_i
+            when /^(\d+)(?:\.\.|-)(\d+)$/
+              $1.to_i..$2.to_i
             else
               addr.to_i
             end
@@ -48,17 +48,22 @@ class MQTTBridge
           queries.each do |subquery|
             registers.merge!(@abc.modbus_slave.read_multiple_holding_registers(*subquery))
           end
-          result = Aurora.print_registers(registers)
-          @homie.mqtt.publish("#{@homie.topic}/$modbus/response", result, retain: false, qos: 1)
-        when %r{\$modbus/(\d+)$}
-          register = Regexp.last_match(1).to_i
+          Aurora.print_registers(registers) do |register, v|
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
+          end
+        when %r{\$modbus/(\d+)/set$}
+          register = $1.to_i
           value = case value
                   when /\d+/
                     value.to_i
                   when /0x(\d+)/
-                    Regexp.last_match(1).to_i(16)
+                    $1.to_i(16)
                   end
           @abc.modbus_slave.holding_registers[register] = value if value
+          registers = { register => @abc.modbus_slave.holding_registers[register] }
+          Aurora.print_registers(registers) do |r, v|
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{r}", v, retain: false, qos: 1)
+          end
         end
       end
     rescue StandardError => e
@@ -72,25 +77,8 @@ class MQTTBridge
       begin
         @mutex.synchronize do
           @abc.refresh
-          %i[compressor_speed
-             current_mode
-             dhw_water_temperature
-             entering_air_temperature
-             entering_water_temperature
-             fan_speed
-             leaving_air_temperature
-             leaving_water_temperature
-             outdoor_temperature
-             relative_humidity
-             waterflow
-             fp1
-             fp2
-             compressor_watts
-             blower_watts
-             aux_heat_watts
-             loop_pump_watts
-             total_watts].each do |property|
-            @homie_abc[property.to_s.tr("_", "-")].value = @abc.public_send(property)
+          @homie_abc.each do |property|
+            property.value = @abc.public_send(property.id.tr("-", "_"))
           end
 
           @abc.zones.each_with_index do |z, idx|
@@ -123,7 +111,9 @@ class MQTTBridge
                     unit: "ºF")
       node.property("leaving-water-temperature", "Leaving Water Temperature", :float, @abc.leaving_water_temperature,
                     unit: "ºF")
-      node.property("outdoor-temperature", "Outdoor Temperature", :float, @abc.outdoor_temperature, unit: "ºF")
+      unless @abc.outdoor_temperature.zero? # TODO: figure out the config if this actually exists
+        node.property("outdoor-temperature", "Outdoor Temperature", :float, @abc.outdoor_temperature, unit: "ºF")
+      end
       node.property("relative-humidity", "Relative Humidity", :integer, @abc.relative_humidity, unit: "%",
                                                                                                 format: 0..100)
       node.property("waterflow", "Waterflow", :float, unit: "gpm")
@@ -134,6 +124,15 @@ class MQTTBridge
         node.property(component.tr("_", "-"), component.tr("_", " ").titleize, :integer,
                       @abc.public_send(component), unit: "W")
       end
+
+      node.property("blower-only-ecm-speed", "Blower Only ECM Speed", :integer, @abc.blower_only_ecm_speed,
+                    format: 1..12) do |value, property|
+        @mutex.synchronize { property.value = @abc.blower_only_ecm_speed = value }
+      end
+      node.property("aux-heat-ecm-speed", "Aux Heat ECM Speed", :integer, @abc.aux_heat_ecm_speed,
+                    format: 1..12) do |value, property|
+        @mutex.synchronize { property.value = @abc.aux_heat_ecm_speed = value }
+      end
     end
 
     @abc.zones.each_with_index do |zone, i|
@@ -183,7 +182,7 @@ class MQTTBridge
 
     # direct access to modbus registers for debugging purposes
     @homie.mqtt.subscribe("#{@homie.topic}/$modbus")
-    @homie.mqtt.subscribe("#{@homie.topic}/$modbus/+")
+    @homie.mqtt.subscribe("#{@homie.topic}/$modbus/+/set")
     @homie.publish
   end
 end

data/lib/aurora/abc_client.rb

@@ -18,6 +18,8 @@ module Aurora
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
+                :blower_only_ecm_speed,
+                :aux_heat_ecm_speed,
                 :compressor_watts,
                 :blower_watts,
                 :aux_heat_watts,
@@ -31,17 +33,18 @@ module Aurora
       registers_array = @modbus_slave.holding_registers[105...110]
       registers = registers_array.each_with_index.map { |r, i| [i + 105, r] }.to_h
       @serial_number = Aurora.transform_registers(registers)[105]
-      iz2_zone_count = @modbus_slave.holding_registers[483]
-      # TODO: better detect IZ2/Non-IZ2
-      @zones = if iz2_zone_count > 1
-                 (0...iz2_zone_count).map { |i| IZ2Zone.new(self, i + 1) }
-               else
+
+      @zones = if @modbus_slave.holding_registers[813].zero?
                  [Thermostat.new(self)]
+               else
+                 iz2_zone_count = @modbus_slave.holding_registers[483]
+                 (0...iz2_zone_count).map { |i| IZ2Zone.new(self, i + 1) }
                end
     end
 
     def refresh
-      registers_to_read = [19..20, 30, 344, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165, 3027, 31_003]
+      registers_to_read = [19..20, 30, 340, 344, 347, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165, 3027,
+                           31_003]
       if zones.first.is_a?(IZ2Zone)
         zones.each_with_index do |_z, i|
           base1 = 21_203 + i * 9
@@ -71,6 +74,8 @@ module Aurora
       @fp1                        = registers[19]
       @fp2                        = registers[20]
       @locked_out                 = registers[1117]
+      @blower_only_ecm_speed      = registers[340]
+      @aux_heat_ecm_speed         = registers[347]
       @compressor_watts           = registers[1147]
       @blower_watts               = registers[1149]
       @aux_heat_watts             = registers[1151]
@@ -99,6 +104,18 @@ module Aurora
       end
     end
 
+    def blower_only_ecm_speed=(value)
+      return unless (1..12).include?(value)
+
+      @modbus_slave.holding_registers[340] = value
+    end
+
+    def aux_heat_ecm_speed=(value)
+      return unless (1..12).include?(value)
+
+      @modbus_slave.holding_registers[347] = value
+    end
+
     def inspect
       "#<Aurora::ABCClient #{(instance_variables - [:@modbus_slave]).map do |iv|
                                "#{iv}=#{instance_variable_get(iv).inspect}"

data/lib/aurora/registers.rb

@@ -497,7 +497,7 @@ module Aurora
   REGISTER_NAMES = {
     1 => "Random Start Delay",
     2 => "ABC Program Version",
-    3 => "IZ2 Version?",
+    3 => "??? Version?",
     4 => "DIP Switch Override",
     6 => "Compressor Anti-Short Cycle Delay",
     8 => "Unit Type?",
@@ -563,7 +563,7 @@ module Aurora
     746 => "Cooling Set Point",
     747 => "Ambient Temperature",
     807 => "AXB Version",
-    813 => "IZ2 Version?",
+    813 => "IZ2 Version",
     816 => "AOC Version 1?",
     817 => "AOC Version 2?",
     819 => "MOC Version 1?",
@@ -648,7 +648,7 @@ module Aurora
   end
 
   def print_registers(registers)
-    result = []
+    result = [] unless block_given?
     registers.each do |(k, value)|
       # ignored
       next if REGISTER_NAMES.key?(k) && REGISTER_NAMES[k].nil?
@@ -665,8 +665,13 @@ module Aurora
 
       name ||= "???"
 
-      result << "#{name} (#{k}): #{value}"
+      full_value = "#{name} (#{k}): #{value}"
+      if block_given?
+        yield(k, full_value)
+      else
+        result << full_value
+      end
     end
-    result.join("\n")
+    result.join("\n") unless block_given?
   end
 end

data/lib/aurora/version.rb

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

metadata

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