waterfurnace_aurora 1.4.7 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3818cdd3c436ede6d451b02220702b2e27ab5c904deed2258b0329e3ddfc85c2
-  data.tar.gz: 7770c14ff60b4bcc3f3614d57986233cb414b35bbae4857ff7726ca68c3c1796
+  metadata.gz: b28b02578f6c8cee89665c9bbbeee63beca4293b0e00ed443136ef38a2d42471
+  data.tar.gz: 54abf4d6ece6a830e8e26c7b75ca2e062261adbf5ac88369b28d71aca2924ad8
 SHA512:
-  metadata.gz: e1d2e8b8a571068f5f905b7bb16ccb53414df338b9bbaf3c39f162015bd3a6dd95ea6fa9067db7a8342e099c6e99ce1311477823348b97da989847b690a0f470
-  data.tar.gz: 16d8ca6f18aae43bbd4d87b286b4a07da01be0e39a2c10d5e99857b46495ed3cc683692b9d8f553683606716225dbf763592f7812fe6deb80245cffd9dfbb920
+  metadata.gz: 07dee234ff32befc9ac76c1b7eae9225aaaaf0a3421efda39339472242eda1d8bc7a5020509942d711ab03558d5cc9e78260b8677a2af537c1aeb1ab4968125d
+  data.tar.gz: c0b386559d04b2544a7b421c5a5ae03d130171160af6b7bca8b0f4ac7ff1c49772a74fd2b979a5eb5c3e7f041ce616e5104e4ea075fd1cbc7c602f5f529df1dc

data/exe/aurora_monitor

@@ -12,7 +12,8 @@ diff_only = debug_modbus = ignore_awl_heartbeat = ignore_sensors = false
 options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_monitor /path/to/serial/port [options]"
 
-  opts.on("-q", "--quiet",
+  opts.on("-q",
+          "--quiet",
           "Enables quiet mode (--diff-only, --ignore-awl-heartbeat, --ignore-sensors) to ease in deciphering new registers") do # rubocop:disable Layout/LineLength
     diff_only = true
     ignore_awl_heartbeat = true
@@ -43,8 +44,35 @@ uri = URI.parse(ARGV[0])
 
 last_registers = {}
 
-SENSOR_REGISTERS = [16, 19, 20, 740, 900, 901, 903, 908, 909, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117,
-                    1134, 1148, 1149, 1150, 1151, 1152, 1153, 1164, 1165, 3326, 3330].freeze
+SENSOR_REGISTERS = [16,
+                    19,
+                    20,
+                    740,
+                    900,
+                    901,
+                    903,
+                    908,
+                    909,
+                    1109,
+                    1105,
+                    1106,
+                    1107,
+                    1108,
+                    1110,
+                    1111,
+                    1114,
+                    1117,
+                    1134,
+                    1148,
+                    1149,
+                    1150,
+                    1151,
+                    1152,
+                    1153,
+                    1164,
+                    1165,
+                    3326,
+                    3330].freeze
 
 io = case uri.scheme
      when "tcp"

data/exe/aurora_mqtt_bridge

@@ -19,7 +19,7 @@ options = OptionParser.new do |opts|
 
   opts.on("--device-name DEVICENAME", "Give a descriptive name to your device") { |v| device_name = v }
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
-  opts.on("--web-aid-tool PORT", "Run web aid tool on given port", :integer) { |v| web_aid_tool = v }
+  opts.on("--web-aid-tool PORT", "Run web aid tool on given port", Integer) { |v| web_aid_tool = v }
   opts.on("-v", "--version", "Print version") do
     puts Aurora::VERSION
     exit
@@ -70,7 +70,8 @@ class MQTTBridge
           registers = @abc.modbus_slave.read_multiple_holding_registers(*queries)
           result = registers.values.join(",")
           @homie.mqtt.publish("#{@homie.topic}/$modbus/getregs/response",
-                              "#{query_id}:#{result}", qos: 1)
+                              "#{query_id}:#{result}",
+                              qos: 1)
         when %r{\$modbus/(\d+)/set$}
           register = $1.to_i
           value = case value
@@ -236,13 +237,13 @@ class MQTTBridge
                                         state_class: :measurement } })
       end
 
-      node.property("line-voltage",
+      node.property("line-voltage-setting",
                     "Line Voltage Setting",
                     :integer,
                     @abc.line_voltage,
                     format: 90..635,
                     unit: "V") do |value|
-                      @mutex.synchronize { @abc.line_voltage = value }
+                      @mutex.synchronize { @abc.line_voltage_setting = value }
                     end
       if (-999..999).cover?(@abc.air_coil_temperature)
         node.property("air-coil-temperature",
@@ -255,6 +256,13 @@ class MQTTBridge
                                         entity_category: :diagnostic } })
       end
       if @abc.energy_monitoring?
+        node.property("line-voltage",
+                      "Line Voltage",
+                      :integer,
+                      @abc.line_voltage,
+                      format: 90..635,
+                      unit: "V")
+
         node.property("watts",
                       "Total Power Usage",
                       :integer,
@@ -490,7 +498,7 @@ class MQTTBridge
                       @abc.blower.public_send(field),
                       format: 1..12,
                       hass: { number: { entity_category: :config } }) do |value|
-          @mutex.synchronize { @abc.blower.public_send("#{field}=", value) }
+          @mutex.synchronize { @abc.blower.public_send(:"#{field}=", value) }
         end
       end
 
@@ -798,7 +806,8 @@ class MQTTBridge
           @mutex.synchronize { zone.heating_target_temperature = value }
         end
         node.property("cooling-target-temperature",
-                      "Cooling Target Temperature", :integer,
+                      "Cooling Target Temperature",
+                      :integer,
                       zone.cooling_target_temperature,
                       unit: "°F",
                       format: 54..99) do |value|

data/lib/aurora/abc_client.rb

@@ -106,7 +106,7 @@ module Aurora
         last_log_time ||= Process.clock_gettime(Process::CLOCK_MONOTONIC)
         now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         if now - last_log_time > 5
-          Aurora&.logger&.info("Fetching register(s) #{query}...")
+          Aurora.logger&.info("Fetching register(s) #{query}...")
           last_log_time = now
         end
         last_log_time
@@ -141,6 +141,7 @@ module Aurora
                 :outdoor_temperature,
                 :air_coil_temperature,
                 :line_voltage,
+                :line_voltage_setting,
                 :watts
 
     alias_method :emergency_shutdown?, :emergency_shutdown
@@ -201,7 +202,7 @@ module Aurora
       @registers_to_read << 1104 if axb?
       @registers_to_read.push(741, 31_003) if awl_communicating?
       @registers_to_read << (1110..1111) if performance_monitoring?
-      @registers_to_read << (1150..1153) if energy_monitoring?
+      @registers_to_read.push(16, 1150..1153) if energy_monitoring?
       @registers_to_read << 900 if awl_axb?
       zones.each do |z|
         @registers_to_read.concat(z.registers_to_read)
@@ -243,7 +244,8 @@ module Aurora
       @high_pressure_switch       = registers[31][:hps]
       @emergency_shutdown         = !!registers[31][:emergency_shutdown]
       @load_shed                  = !!registers[31][:load_shed]
-      @line_voltage               = registers[112]
+      @line_voltage               = registers[16] if energy_monitoring?
+      @line_voltage_setting       = registers[112]
       @watts                      = registers[1153]
 
       @current_mode = if outputs.include?(:lockout)
@@ -285,7 +287,7 @@ module Aurora
       @modbus_slave.holding_registers[419] = (value * 10).to_i
     end
 
-    def line_voltage=(value)
+    def line_voltage_setting=(value)
       raise ArgumentError unless (90..635).cover?(value)
 
       @modbus_slave.holding_registers[112] = value

data/lib/aurora/blower.rb

@@ -51,7 +51,11 @@ module Aurora
     end
 
     class ECM < PSC
-      attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
+      attr_reader :speed,
+                  :blower_only_speed,
+                  :low_compressor_speed,
+                  :high_compressor_speed,
+                  :aux_heat_speed,
                   :iz2_desired_speed
 
       def speed_range

data/lib/aurora/dhw.rb

@@ -22,7 +22,7 @@ module Aurora
       holding_registers[400] = value ? 1 : 0
     end
 
-    def set_point=(value) # rubocop:disable Naming/AccessorMethodName
+    def set_point=(value)
       raise ArgumentError unless (100..140).cover?(value)
 
       raw_value = (value * 10).to_i

data/lib/aurora/humidistat.rb

@@ -4,8 +4,11 @@ require "aurora/component"
 
 module Aurora
   class Humidistat < Component
-    attr_reader :humidifier_running, :humidifier_mode, :humidification_target,
-                :dehumidifier_mode, :dehumidification_target,
+    attr_reader :humidifier_running,
+                :humidifier_mode,
+                :humidification_target,
+                :dehumidifier_mode,
+                :dehumidification_target,
                 :relative_humidity
     alias_method :humidifier_running?, :humidifier_running
 

data/lib/aurora/modbus/server.rb

@@ -76,4 +76,7 @@ end
 # 66 => read multiple discontiguous registers (command is a list of addrs)
 # 67 => write multiple discontiguous registers (command is a list of pairs of addr and value; response has no content)
 # 68 => ?? request has 4 bytes, response has 1 byte that seems to be 0 (for success?)
-ModBus::Server::Funcs.push(65, 66, 67, 68)
+funcs = ModBus::Server::FUNCS.dup
+funcs.push(65, 66, 67, 68)
+ModBus::Server.send(:remove_const, :FUNCS)
+ModBus::Server.const_set(:FUNCS, funcs.freeze)

data/lib/aurora/registers.rb

@@ -61,7 +61,7 @@ module Aurora
   end
 
   def to_uint32(registers, idx)
-    Aurora&.logger&.warn("Missing register #{idx + 1}") unless registers[idx + 1]
+    Aurora.logger&.warn("Missing register #{idx + 1}") unless registers[idx + 1]
     (registers[idx] << 16) + registers[idx + 1]
   end
 
@@ -494,6 +494,7 @@ 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],
+    # rubocop:disable Layout/MultilineArrayLineBreaks
     TO_TENTHS => [401, 419, 745, 746, 901,
                   1105, 1106, 1107, 1108, 1115, 1116, 1117, 1119,
                   3322, 3323,
@@ -508,6 +509,7 @@ module Aurora
                          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],
+    # rubocop:enable Layout/MultilineArrayLineBreaks
     TO_LAST_LOCKOUT => [26],
     ->(v) { from_bitmask(v, SYSTEM_OUTPUTS) } => [27, 30],
     ->(v) { from_bitmask(v, SYSTEM_INPUTS) } => [28],
@@ -561,6 +563,7 @@ module Aurora
   REGISTER_FORMATS = {
     "%ds" => [1, 6, 9, 15, 84, 85, 110],
     "%dV" => [16, 112, 3331, 3424, 3523],
+    # rubocop:disable Layout/MultilineArrayLineBreaks
     "%0.1f°F" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900, 903,
                   1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
                   3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
@@ -573,6 +576,7 @@ module Aurora
                   21_248, 21_249,
                   31_003,
                   31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
+    # rubocop:enable Layout/MultilineArrayLineBreaks
     "E%d" => [25, 26],
     "%d%%" => [282, 321, 322, 325, 346, 565, 741, 908, 1126, 3332, 3524, 3808],
     "%0.1f psi" => [419, 901, 1115, 1116, 1119, 3322, 3323],

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.9
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-12 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -65,7 +65,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: rmodbus-ccutrer
+  name: rmodbus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -106,62 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.23'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.23'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 description: 
 email: cody@cutrer.us'
 executables:
@@ -218,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Library for communication with WaterFurnace Aurora control systems