waterfurnace_aurora 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905c1f1482c71537925ed6927d9be1d28ed66a4bea6227021f8b43fe0f96f0d8
-  data.tar.gz: 33d2171f7fd097556fb0c3f8c438edebb222029ecf8a810917d92388cace49c0
+  metadata.gz: 3818cdd3c436ede6d451b02220702b2e27ab5c904deed2258b0329e3ddfc85c2
+  data.tar.gz: 7770c14ff60b4bcc3f3614d57986233cb414b35bbae4857ff7726ca68c3c1796
 SHA512:
-  metadata.gz: bf6e1aca58046b0b8f7a35d390c6461a130437457b445510658798c304830aad95239573e286587fed55bfb8d962e03ef9ae98d46cd3425b084616061b393287
-  data.tar.gz: 3afb644427cf483bf7bc77de0b49b6a00236d416afc46bb3ec9d2cd5c1eb6ee9fbd3783d8588ee025545b842bc95ea46afad3e1f9dc5af2873aa3c88c7d36e07
+  metadata.gz: e1d2e8b8a571068f5f905b7bb16ccb53414df338b9bbaf3c39f162015bd3a6dd95ea6fa9067db7a8342e099c6e99ce1311477823348b97da989847b690a0f470
+  data.tar.gz: 16d8ca6f18aae43bbd4d87b286b4a07da01be0e39a2c10d5e99857b46495ed3cc683692b9d8f553683606716225dbf763592f7812fe6deb80245cffd9dfbb920

data/lib/aurora/abc_client.rb

@@ -199,7 +199,7 @@ module Aurora
       @entering_air_register = awl_axb? ? 740 : 567
       @registers_to_read = [6, 19..20, 25, 30..31, 112, 344, @entering_air_register]
       @registers_to_read << 1104 if axb?
-      @registers_to_read.concat([741, 31_003]) if awl_communicating?
+      @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 << 900 if awl_axb?
@@ -211,7 +211,7 @@ module Aurora
         @registers_to_read.concat(component.registers_to_read)
       end
       # need dehumidify mode to calculate final current mode
-      @registers_to_read.concat([362]) if compressor.is_a?(Compressor::VSDrive)
+      @registers_to_read.push(362) if compressor.is_a?(Compressor::VSDrive)
     end
 
     def query_registers(query)
@@ -315,11 +315,11 @@ module Aurora
       value = 0
       value = 0x7fff if mode == :off
       value |= 0x100 if mode == :cooling
-      value |= blower_speed == :with_compressor ? 0xf0 : (blower_speed << 4)
+      value |= (blower_speed == :with_compressor) ? 0xf0 : (blower_speed << 4)
       value |= 0x200 if aux_heat
 
       @modbus_slave.holding_registers[3002] = value
-      @modbus_slave.holding_registers[323] = pump_speed == :with_compressor ? 0x7fff : pump_speed
+      @modbus_slave.holding_registers[323] = (pump_speed == :with_compressor) ? 0x7fff : pump_speed
     end
 
     # I'm not sure if this is correct. 5 Series documentation says

data/lib/aurora/compressor.rb

@@ -19,7 +19,7 @@ module Aurora
       end
 
       def type
-        "#{@stages == 2 ? "Dual" : "Single"} Stage Compressor"
+        "#{(@stages == 2) ? "Dual" : "Single"} Stage Compressor"
       end
 
       def speed_range
@@ -28,7 +28,7 @@ module Aurora
 
       def registers_to_read
         result = [19]
-        result.concat([1109, 1134, 1154..1157]) if abc.refrigeration_monitoring?
+        result.push(1109, 1134, 1154..1157) if abc.refrigeration_monitoring?
         result << (1146..1147) if abc.energy_monitoring?
         result
       end

data/lib/aurora/modbus/server.rb

@@ -76,4 +76,4 @@ 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.concat([65, 66, 67, 68])
+ModBus::Server::Funcs.push(65, 66, 67, 68)

data/lib/aurora/pump.rb

@@ -15,7 +15,7 @@ module Aurora
 
       def registers_to_read
         result = [1117]
-        result.concat([1164..1165]) if abc.energy_monitoring?
+        result.push(1164..1165) if abc.energy_monitoring?
         result
       end
 

data/lib/aurora/registers.rb

@@ -44,11 +44,11 @@ module Aurora
     totals
   end
 
-  NEGATABLE = ->(v) { v & 0x8000 == 0x8000 ? v - 0x10000 : v }
+  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 }
+  TO_LAST_LOCKOUT = ->(v) { (v & 0x8000 == 0x8000) ? v & 0x7fff : nil }
 
   def from_bitmask(value, flags)
     result = []
@@ -67,7 +67,7 @@ module Aurora
 
   def to_int32(registers, idx)
     v = to_uint32(registers, idx)
-    v & 0x80000000 == 0x80000000 ? v - 0x100000000 : v
+    (v & 0x80000000 == 0x80000000) ? v - 0x100000000 : v
   end
 
   def to_string(registers, idx, length)
@@ -212,13 +212,13 @@ module Aurora
     return :manual if value == 0x7fff
 
     {
-      fp1: value & 0x01 == 0x01 ? 30 : 15,
-      fp2: value & 0x02 == 0x02 ? 30 : :off,
-      reversing_valve: value & 0x04 == 0x04 ? :o : :b, # cycle to cool on O, or !B
+      fp1: (value & 0x01 == 0x01) ? 30 : 15,
+      fp2: (value & 0x02 == 0x02) ? 30 : :off,
+      reversing_valve: (value & 0x04 == 0x04) ? :o : :b, # cycle to cool on O, or !B
       accessory_relay: ACCESSORY_RELAY_SETTINGS[(value >> 3) & 0x3],
-      compressor: value & 0x20 == 0x20 ? 1 : 2, # single or dual stage compressor
-      lockout: value & 0x40 == 0x40 ? :continuous : :pulse,
-      dehumidifier_reheat: value & 0x80 == 0x80 ? :dehumidifier : :reheat
+      compressor: (value & 0x20 == 0x20) ? 1 : 2, # single or dual stage compressor
+      lockout: (value & 0x40 == 0x40) ? :continuous : :pulse,
+      dehumidifier_reheat: (value & 0x80 == 0x80) ? :dehumidifier : :reheat
     }
   end
 
@@ -256,8 +256,8 @@ module Aurora
 
   def status(value)
     result = {
-      lps: value & 0x80 == 0x80 ? :closed : :open,
-      hps: value & 0x100 == 0x100 ? :closed : :open
+      lps: (value & 0x80 == 0x80) ? :closed : :open,
+      hps: (value & 0x100 == 0x100) ? :closed : :open
     }
     SYSTEM_INPUTS.each do |(i, name)|
       result[name] = true if value & i == i
@@ -316,7 +316,7 @@ module Aurora
     result[:ha2] = value & 0x004 == 0x004
     result[:pump_slave] = value & 0x008 == 0x008
 
-    result[:mb_address] = value & 0x010 == 0x010 ? 3 : 4
+    result[:mb_address] = (value & 0x010 == 0x010) ? 3 : 4
     result[:sw1_2] = value & 0x020 == 0x020 # future use # rubocop:disable Naming/VariableNumber
     result[:sw1_3] = value & 0x040 == 0x040 # future use # rubocop:disable Naming/VariableNumber
     result[:accessory_relay2] = if value & 0x080 == 0x080 && value & 0x100 == 0x100
@@ -387,7 +387,7 @@ module Aurora
     return :off if value == 0x7fff
 
     result = {
-      mode: value & 0x100 == 0x100 ? :cooling : :heating
+      mode: (value & 0x100 == 0x100) ? :cooling : :heating
     }
     result[:aux_heat] = true if value & 0x200 == 0x200
     result[:compressor_speed] = value & 0xf
@@ -464,7 +464,7 @@ module Aurora
     result = {
       call: CALLS[(v >> 1) & 0x7],
       mode: HEATING_MODE[(v >> 8) & 0x03],
-      damper: v & 0x10 == 0x10 ? :open : :closed
+      damper: (v & 0x10 == 0x10) ? :open : :closed
     }
     if prior_v
       carry = prior_v.is_a?(Hash) ? prior_v[:heating_target_temperature_carry] : v & 0x01
@@ -479,7 +479,7 @@ module Aurora
   def zone_configuration3(value)
     size = (value >> 3) & 0x3
     result = {
-      zone_priority: (value & 0x20) == 0x20 ? :economy : :comfort,
+      zone_priority: ((value & 0x20) == 0x20) ? :economy : :comfort,
       zone_size: ZONE_SIZES[size],
       normalized_size: value >> 8
     }
@@ -944,7 +944,7 @@ module Aurora
       value_proc = REGISTER_CONVERTERS.find { |(_, z)| z.include?(k) }&.first
       next unless value_proc
 
-      value = value_proc.arity == 2 ? value_proc.call(registers, k) : value_proc.call(v)
+      value = (value_proc.arity == 2) ? value_proc.call(registers, k) : value_proc.call(v)
       registers[k] = value
     end
     registers
@@ -981,7 +981,7 @@ module Aurora
       format = REGISTER_FORMATS.find { |(_, z)| z.include?(k) }&.first || "%s"
       format = "%1$d (0x%1$04x)" unless name
 
-      value = value_proc.arity == 2 ? value_proc.call(registers, k) : value_proc.call(value)
+      value = (value_proc.arity == 2) ? value_proc.call(registers, k) : value_proc.call(value)
       value = value.join(", ") if value.is_a?(Array)
       value = format(format, value) if value
 

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2023-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -33,7 +33,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
@@ -165,11 +165,11 @@ dependencies:
 description: 
 email: cody@cutrer.us'
 executables:
+- aurora_fetch
+- aurora_mock
 - aurora_monitor
 - aurora_mqtt_bridge
 - web_aid_tool
-- aurora_mock
-- aurora_fetch
 extensions: []
 extra_rdoc_files: []
 files:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Library for communication with WaterFurnace Aurora control systems