waterfurnace_aurora 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc29704fadc06f5e325457150e088018586a4f824fc776f0c8736d45f012e30d
-  data.tar.gz: 38820a0d7713c7957d186bdbc6d3ab52cf3064fa94e15370a118058fe777d636
+  metadata.gz: fdebb583f3d84e8f1c050e21ac205d29bba5d29d91cb14de2c106a5de26917cd
+  data.tar.gz: 64f7a0b749c050e0041e34d6682f1428320b8bc3762532c62b825f43ff4c40b7
 SHA512:
-  metadata.gz: f53b075711ce3df9fdd69b6daa8a1520d6830ae9c8717ede4a8de7c0379420a64e835abefeb56ec481a586f5d328c6f967ad1fca48b08933f6145d927877c8b4
-  data.tar.gz: 5b858edd848f538c59f89a83d8372f6e3682066fac5586d7f3c350dc53a79e0bc23741fd472f3c43456467b8c51fcc6066ba092f1ba3c4a157c453f6937a1c41
+  metadata.gz: 8ec3c74f737e3d38fd593831246e1153ab2ec5eef39a488aaac43c2c22bf5df92e9e613157e1b101c6af2008d451f3513b3e47a6badae0a01b966d4ed87bc3ee
+  data.tar.gz: 3973f340af41d8645de59291245d599a9d7993691249ad9d0b4b7b7582a11ee5d5f95d8c11493ba1be8d9f7611e755e33e6778114bb14a5197eacb9bac16f119

data/exe/aurora_monitor

@@ -77,7 +77,10 @@ server.request_callback = lambda { |uid, func, req|
     puts Aurora.print_registers(registers)
   elsif func == 16
     registers = Range.new(req[:addr], req[:addr] + req[:quant] - 1).zip(req[:val]).to_h
-    next if ignore_awl_heartbeat && registers == { 460 => 102, 461 => 0, 462 => 5 }
+    if ignore_awl_heartbeat && [{ 460 => 102, 461 => 0, 462 => 5 },
+                                { 460 => 102, 461 => 0, 462 => 1 }].include?(registers)
+      next
+    end
 
     puts "#{Time.now} ===== write multiple registers to #{uid}:"
     puts Aurora.print_registers(registers)

data/lib/aurora/abc_client.rb

@@ -35,11 +35,11 @@ module Aurora
       registers = registers_array.each_with_index.map { |r, i| [i + 105, r] }.to_h
       @serial_number = Aurora.transform_registers(registers)[105]
 
-      @zones = if @modbus_slave.holding_registers[813].zero?
-                 [Thermostat.new(self)]
-               else
+      @zones = if iz2?
                  iz2_zone_count = @modbus_slave.holding_registers[483]
                  (0...iz2_zone_count).map { |i| IZ2Zone.new(self, i + 1) }
+               else
+                 [Thermostat.new(self)]
                end
       @faults = []
     end
@@ -78,7 +78,8 @@ module Aurora
           registers_to_read << base3
         end
       else
-        registers_to_read << (745..747)
+        registers_to_read << 502
+        registers_to_read << (745..746)
       end
 
       @faults = @modbus_slave.holding_registers[601..699]
@@ -141,6 +142,54 @@ module Aurora
       @modbus_slave.holding_registers[347] = value
     end
 
+    def cooling_airflow_adjustment=(value)
+      value = 0x10000 + value if value.negative?
+      @modbus_slave.holding_registers[346] = value
+    end
+
+    def dhw_enabled=(value)
+      @modbus_slave.holding_registers[400] = value ? 1 : 0
+    end
+
+    def dhw_setpoint=(value)
+      @modbus_slave.holding_registers[401] = value
+    end
+
+    def loop_pressure_trip=(value)
+      @modbus_slave.holding_registers[419] = (value * 10).to_i
+    end
+
+    def vs_pump_control=(value)
+      raise ArgumentError unless (value = VS_PUMP_CONTROL.invert[value])
+
+      @modbus_slave.holding_registers[323] = value
+    end
+
+    def vs_pump_min=(value)
+      @modbus_slave.holding_registers[321] = value
+    end
+
+    def vs_pump_max=(value)
+      @modbus_slave.holding_registers[322] = value
+    end
+
+    # config aurora system
+    { thermostat: 800, axb: 806, iz2: 812, aoc: 815, moc: 818, eev2: 824 }.each do |(component, register)|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{component}?
+          @modbus_slave.holding_registers[#{register}] != 3
+        end
+
+        def add_#{component}
+          @modbus_slave.holding_registers[#{register}] = 2
+        end
+
+        def remove_#{component}
+          @modbus_slave.holding_registers[#{register}] = 3
+        end
+      RUBY
+    end
+
     def inspect
       "#<Aurora::ABCClient #{(instance_variables - [:@modbus_slave]).map do |iv|
                                "#{iv}=#{instance_variable_get(iv).inspect}"

data/lib/aurora/registers.rb

@@ -139,6 +139,18 @@ module Aurora
     }
   end
 
+  COMPONENT_STATUS = {
+    1 => :active,
+    2 => :added,
+    3 => :removed
+  }.freeze
+
+  VS_PUMP_CONTROL = {
+    0x7fff => :off,
+    40 => :min,
+    100 => :max
+  }.freeze
+
   SYSTEM_OUTPUTS = {
     0x01 => :cc, # compressor stage 1
     0x02 => :cc2, # compressor stage 2
@@ -328,9 +340,10 @@ module Aurora
   # intermittent off time allowed: 5, 10, 15, 20, 25, 30, 35, 40
 
   REGISTER_CONVERTERS = {
-    TO_HUNDREDTHS => [2, 3, 807, 813, 816, 817, 819, 820, 825, 828],
+    TO_HUNDREDTHS => [2, 3, 801, 807, 813, 816, 817, 819, 820, 825, 828],
     method(:dipswitch_settings) => [4, 33],
-    TO_TENTHS => [19, 20, 401, 567, 740, 745, 746, 747, 900, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1136,
+    TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900,
+                  1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1136,
                   12_619, 12_620,
                   21_203, 21_204,
                   21_212, 21_213,
@@ -352,7 +365,10 @@ module Aurora
     ->(v) { from_bitmask(v, VS_ALARM1) } => [217],
     ->(v) { from_bitmask(v, VS_ALARM2) } => [218],
     ->(v) { from_bitmask(v, VS_EEV2) } => [280],
+    ->(v) { VS_PUMP_CONTROL[v] } => [323],
     NEGATABLE => [346, 1146],
+    ->(v) { !v.zero? } => [400],
+    ->(v) { COMPONENT_STATUS[v] } => [800, 806, 812, 815, 818, 824, 827],
     ->(v) { from_bitmask(v, AXB_INPUTS) } => [1103],
     ->(v) { from_bitmask(v, AXB_OUTPUTS) } => [1104],
     ->(v) { TO_TENTHS.call(NEGATABLE.call(v)) } => [1136],
@@ -375,7 +391,7 @@ module Aurora
   REGISTER_FORMATS = {
     "%ds" => [1, 6, 9, 15, 84, 85],
     "%dV" => [16, 112],
-    "%0.1fºF" => [19, 20, 401, 567, 740, 745, 746, 747, 900, 1110, 1111, 1114, 1134, 1136,
+    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900, 1110, 1111, 1114, 1134, 1136,
                   12_619, 12_620,
                   21_203, 21_204,
                   21_212, 21_213,
@@ -387,6 +403,7 @@ module Aurora
                   31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
     "E%d" => [25, 26],
     "%d%%" => [282, 321, 322, 346, 565, 741],
+    "%0.1f psi" => [419],
     "%0.1fA" => [1105, 1106, 1107, 1108],
     "%0.1fgpm" => [1117],
     "%dW" => [1147, 1149, 1151, 1153, 1165],
@@ -532,6 +549,7 @@ module Aurora
     30 => "System Outputs",
     31 => "Status",
     33 => "DIP Switch Status",
+    36 => "ABC Board Rev",
     50 => "ECM Speed Low (== 5)",
     51 => "ECM Speed Med (== 5)",
     52 => "ECM Speed High (== 5)",
@@ -562,6 +580,7 @@ module Aurora
     284 => "Saturated Suction Temperature", ## ?? data format
     321 => "VS Pump Min",
     322 => "VS Pump Max",
+    323 => "VS Pump Control",
     340 => "Blower Only Speed",
     341 => "Lo Compressor ECM Speed",
     342 => "Hi Compressor ECM Speed",
@@ -569,9 +588,17 @@ module Aurora
     346 => "Cooling Airflow Adjustment",
     347 => "Aux Heat ECM Speed",
     362 => "Active Dehumidify", # any value is true
+    460 => "IZ2??",
+    461 => "IZ2??",
+    462 => "IZ2 Status", # 5 when online; 1 when in setup mode
+    400 => "DHW Enabled",
     401 => "DHW Setpoint",
+    # 403 => "DHW Status", just a guess, based on AID Tool querying this register while showing DHW settings
     414 => "On Peak/SmartGrid 2", # 0x0001 only
+    419 => "Loop Pressure Trip",
     483 => "Number of IZ2 Zones",
+    501 => "Set Point", # only read by AID tool? this is _not_ heating/cooling set point
+    502 => "Ambient Temperature",
     564 => "IZ2 Compressor Speed Desired",
     565 => "IZ2 Blower % Desired",
     567 => "Entering Air",
@@ -579,15 +606,28 @@ module Aurora
     741 => "Relative Humidity",
     745 => "Heating Set Point",
     746 => "Cooling Set Point",
-    747 => "Ambient Temperature",
+    747 => "Ambient Temperature", # from communicating thermostat? but set to 0 when mode is off?
+    800 => "Thermostat Installed",
+    801 => "Thermostat Version",
+    802 => "Thermostat Revision",
+    806 => "AXB Installed",
     807 => "AXB Version",
+    808 => "AXB Revision",
+    812 => "IZ2 Installed",
     813 => "IZ2 Version",
-    816 => "AOC Version 1?",
-    817 => "AOC Version 2?",
-    819 => "MOC Version 1?",
-    820 => "MOC Version 2?",
+    814 => "IZ2 Revision",
+    815 => "AOC Installed",
+    816 => "AOC Version",
+    817 => "AOC Revision",
+    818 => "MOC Installed",
+    819 => "MOC Version",
+    820 => "MOC Revision",
+    824 => "EEV2 Installed",
     825 => "EEV2 Version",
+    826 => "EEV2 Revision",
+    827 => "AWL Installed",
     828 => "AWL Version",
+    829 => "AWL Revision",
     900 => "Leaving Air",
     1103 => "AXB Inputs",
     1104 => "AXB Outputs",

data/lib/aurora/thermostat.rb

@@ -13,7 +13,7 @@ module Aurora
     end
 
     def refresh(registers)
-      @ambient_temperature = registers[747]
+      @ambient_temperature = registers[502]
       @heating_target_temperature = registers[746]
       @cooling_target_temperature = registers[745]
     end

data/lib/aurora/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Cody Cutrer