waterfurnace_aurora 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edeaa2444792af1f963829496d445f87a29b5a67efad7e741937ab0f7278b222
-  data.tar.gz: 37db08186651a5ee4486a9ee6dceb30f39ae4ca93122ae1c8e357b9b551c2929
+  metadata.gz: 5c89c3d73941d7574fbe1088bf792676f772abfb98dab07be0de27a61323ec96
+  data.tar.gz: 13a5a82be919ee67bbbc87357eac1cf6aaba1b34514fbd808b9411dfc37bcb45
 SHA512:
-  metadata.gz: eed8903a3416f39f393ee1ec77d81a6c3c8c3db14ae3253e22ebf884e1eed624a7869dea9c76ef086a359c657c4f63d20fa94a801622846e6914943e38e0f827
-  data.tar.gz: 5e326094aa14976dc8ba432944160c3073d47642bbdba272eca063ea00f6fdf0908f29a563b44f306b5af05754c6c77ae251c4cd225daaea9be8edc2c1101820
+  metadata.gz: ce768bdc79fc4cd2a406ebf15757f587d373030cec21efc64076b3951a7c97f631f1e47a0e810005b24553fdd78eb4aec869022c8e0f6f33e409522f473e942b
+  data.tar.gz: ab5cba75479435f32a42bca6fd8155a5954674996b75a4a2afe397241bce519720a083aaaf0ccf3976a8c289170ec39553f63e9ba036248bdadcf408022e7ffb

data/exe/aurora_mqtt_bridge

@@ -46,8 +46,20 @@ class MQTTBridge
         when /\$modbus$/
           registers = @abc.query_registers(value)
           Aurora.print_registers(registers) do |register, v|
-            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, qos: 1)
           end
+        when %r{\$modbus/getregs}
+          query_id, query = value.split(":")
+          queries = query.split(";").map do |range|
+            start, length = range.split(",").map(&:to_i)
+            next start if length.nil?
+
+            start...(start + length)
+          end
+          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)
         when %r{\$modbus/(\d+)/set$}
           register = $1.to_i
           value = case value
@@ -59,7 +71,7 @@ class MQTTBridge
           @abc.modbus_slave.holding_registers[register] = value if value
           registers = { register => @abc.modbus_slave.holding_registers[register] }
           Aurora.print_registers(registers) do |r, v|
-            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{r}", v, retain: false, qos: 1)
+            @homie.mqtt.publish("#{@homie.topic}/$modbus/#{r}", v, qos: 1)
           end
         end
       end
@@ -261,6 +273,7 @@ class MQTTBridge
 
     # direct access to modbus registers for debugging purposes
     @homie.mqtt.subscribe("#{@homie.topic}/$modbus")
+    @homie.mqtt.subscribe("#{@homie.topic}/$modbus/getregs")
     @homie.mqtt.subscribe("#{@homie.topic}/$modbus/+/set")
     @homie.publish
   end

data/lib/aurora/abc_client.rb

@@ -26,7 +26,9 @@ module Aurora
                                         port: uri.port || 23,
                                         baud: 19_200,
                                         parity: :even)
-
+             when "mqtt", "mqtts"
+               require "aurora/mqtt_modbus"
+               return Aurora::MQTTModBus.new(uri)
              else
                return Aurora::MockABC.new(YAML.load_file(uri.path)) if File.file?(uri.path)
 

data/lib/aurora/mqtt_modbus.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "mqtt"
+require "securerandom"
+
+module Aurora
+  class MQTTModBus
+    attr_accessor :logger
+
+    def initialize(uri)
+      @mqtt = MQTT::Client.new(uri)
+      @mqtt.connect
+
+      @base_topic = uri.path[1..]
+      @mqtt.subscribe("#{@base_topic}/getregs/response")
+    end
+
+    def read_multiple_holding_registers(*queries)
+      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
+        result = {}
+        loop do
+          packet = @mqtt.get
+          response_id, registers_flat = packet.payload.split(":")
+          next unless response_id == query_id
+
+          values = registers_flat.split(",").map(&:to_i)
+          result_index = 0
+          queries.each do |query|
+            Array(query).each do |i|
+              result[i] = values[result_index]
+              result_index += 1
+            end
+          end
+          break
+        end
+        result
+      end
+    end
+
+    def write_holding_register(addr, value)
+      @mqtt.publish("#{@base_topic}/#{addr}/set", value, qos: 1)
+    end
+  end
+end

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -143,6 +143,7 @@ files:
 - lib/aurora/mock_abc.rb
 - lib/aurora/modbus/server.rb
 - lib/aurora/modbus/slave.rb
+- lib/aurora/mqtt_modbus.rb
 - lib/aurora/pump.rb
 - lib/aurora/registers.rb
 - lib/aurora/thermostat.rb