waterfurnace_aurora 0.7.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af20433d8163a332a3d09c36b23af07b95d9beb088d4a0ce69436a54e46e434
-  data.tar.gz: 29a7c84feb1f58ecb6b0a44538f1a530add179ea95b0285f1739f172730b2d24
+  metadata.gz: b8a3d1e80a8e07d73e5efe83005545f360db3475614333fc434885b3e9143092
+  data.tar.gz: 97ea735ee8991898734b87f810d273bb8fc2000b011f569e9908f4ebcad4d1fc
 SHA512:
-  metadata.gz: 81c6604273350396388be239846997ee151f1b92ac47c270977e63347a5eeea81025eefece7d60cb3f2e374bca65816548bf3b8cc36bf249a1dbec57fbc0cb3a
-  data.tar.gz: 75ac82e3784f556b13274d5de4e64889023963286a3787e2521fef74ca5fb19ff0c49ea40a35fef7ea95bcae80b463ff84d15e67e4ddce098ffd69a3ead95843
+  metadata.gz: 3aea05123fca4194e108b32adde87724547f63e1ef1b9f0a91d4f22856d59b5021f08a998fe3d9956e20f3e745d662001d0beb43d86de69cdd36decb6f5c1af4
+  data.tar.gz: 762f87c0790263751934b592b17252b822276bef351141b49da72d42b953eb6eb3fe553037c71117f8d39e0318bf83b70af4b838905d1e80195860439f117bb9

data/exe/aurora_fetch

@@ -8,20 +8,31 @@ require "optparse"
 require "uri"
 require "yaml"
 
-debug_modbus = yaml = false
+debug_modbus = yaml = ignore_missing_registers = false
 try_individual = nil
 
 options = OptionParser.new do |opts|
   opts.banner = "Usage: aurora_fetch /path/to/serial/port REGISTERS [options]"
 
   opts.separator("")
-  opts.separator("Use `known` to fetch all identified registers. Use `valid` to fetch all registers that will respond.")
+  opts.separator(<<~TEXT)
+    Use `known` to fetch all identified registers. Use `valid` to fetch all registers
+    that should respond. Use `all` to search the entire ModBus address space. Note that
+    logging of current progress is only periodic, and does not log every register it's
+    trying to fetch.
+  TEXT
   opts.separator("")
 
-  opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
+  opts.on("--debug-modbus", "Print actual protocol bytes") do
+    debug_modbus = true
+  end
   opts.on("--[no-]try-individual",
           "Query registers one-by-one if a range has an illegal address. " \
           "Defaults to true for `valid` and `known` special registers, false otherwise.") { |v| try_individual = v }
+  opts.on("--ignore-missing-registers",
+          "For YAML input only, just log a warning when a register doesn't exist, instead of failing") do
+            ignore_missing_registers = true
+          end
   opts.on("-y", "--yaml", "Output raw values as YAML") { yaml = true }
   opts.on("-v", "--version", "Print version") do
     puts Aurora::VERSION
@@ -40,11 +51,11 @@ unless ARGV.length == 2
   exit 1
 end
 
-modbus_slave = Aurora::ABCClient.open_modbus_slave(ARGV[0])
+modbus_slave = Aurora::ABCClient.open_modbus_slave(ARGV[0], ignore_missing_registers: ignore_missing_registers)
 modbus_slave.read_retry_timeout = 15
 modbus_slave.read_retries = 2
-modbus_slave.logger = Logger.new($stdout)
-modbus_slave.logger.level = debug_modbus ? :debug : :warn
+Aurora.logger = modbus_slave.logger = Logger.new($stderr)
+modbus_slave.logger.level = debug_modbus ? :debug : :info
 
 registers = Aurora::ABCClient.query_registers(modbus_slave, ARGV[1], try_individual: try_individual)