waterfurnace_aurora 0.3.4 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe09cd2a6e4d3dea0a4ebe3548c86fb5a0ed25025e07b11565c4706a82267ef
-  data.tar.gz: ded746f6e623b489ea364623307b7589b2d3b7002cd2b051b0be28f26d701252
+  metadata.gz: c36888a334377168fdfcdc0ef75481925b0249b19d62cae4c381a2dc13b1f80f
+  data.tar.gz: 1533ce2068ba912e12110b6c094b2431fbd8e80593a06b5c9378634ef6418413
 SHA512:
-  metadata.gz: bbe91b347c1056af614f4290a52ec2f2eb3dc64883b30a129ea41d8353626835738fb8169b2081d56d5688f6910e584b1805403317ed4b29de7d6ee674ca8f9a
-  data.tar.gz: 1d6211ea820d958976201635bbfb239c53ab9a1818cc4779263ce6dda72aaaf669ae26751dd2abe5f82038bc21af7d6a6495b398e89bb4f9c1cc20b6cc876cb9
+  metadata.gz: 7cd4b65faa764dab63a662023710324ffe20874e11c565fab5bd5be30d4edce6d593266cc4ae688d3181f345a2d179d733d74b49524e2581bb26718dc64f2ebf
+  data.tar.gz: 0d6e3ab96d4de61d16c4c4f8e1667b98535a2c95d1c053a836d0107c16a854182bdc259af1905ac85e08ecd88b73c03076d355032f4832a21aa9c47729ff6209

data/exe/aurora_fetch

@@ -7,20 +7,23 @@ require "uri"
 
 uri = URI.parse(ARGV[0])
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
 
 client = ModBus::RTUClient.new(*args)
-client.logger = Logger.new($stdout, :debug)
 slave = client.with_slave(1)
+abc = Aurora::ABCClient.new(slave)
+registers = abc.query_registers(ARGV[1])
 
-registers = slave.holding_registers[ARGV[1].to_i]
-
-puts registers.inspect
+puts Aurora.print_registers(registers)

data/exe/aurora_mock

@@ -8,12 +8,16 @@ require "yaml"
 
 uri = URI.parse(ARGV[0])
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end

data/exe/aurora_monitor

@@ -36,12 +36,16 @@ last_registers = {}
 SENSOR_REGISTERS = [16, 19, 20, 740, 900, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1147, 1149, 1151,
                     1153, 1165].freeze
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
@@ -49,7 +53,7 @@ args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
 server = ModBus::RTUServer.new(*args)
 server.promiscuous = true
 server.logger = Logger.new($stdout)
-server.logger.level = :debug if debug_modbus
+server.logger.level = debug_modbus ? :debug : :warn
 
 diff_and_print = lambda do |registers|
   registers = registers.slice(*(registers.keys - SENSOR_REGISTERS)) if ignore_sensors

data/exe/aurora_mqtt_bridge

@@ -10,12 +10,16 @@ require "aurora/core_ext/string"
 uri = URI.parse(ARGV[0])
 mqtt_uri = ARGV[1]
 
-args = if uri.scheme == "telnet" || uri.scheme == "rfc2217"
+args = case uri.scheme
+       when "tcp"
+         require "socket"
+         [TCPSocket.new(uri.host, uri.port)]
+       when "telnet", "rfc2217"
          require "net/telnet/rfc2217"
-         [Net::Telnet::RFC2217.new("Host" => uri.host,
-                                   "Port" => uri.port || 23,
-                                   "baud" => 19_200,
-                                   "parity" => Net::Telnet::RFC2217::EVEN)]
+         [Net::Telnet::RFC2217.new(uri.host,
+                                   port: uri.port || 23,
+                                   baud: 19_200,
+                                   parity: :even)]
        else
          [CCutrer::SerialPort.new(uri.path, baud: 19_200, parity: :even)]
        end
@@ -33,32 +37,23 @@ class MQTTBridge
       @mutex.synchronize do
         case topic
         when /\$modbus$/
-          query = value.split(",").map do |addr|
-            case addr
-            when "known"
-              Aurora::REGISTER_NAMES.keys
-            when /^(\d+)\.\.(\d+)$/
-              Regexp.last_match(1).to_i..Regexp.last_match(2).to_i
-            else
-              addr.to_i
-            end
-          end
-          queries = Aurora.normalize_ranges(query)
-          registers = {}
-          queries.each do |subquery|
-            registers.merge!(@abc.modbus_slave.read_multiple_holding_registers(*subquery))
+          registers = @abc.query_registers(value)
+          Aurora.print_registers(registers) do |register, v|
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
           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
+        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 +67,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 +101,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 +114,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 +172,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,37 @@ 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 query_registers(query)
+      ranges = query.split(",").map do |addr|
+        case addr
+        when "known"
+          Aurora::REGISTER_NAMES.keys
+        when /^(\d+)(?:\.\.|-)(\d+)$/
+          $1.to_i..$2.to_i
+        else
+          addr.to_i
+        end
+      end
+      queries = Aurora.normalize_ranges(ranges)
+      registers = {}
+      queries.each do |subquery|
+        registers.merge!(@modbus_slave.read_multiple_holding_registers(*subquery))
+      end
+      registers
+    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 +93,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 +123,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/modbus/slave.rb

@@ -49,7 +49,7 @@ module Aurora
         when 0x80..0xff
           msg += read(io, 3)
         else
-          raise ModBus::Errors::IllegalFunction, "Illegal function: #{function_code}"
+          raise ::ModBus::Errors::IllegalFunction, "Illegal function: #{function_code}"
         end
         msg
       end

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?",
@@ -594,7 +594,10 @@ module Aurora
     12_619 => "Heating Setpoint (write)",
     12_620 => "Cooling Setpoint (write)",
     12_621 => "Fan Mode (write)",
+    3000 => "Compressor Speed?",
+    3001 => "Compressor Speed?",
     3027 => "Compressor Speed",
+    3904 => "Leaving Air Temperature?",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
     31_109 => "Humidifier Mode", # write to 21114
@@ -648,7 +651,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 +668,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.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.8
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rmodbus-ccutrer
   requirement: !ruby/object:Gem::Requirement