waterfurnace_aurora 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e288948a5037bccfc008daaac58c7c604f2531fab6c6554c5a93c47ab8846f2
-  data.tar.gz: 7dde859984d21e24f3915307de12a940e17159715ae2e1047fa80c9955ed5cbf
+  metadata.gz: beb1fa2f6415ac6723e0725460e8fbc6f5c8f04c76848034821176ce834f2cf3
+  data.tar.gz: 7a697e8d8bcf8b2abf83bf13c7294498947653f4b4237ede075d1bf01b338bc1
 SHA512:
-  metadata.gz: ac5d6fb9dd6812cd71903eab37f7a32c89ad5f8790956e7adb4782216d59247873be7c603e362caab4679ca489f496579564bcc683d739caeb69ef86cab103b6
-  data.tar.gz: 826ff34760c126c99e19c8be8a5a929938def25d5078ff7c2141c70136a1120fcc99bf997160b2002187f17bb5009a4ac2b67c433855f90c0f7a84c248ba95f1
+  metadata.gz: 4a15073444778a08e9e46c8bedfaf957c7e055d11202e767d592439dfc8ae71f436d89550649a1e6040264e4a81c7189464fa6f9b3e2dc50fe4581a6368d950d
+  data.tar.gz: 722b3a899a1626458dc31c9b0345e85ea64d9e80cd8b40fd5cb6f64241f74752938123eee8b841259496803e6b12643eb014e25b737798aa2e198867e0b37d88

data/exe/aurora_fetch

@@ -22,9 +22,8 @@ args = case uri.scheme
        end
 
 client = ModBus::RTUClient.new(*args)
-client.logger = Logger.new($stdout, :debug)
 slave = client.with_slave(1)
+abc = Aurora::ABCClient.new(slave)
+registers = abc.query_registers(ARGV[1])
 
-registers = slave.holding_registers[ARGV[1].to_i]
-
-puts registers.inspect
+puts Aurora.print_registers(registers)

data/exe/aurora_mqtt_bridge

@@ -37,21 +37,7 @@ class MQTTBridge
       @mutex.synchronize do
         case topic
         when /\$modbus$/
-          query = value.split(",").map do |addr|
-            case addr
-            when "known"
-              Aurora::REGISTER_NAMES.keys
-            when /^(\d+)(?:\.\.|-)(\d+)$/
-              $1.to_i..$2.to_i
-            else
-              addr.to_i
-            end
-          end
-          queries = Aurora.normalize_ranges(query)
-          registers = {}
-          queries.each do |subquery|
-            registers.merge!(@abc.modbus_slave.read_multiple_holding_registers(*subquery))
-          end
+          registers = @abc.query_registers(value)
           Aurora.print_registers(registers) do |register, v|
             @homie.mqtt.publish("#{@homie.topic}/$modbus/#{register}", v, retain: false, qos: 1)
           end

data/lib/aurora/abc_client.rb

@@ -42,6 +42,25 @@ module Aurora
                end
     end
 
+    def query_registers(query)
+      ranges = query.split(",").map do |addr|
+        case addr
+        when "known"
+          Aurora::REGISTER_NAMES.keys
+        when /^(\d+)(?:\.\.|-)(\d+)$/
+          $1.to_i..$2.to_i
+        else
+          addr.to_i
+        end
+      end
+      queries = Aurora.normalize_ranges(ranges)
+      registers = {}
+      queries.each do |subquery|
+        registers.merge!(@modbus_slave.read_multiple_holding_registers(*subquery))
+      end
+      registers
+    end
+
     def refresh
       registers_to_read = [19..20, 30, 340, 344, 347, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165, 3027,
                            31_003]

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport