waterfurnace_aurora 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc02021d49b86596b6f1d40c244b3e3671280c578cc9cd869fc936f2c219a0bf
-  data.tar.gz: 795aa42ff626534a4750eb181e5299f82d0603f677a6b9d1fb2d8418046643c6
+  metadata.gz: 2e4165620d720c36045b8f8aa29a553d6de03aa555ac9083f5491ea47087ee4b
+  data.tar.gz: 8532386c1f010471d2d99a2318540eada6a9aa670f9efd1251f632c2db12c11d
 SHA512:
-  metadata.gz: 978a3a910d919a85a79f1d272ecec65b68908472492e25dcc8f7bc8f1ddc414f82ef1c22268e092ce026c0dbb90f48c73e9ede9f30144df3f2978fb5abf70b6b
-  data.tar.gz: 93336e684ab033ca48539738634e8835deffaac4fb5c7275269086e21a134f1f5ad2793c4ae859a806c385dec88811ed720ec837dda0c5f7cd4a068e24cb3338
+  metadata.gz: 023b5180a5a35524670d954be623a6b806d0be96070eb26c6820277544948316583d4b698843bd937f8e0c583f933398dcb6a0c91356872967092cfcb6ff4955
+  data.tar.gz: 15033ae835c70fc3532ddaadef932e0498bb8504938066cfd9fbfca494772b5642f6e21b6483ca52499db5baf506d03aeb458b3a1cf899970eb128fd8fc4cf26

data/exe/aurora_fetch

@@ -15,6 +15,10 @@ options = OptionParser.new do |opts|
 
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
   opts.on("-y", "--yaml", "Output raw values as YAML") { yaml = true }
+  opts.on("-v", "--version", "Print version") do
+    puts Aurora::VERSION
+    exit
+  end
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit

data/exe/aurora_monitor

@@ -22,6 +22,10 @@ options = OptionParser.new do |opts|
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
   opts.on("--ignore-awl-heartbeat", "Don't print AWL heartbeat requests") { ignore_awl_heartbeat = true }
   opts.on("--ignore-sensors", "Don't print sensor registers (i.e. because they change a lot)") { ignore_sensors = true }
+  opts.on("-v", "--version", "Print version") do
+    puts Aurora::VERSION
+    exit
+  end
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit

data/exe/aurora_mqtt_bridge

@@ -15,6 +15,10 @@ options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_mqtt_bridge /path/to/serial/port [options]"
 
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
+  opts.on("-v", "--version", "Print version") do
+    puts Aurora::VERSION
+    exit
+  end
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit
@@ -227,7 +231,7 @@ class MQTTBridge
 
     @humidistat = @homie.node("humidistat", "Humidistat", "Humidistat") do |node|
       node.property("relative-humidity", "Relative Humidity", :integer, @abc.humidistat.relative_humidity,
-         unit: "%", format: 0..100)
+                    unit: "%", format: 0..100)
       if @abc.humidistat.humidifier?
         node.property("humidifier-running", "Humidifier is running", :boolean, @abc.humidistat.humidifier_running?)
         node.property("humidifier-mode", "Humidifier Mode", :enum, @abc.humidistat.humidifier_mode,

data/exe/web_aid_tool

@@ -14,6 +14,10 @@ options = OptionParser.new do |opts|
 
   opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
   opts.on("--monitor", "Print interpreted registers as they are requested, like aurora_monitor") { monitor = true }
+  opts.on("-v", "--version", "Print version") do
+    puts Aurora::VERSION
+    exit
+  end
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit

data/lib/aurora/humidistat.rb

@@ -43,7 +43,7 @@ module Aurora
 
       base = abc.iz2? ? 31_109 : 12_309
       humidifier_settings_register = abc.iz2? ? 21_114 : 12_309
-      @humidifier_settings = registers[humidifier_settings_register]&.last&.[](2..)&.to_i(16)
+      @humidifier_settings = registers[humidifier_settings_register]&.last&.[](2..-1)&.to_i(16)
       @humidifier_mode = registers[humidifier_settings_register]&.include?(:auto_humidification) ? :auto : :manual
       @dehumidifier_mode = registers[humidifier_settings_register]&.include?(:auto_dehumidification) ? :auto : :manual
 

data/lib/aurora/modbus/server.rb

@@ -10,20 +10,20 @@ module Aurora
           return unless ((req.length - 1) % 4).zero?
 
           params = []
-          req[1..].unpack("n*").each_slice(2) do |(addr, quant)|
+          req[1..-1].unpack("n*").each_slice(2) do |(addr, quant)|
             params << { addr: addr, quant: quant }
           end
           params
         when 66
           return unless ((req.length - 1) % 2).zero?
 
-          req[1..].unpack("n*")
+          req[1..-1].unpack("n*")
         when 67
           # 1 function register, a multiple of two words
           return unless ((req.length - 1) % 4).zero?
 
           params = []
-          req[1..].unpack("n*").each_slice(2) do |(addr, val)|
+          req[1..-1].unpack("n*").each_slice(2) do |(addr, val)|
             params << { addr: addr, val: val }
           end
           params

data/lib/aurora/mqtt_modbus.rb

@@ -11,7 +11,7 @@ module Aurora
       @mqtt = MQTT::Client.new(uri)
       @mqtt.connect
 
-      @base_topic = uri.path[1..]
+      @base_topic = uri.path[1..-1]
       @mqtt.subscribe("#{@base_topic}/getregs/response")
     end
 

data/lib/aurora/registers.rb

@@ -186,7 +186,7 @@ module Aurora
     "RPM Sensor Signal Fault" => (78..82),
     "Under-Voltage Stop" => (83..87),
     "Rotor Locked" => (88..92),
-    "Standby" => (93..)
+    "Standby" => (93..99) # should be infinite, but ruby 2.5 doesn't support it
   }.freeze
 
   def vs_fault(value)

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -150,7 +150,7 @@ files:
 - lib/aurora/thermostat.rb
 - lib/aurora/version.rb
 - lib/waterfurnace_aurora.rb
-homepage: https://github.com/ccutrer/waterfurnace
+homepage: https://github.com/ccutrer/waterfurnace_aurora
 licenses:
 - MIT
 metadata: {}
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="