waterfurnace_aurora 1.3.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da4fc2ec80153f77b6f1f0971346cc3bdab4cfa59937d6855a1fb4de0be798e0
-  data.tar.gz: a92c46be932d97012865a308f60f890146eab3db29ec9e2499dc88552dd74a29
+  metadata.gz: 2d5bee0f2cffba19731706869b56caf63404b81a1b570de2371123edcc4ca086
+  data.tar.gz: fdfaa768ff29702215564e8fca08b9c709a8e513ca05fbc10af149e80100497d
 SHA512:
-  metadata.gz: d126de657ef1ae47513c8f9a0cfa6c94d4a335e4f4fc4fb467bd3bca9aa193957e6edd506d8fe2ef0d87ec26ba3b4d34dbfa921e9977af3d7182f6db9bdc1341
-  data.tar.gz: 9098c02eb4ce2ac480ebd70739ae6f96b5ca6c7114a040a9374e7edf614b7ffcdd15f28c2750603ff69482cc6f21eede51c58ed686f7a4e82723545ed7b332a7
+  metadata.gz: 13486b5db0bb4bae2c6370a50b41d165b396d7b15b146ed2c97ab340003f2ef661a707508a3846017943e5a86627da7a3843a696f4811a231e3a342105ef94df
+  data.tar.gz: 85f1d9697f5b787226181348aea84bb2735c6e3568e69374ad3768c0c246386ac4229c6f8cdb7a14685808e4dffe07932dfd24d5664be4e8b4885f1f5a016aaa

data/exe/aurora_mqtt_bridge

@@ -11,11 +11,15 @@ require "yaml"
 require "aurora/core_ext/string"
 
 debug_modbus = false
+web_aid_tool = nil
+device_name = "WaterFurnace"
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_mqtt_bridge /path/to/serial/port [options]"
 
+  opts.on("--device-name DEVIECENAME", "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("-v", "--version", "Print version") do
     puts Aurora::VERSION
     exit
@@ -36,10 +40,12 @@ end
 mqtt_uri = ARGV[1]
 
 abc = Aurora::ABCClient.new(ARGV[0])
-abc.modbus_slave.logger = Logger.new($stdout)
-abc.modbus_slave.logger.level = debug_modbus ? :debug : :warn
+Aurora.logger = abc.modbus_slave.logger = Logger.new($stdout)
+Aurora.logger.level = debug_modbus ? :debug : :info
 
 class MQTTBridge
+  attr_reader :mutex
+
   def initialize(abc, homie)
     @abc = abc
     @homie = homie
@@ -86,7 +92,9 @@ class MQTTBridge
 
     @abc.refresh
     publish_basic_attributes
+  end
 
+  def join
     loop do
       begin
         @mutex.synchronize do
@@ -803,13 +811,20 @@ class MQTTBridge
   end
 end
 
-log_level = ARGV.include?("--debug") ? :debug : :warn
-Aurora.logger = Logger.new($stdout)
-Aurora.logger.level = log_level
-abc.modbus_slave.logger = Aurora.logger
-
 device = "aurora-#{abc.serial_number}"
-homie = MQTT::Homie::Device.new(device, "WaterFurnace", mqtt: mqtt_uri)
+homie = MQTT::Homie::Device.new(device, device_name, mqtt: mqtt_uri)
 homie.logger = Aurora.logger
 
-MQTTBridge.new(abc, homie)
+mqtt_bridge = MQTTBridge.new(abc, homie)
+
+if web_aid_tool
+  Thread.new { mqtt_bridge.join }
+
+  require "aurora/web_aid_tool"
+  Aurora::WebAIDTool.modbus_slave = abc.modbus_slave
+  Aurora::WebAIDTool.port = web_aid_tool
+  Aurora::WebAIDTool.mutex = mqtt_bridge.mutex
+  Aurora::WebAIDTool.run!
+else
+  mqtt_bridge.join
+end

data/exe/web_aid_tool

@@ -2,16 +2,17 @@
 # frozen_string_literal: true
 
 require "aurora"
-require "ccutrer-serialport"
+require "aurora/web_aid_tool"
 require "logger"
 require "optparse"
-require "yaml"
 
 debug_modbus = monitor = ignore_missing_registers = false
+port = 4567
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: web_aid_tool /path/to/serial/port [options]"
 
+  opts.on("--port PORT", "Which port to listen on (default 4567)", :integer) { |v| port = v }
   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("--ignore-missing-registers",
@@ -39,92 +40,7 @@ slave = Aurora::ABCClient.open_modbus_slave(ARGV[0], ignore_missing_registers: i
 slave.logger = Logger.new($stdout)
 slave.logger.level = debug_modbus ? :debug : :warn
 
-def parse_query_string(query_string)
-  query_string.split("&").map { |p| p.split("=") }.to_h
-end
-
-# _don't_ do URI escaping
-def encode_result(params)
-  params.map { |p| p.join("=") }.join("&")
-end
-
-require "sinatra"
-
-set :public_folder, "html"
-set :logging, false
-
-get "/" do
-  send_file "html/index.htm"
-end
-
-units = 0
-
-get "/getunits.cgi" do
-  encode_result(units: units)
-end
-
-get "/setunits.cgi" do
-  units = params["units"].to_i
-  encode_result(error: 0)
-end
-
-get "/config.cgi" do
-  encode_result(
-    "AWL Version" => Aurora::VERSION,
-    "Local Web Version" => 1.08,
-    "SSID" => nil,
-    "Units" => units,
-    "AWL ID" => ARGV[0],
-    "AWL ID CRC" => nil
-  )
-end
-
-get "/request.cgi" do
-  params = parse_query_string(request.query_string)
-  result = params.slice("cmd", "id", "set", "addr")
-  result["err"] = nil
-
-  # these are just aliases to get a certain set of registers
-  case params["cmd"]
-  when "abcinfo"
-    params["regs"] = "2;8;88,4"
-  when "devices"
-    params["regs"] = "800;803;806,3;812;815;818;824"
-  end
-
-  case params["cmd"]
-  when "getregs", "abcinfo", "devices"
-    queries = params["regs"].split(";").map do |range|
-      start, length = range.split(",").map(&:to_i)
-      next start if length.nil?
-
-      start...(start + length)
-    end
-    registers = slave.read_multiple_holding_registers(*queries)
-    if monitor
-      puts "READING"
-      puts Aurora.print_registers(registers)
-    end
-    result["values"] = registers.values.join(",")
-  when "putregs"
-    writes = params["regs"].split(";").map do |write|
-      write.split(",").map(&:to_i)
-    end.compact.to_h
-    if monitor
-      puts "WRITING"
-      puts Aurora.print_registers(writes)
-    end
-
-    writes.each do |(addr, value)|
-      slave.write_holding_register(addr, value)
-    end
-  else
-    return ""
-  end
-
-  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!
+Aurora::WebAIDTool.modbus_slave = slave
+Aurora::WebAIDTool.monitor = monitor
+Aurora::WebAIDTool.port = port
+Aurora::WebAIDTool.run!

data/lib/aurora/mqtt_modbus.rb

@@ -19,7 +19,7 @@ module Aurora
       query_id = SecureRandom.uuid
       mqtt_query = queries.map { |m| m.is_a?(Range) ? "#{m.begin},#{m.count}" : m }.join(";")
       @mqtt.publish("#{@base_topic}/getregs", "#{query_id}:#{mqtt_query}", qos: 1)
-      Timeout.timeout(15) do
+      Timeout.timeout(5) do
         result = {}
         loop do
           packet = @mqtt.get

data/lib/aurora/registers.rb

@@ -60,11 +60,16 @@ module Aurora
     result
   end
 
-  def to_int32(registers, idx)
+  def to_uint32(registers, idx)
     Aurora&.logger&.warn("Missing register #{idx + 1}") unless registers[idx + 1]
     (registers[idx] << 16) + registers[idx + 1]
   end
 
+  def to_int32(registers, idx)
+    v = to_uint32(registers, idx)
+    v & 0x80000000 == 0x80000000 ? v - 0x100000000 : v
+  end
+
   def to_string(registers, idx, length)
     (idx...(idx + length)).map do |i|
       next "\ufffd" unless registers[i] # missing data? add unicode invalid character
@@ -533,7 +538,8 @@ module Aurora
     ->(v) { COMPONENT_STATUS[v] } => [800, 803, 806, 812, 815, 818, 824, 827],
     method(:axb_inputs) => [1103],
     ->(v) { from_bitmask(v, AXB_OUTPUTS) } => [1104],
-    method(:to_int32) => [1146, 1148, 1150, 1152, 1154, 1156, 1164, 3422, 3424],
+    method(:to_uint32) => [1146, 1148, 1150, 1152, 1164, 3422, 3424],
+    method(:to_int32) => [1154, 1156],
     method(:manual_operation) => [3002],
     method(:thermostat_configuration2) => [12_006],
     ->(v) { HEATING_MODE[v] } => [12_606, 21_202, 21_211, 21_220, 21_229, 21_238, 21_247],

data/lib/aurora/version.rb

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

data/lib/aurora/web_aid_tool.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require "sinatra/base"
+
+module Aurora
+  class WebAIDTool < Sinatra::Base
+    class << self
+      attr_accessor :modbus_slave, :monitor, :units, :mutex
+    end
+
+    extend Forwardable
+    delegate %i[modbus_slave monitor units units= mutex] => "self.class"
+
+    self.mutex = Mutex.new
+    self.units = 0
+
+    set :public_folder, "html"
+    set :logging, false
+
+    get "/" do
+      send_file "html/index.htm"
+    end
+
+    get "/getunits.cgi" do
+      encode_result(units: units)
+    end
+
+    get "/setunits.cgi" do
+      self.units = params["units"].to_i
+      encode_result(error: 0)
+    end
+
+    get "/config.cgi" do
+      encode_result(
+        "AWL Version" => Aurora::VERSION,
+        "Local Web Version" => 1.08,
+        "SSID" => nil,
+        "Units" => units,
+        "AWL ID" => ARGV[0],
+        "AWL ID CRC" => nil
+      )
+    end
+
+    get "/request.cgi" do
+      params = parse_query_string(request.query_string)
+      result = params.slice("cmd", "id", "set", "addr")
+      result["err"] = nil
+
+      # these are just aliases to get a certain set of registers
+      case params["cmd"]
+      when "abcinfo"
+        params["regs"] = "2;8;88,4"
+      when "devices"
+        params["regs"] = "800;803;806,3;812;815;818;824"
+      end
+
+      case params["cmd"]
+      when "getregs", "abcinfo", "devices"
+        queries = params["regs"].split(";").map do |range|
+          start, length = range.split(",").map(&:to_i)
+          next start if length.nil?
+
+          start...(start + length)
+        end
+        registers = mutex.synchronize { modbus_slave.read_multiple_holding_registers(*queries) }
+        if monitor
+          puts "READING"
+          puts Aurora.print_registers(registers)
+        end
+        result["values"] = registers.values.join(",")
+      when "putregs"
+        writes = params["regs"].split(";").map do |write|
+          write.split(",").map(&:to_i)
+        end.compact.to_h
+        if monitor
+          puts "WRITING"
+          puts Aurora.print_registers(writes)
+        end
+
+        mutex.synchronize do
+          writes.each do |(addr, value)|
+            modbus_slave.write_holding_register(addr, value)
+          end
+        end
+      else
+        return ""
+      end
+
+      encode_result(result)
+    end
+
+    private
+
+    def parse_query_string(query_string)
+      query_string.split("&").map { |p| p.split("=") }.to_h
+    end
+
+    # _don't_ do URI escaping
+    def encode_result(params)
+      params.map { |p| p.join("=") }.join("&")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +196,7 @@ files:
 - lib/aurora/registers.rb
 - lib/aurora/thermostat.rb
 - lib/aurora/version.rb
+- lib/aurora/web_aid_tool.rb
 - lib/waterfurnace_aurora.rb
 homepage: https://github.com/ccutrer/waterfurnace_aurora
 licenses: