waterfurnace_aurora 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde3dc688654c589d5638b794484035f3ab7ca8c102fe1ef27bb6365ddd51d22
-  data.tar.gz: 6d679712a9375c94f8a1f7b2fe3fa6102c606a433c0449049ae289773cdaf735
+  metadata.gz: 47ba3e76677f00093692ed3f75daac6629fc77c71102a200efe88a846d271045
+  data.tar.gz: 6183cec3c273fafa6eb529e3e9fb0c6769941a51bd22d808528ffbd0f75b3fad
 SHA512:
-  metadata.gz: dd90afd3a8f15ddec22ec29f23679d4def25b768b47eaf7adc37c37ab0a5b98bfb98a11811133d67dbbb1afd23b03ea5689fe4be55c2966eb19b68b9b8827667
-  data.tar.gz: 9c855a9730f2a86678876f3866ea7a6583925781e2397e13738b9f413e4b318a89c7860706e22e88c94d090f37afccd775b2b54242b9555530993e7021b995c6
+  metadata.gz: 6a961b2e49137c51cb888f0bf3a551c530be8eed02cc9fc978c38ab0ef3b00c582b90c1d44466f126f90bed0934632b22fe976166b3c59ded871b61b2ee6202c
+  data.tar.gz: f275fe6dce4542e0212abd90b7346c7e6970e23af7b657bc4c05ed3dd9682b36ad87e68abcbf03644e5fff62af89d2149edc0aa16605f33021734a52c81ca263

data/exe/aurora_mqtt_bridge

@@ -29,7 +29,7 @@ class MQTTBridge
     @homie = homie
     @mutex = Mutex.new
 
-    @homie.instance_variable_set(:@block, lambda do |topic, value|
+    @homie.out_of_band_topic_proc = lambda do |topic, value|
       @mutex.synchronize do
         case topic
         when /\$modbus$/
@@ -62,9 +62,10 @@ class MQTTBridge
         end
       end
     rescue StandardError => e
-      puts "failed processing message: #{e}\n#{e.backtrace}"
-    end)
+      logger.error("failed processing message: #{e}\n#{e.backtrace}")
+    end
 
+    @abc.refresh
     publish_basic_attributes
 
     loop do
@@ -75,6 +76,7 @@ class MQTTBridge
              current_mode
              dhw_water_temperature
              entering_air_temperature
+             entering_water_temperature
              fan_speed
              leaving_air_temperature
              leaving_water_temperature
@@ -99,7 +101,7 @@ class MQTTBridge
           end
         end
       rescue => e
-        puts "got garbage: #{e}; #{e.backtrace}"
+        logger.error("got garbage: #{e}; #{e.backtrace}")
         exit 1
       end
       sleep(5)
@@ -186,4 +188,13 @@ class MQTTBridge
   end
 end
 
-MQTTBridge.new(abc, MQTT::Homie::Device.new("aurora", "Aurora MQTT Bridge", mqtt: mqtt_uri))
+log_level = ARGV.include?("--debug") ? :debug : :warn
+logger = Logger.new($stdout)
+logger.level = log_level
+slave.logger = logger
+
+device = "aurora-#{abc.serial_number}"
+homie = MQTT::Homie::Device.new(device, "Aurora MQTT Bridge", mqtt: mqtt_uri)
+homie.logger = logger
+
+MQTTBridge.new(abc, homie)

data/lib/aurora/abc_client.rb

@@ -3,6 +3,7 @@
 module Aurora
   class ABCClient
     attr_reader :modbus_slave,
+                :serial_number,
                 :zones,
                 :current_mode,
                 :fan_speed,
@@ -27,6 +28,9 @@ module Aurora
       @modbus_slave = modbus_slave
       @modbus_slave.read_retry_timeout = 15
       @modbus_slave.read_retries = 2
+      registers_array = @modbus_slave.holding_registers[105...110]
+      registers = registers_array.each_with_index.map { |r, i| [i + 105, r] }.to_h
+      @serial_number = Aurora.transform_registers(registers)[105]
       iz2_zone_count = @modbus_slave.holding_registers[483]
       # TODO: better detect IZ2/Non-IZ2
       @zones = if iz2_zone_count > 1

data/lib/aurora/modbus/slave.rb

@@ -17,7 +17,7 @@ module Aurora
       end
 
       def holding_registers
-        WFProxy.new(self, :holding_register)
+        @holding_registers ||= WFProxy.new(self, :holding_register)
       end
     end
 
@@ -33,7 +33,6 @@ module Aurora
       def read_rtu_response(io)
         # Read the slave_id and function code
         msg = read(io, 2)
-        log logging_bytes(msg)
 
         function_code = msg.getbyte(1)
         case function_code

data/lib/aurora/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement