waterfurnace_aurora 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77762dc2957715e4f0a1dc4f608158b5f17a4801624f50d8af01ba26c8dc7410
-  data.tar.gz: 338fd829fb1bb364900242d2a4cdacada3e08a3b87214377f81f04b0c5f9eb66
+  metadata.gz: aa7915f9b848e8cea608787f628b077e7fc2d5904044581758099db9a3b26742
+  data.tar.gz: ecf97a652368c8ed73d6bffdea6d1961e1cbb85c0587e50ba5211735368fb7b3
 SHA512:
-  metadata.gz: 1a16b1f69d3b5720bdc323ae27b7de9908573e6a959857dce575273129fcfa5a42e7754ea87a072d28afbc47aa5e8ec9e46b40682fcc9a88dca30c36ec2aa207
-  data.tar.gz: 0d221ae7e69561ab79dd0f9591751492c4282dc4fd33a658cc8bf99ee6973587616f199c6228e7ca2506eb99fb7a622bc77a33d0272cea942ff99177dae22c90
+  metadata.gz: a8b861192fcb395fbec9643840b9b91aaa3d42193d55efda03812d10114a3f4e076afc2eb79a6294bc89a0e340bd5c14f3f2e2fca25e6d1eefa32c9bff359a20
+  data.tar.gz: a35c95acd756183eb2bd2af220e65a182a2206b054453fb49c0e550d512831328d74f72df8e46aec118824efd581fd26e04374b67dbc7898b07f9a964d1123d8

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
@@ -162,9 +166,8 @@ class MQTTBridge
     end
 
     @blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
-      if @abc.blower.respond_to?(:running)
-        node.property("running", "Blower is running", :boolean, @abc.blower.running?)
-      else
+      node.property("running", "Blower is running", :boolean, @abc.blower.running?)
+      if @abc.blower.respond_to?(:speed)
         node.property("speed", "Current blower speed", :integer, @abc.blower.speed, format: @abc.blower.speed_range)
       end
       node.property("watts", "Energy Usage", :integer, @abc.blower.watts, unit: "W") if @abc.energy_monitoring?
@@ -228,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
@@ -116,3 +120,7 @@ get "/request.cgi" do
 
   encode_result(result)
 end
+
+# can't rely on this running automatically when we're installed as a gem,
+# because the wrapper script will confuse it
+Sinatra::Application.run!

data/lib/aurora/blower.rb

@@ -4,8 +4,9 @@ require "aurora/component"
 
 module Aurora
   module Blower
-    class GenericBlower < Component
-      attr_reader :type, :watts
+    class PSC < Component
+      attr_reader :type, :watts, :running
+      alias running? running
 
       def initialize(abc, type)
         super(abc)
@@ -22,19 +23,11 @@ module Aurora
 
       def refresh(registers)
         @watts = registers[1148] if abc.energy_monitoring?
+        @running = registers[30].include?(:blower)
       end
     end
 
-    class PSC < GenericBlower
-      attr_reader :running
-      alias running? running
-
-      def refresh(registers)
-        @running = registers[30].include?(:g)
-      end
-    end
-
-    class FiveSpeed < GenericBlower
+    class FiveSpeed < PSC
       attr_reader :speed
 
       def speed_range
@@ -49,7 +42,7 @@ module Aurora
                    3
                  elsif outputs.include?(:cc)
                    2
-                 elsif outputs.include?(:g)
+                 elsif outputs.include?(:blower)
                    1
                  else
                    0
@@ -57,7 +50,7 @@ module Aurora
       end
     end
 
-    class ECM < GenericBlower
+    class ECM < PSC
       attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
                   :iz2_desired_speed
 

data/lib/aurora/humidistat.rb

@@ -42,9 +42,10 @@ module Aurora
       @dehumidifer_running = dehumidifier? && outputs.include?(:accessory2)
 
       base = abc.iz2? ? 31_109 : 12_309
-      @humidifier_settings = registers[abc.iz2? ? 21_114 : 12_309]
-      @humidifier_mode = @humidifier_settings&.include?(:auto_humidification) ? :auto : :manual
-      @dehumidifier_mode = @humidifier_settings&.include?(:auto_dehumidification) ? :auto : :manual
+      humidifier_settings_register = abc.iz2? ? 21_114 : 12_309
+      @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
 
       @humidification_target = registers[base + 1]&.[](:humidification_target)
       @dehumidification_target = registers[base + 1]&.[](:dehumidification_target)
@@ -64,7 +65,7 @@ module Aurora
 
       # start with the prior value of the register, since I'm not sure what
       # else is stuffed in there
-      raw_value = @humidifier_settings &= ~0xc000
+      raw_value = @humidifier_settings
       raw_value |= 0x4000 if humidifier_mode == :auto
       raw_value |= 0x8000 if dehumidifier_mode == :auto
       holding_registers[abc.iz2? ? 21_114 : 12_309] = raw_value
@@ -84,7 +85,7 @@ module Aurora
       raise ArgumentError unless (15..50).include?(humidification_target)
       raise ArgumentError unless (35..65).include?(dehumidification_target)
 
-      holding_registers[iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
+      holding_registers[abc.iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
       @humidification_target = humidification_target
       @dehumidification_target = dehumidification_target
     end

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.0"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +123,6 @@ dependencies:
 description: 
 email: cody@cutrer.com'
 executables:
-- grab_awl_assets.sh
 - aurora_monitor
 - aurora_mqtt_bridge
 - web_aid_tool
@@ -130,7 +135,6 @@ files:
 - exe/aurora_mock
 - exe/aurora_monitor
 - exe/aurora_mqtt_bridge
-- exe/grab_awl_assets.sh
 - exe/web_aid_tool
 - lib/aurora.rb
 - lib/aurora/abc_client.rb
@@ -150,7 +154,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 +166,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:
   - - ">="

data/exe/grab_awl_assets.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-mkdir -p html
-mkdir -p html/css
-mkdir -p html/js
-mkdir -p html/images
-
-IP=${1:-172.20.10.1}
-
-curl http://$IP/ > html/index.htm
-curl http://$IP/config.htm > html/config.htm
-curl http://$IP/favicon.ico > html/favicon.ico
-curl http://$IP/css/index.css > html/css/index.css
-curl http://$IP/css/phone.css > html/css/phone.css
-curl http://$IP/js/indexc.js > html/js/indexc.js
-curl http://$IP/js/configc.js > html/js/configc.js
-curl http://$IP/images/aurora.png > html/images/aurora.png
-curl http://$IP/images/back.png > html/images/back.png
-curl http://$IP/images/cfailed.png > html/images/cfailed.png
-curl http://$IP/images/cgood.png > html/images/cgood.png
-curl http://$IP/images/cidle.png > html/images/cidle.png