waterfurnace_aurora 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a429ac21f24ff82252a574e3e9bcd5c1c02c5d819f236f1b2fe05d1517a9039a
-  data.tar.gz: ce6bd7dae57e4d2862191ce2c65e9483655aa489ee4b03824457709fea73a6ec
+  metadata.gz: 792824de511d596a9c0cacc0ef0eae5385e0ec72e4c9da1765292d4825256769
+  data.tar.gz: 9cbd94692b1074e7430e6089348d07d5a31506f6e679d82aaa8762316efbf634
 SHA512:
-  metadata.gz: 5cef31050d0c211a6fce8f22a47f0a09e5bc17c09f685b45a52faccd39b4bbc40413822abcdc78e0b272b35648672457f3e2880c44d7664c2f6d88ec75fc9437
-  data.tar.gz: 45861b6d6a49dc88f68a9f7ca4b3d5ac15517cbe413b6f5dfd8578963df65b9fc14f6fbd44101b773137269f25a6f06acb6901f1b409067d9f99e81c8bf38af7
+  metadata.gz: cec2a4f8ef4353a3c824af4d701dc6fe8ccc904d2ead6176b3507828023430ff335a6d2f2a5132e764d21adf8242973677d0b857079c74f16e8b49ae14a45977
+  data.tar.gz: c52dfdbc4e6e18c636c3e61226b11f7b4cc056fd76413794a41235936783f07ea09f46db77a901c02957a50ba82555cf35e84794c8903d73b00cf2fd830b480b

data/exe/aurora_monitor

@@ -30,7 +30,7 @@ end
 
 options.parse!
 
-unless ARGV.length == 2
+unless ARGV.length == 1
   puts options
   exit 1
 end
@@ -39,8 +39,8 @@ uri = URI.parse(ARGV[0])
 
 last_registers = {}
 
-SENSOR_REGISTERS = [16, 19, 20, 740, 900, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117, 1134, 1147, 1149, 1151,
-                    1153, 1165].freeze
+SENSOR_REGISTERS = [16, 19, 20, 740, 900, 901, 903, 908, 909, 1109, 1105, 1106, 1107, 1108, 1110, 1111, 1114, 1117,
+                    1134, 1148, 1149, 1150, 1151, 1152, 1153, 1164, 1165, 3326, 3330].freeze
 
 io = case uri.scheme
      when "tcp"
@@ -76,7 +76,11 @@ diff_and_print = lambda do |registers|
 end
 
 server.request_callback = lambda { |uid, func, req|
-  if func == 68
+  if func == 6
+    puts "#{Time.now} ===== write register to #{uid}:"
+    registers = { req[:addr] => req[:val] }
+    puts Aurora.print_registers(registers)
+  elsif func == 68
     puts "#{Time.now} ===== no idea to #{uid}: #{req.inspect}" unless diff_only
   elsif func == 67
     puts "#{Time.now} ===== write discontiguous registers to #{uid}:"
@@ -125,7 +129,7 @@ server.response_callback = lambda { |uid, func, res, req|
     puts "#{Time.now} ===== read discontiguous registers from #{uid}" unless diff_only
     registers = req.zip(res).to_h
     diff_and_print.call(registers)
-  elsif [16, 67, 68].include?(func)
+  elsif [6, 16, 67, 68].include?(func)
     # no output
   else
     puts "#{Time.now} **** new func #{func}"

data/exe/aurora_mqtt_bridge

@@ -74,8 +74,19 @@ class MQTTBridge
       begin
         @mutex.synchronize do
           @abc.refresh
-          @homie_abc.each do |property|
-            property.value = @abc.public_send(property.id.tr("-", "_"))
+
+          components = { @homie_abc => @abc,
+                         @blower => @abc.blower,
+                         @pump => @abc.pump }
+          @abc.zones.each_with_index do |z, idx|
+            homie_zone = @homie["zone#{idx + 1}"]
+            components[homie_zone] = z
+          end
+
+          components.each do |(node, object)|
+            node.each do |property|
+              property.value = object.public_send(property.id.tr("-", "_"))
+            end
           end
 
           if @abc.dhw?
@@ -87,13 +98,6 @@ class MQTTBridge
           @abc.faults.each_with_index do |fault_count, i|
             @faults["e#{i + 1}"].value = fault_count
           end
-
-          @abc.zones.each_with_index do |z, idx|
-            homie_zone = @homie["zone#{idx + 1}"]
-            homie_zone.each do |property|
-              property.value = z.public_send(property.id.tr("-", "_"))
-            end
-          end
         end
       rescue => e
         warn "got garbage: #{e}; #{e.backtrace}"
@@ -113,7 +117,6 @@ class MQTTBridge
                     unit: "ºF")
       node.property("entering-water-temperature", "Entering Water Temperature", :float,
                     @abc.entering_water_temperature, unit: "ºF")
-      node.property("fan-speed", "Fan Speed", :integer, @abc.fan_speed, format: 0..11)
       node.property("leaving-air-temperature", "Leaving Air Temperature", :float, @abc.leaving_air_temperature,
                     unit: "ºF")
       node.property("leaving-water-temperature", "Leaving Water Temperature", :float, @abc.leaving_water_temperature,
@@ -123,22 +126,60 @@ class MQTTBridge
       end
       node.property("relative-humidity", "Relative Humidity", :integer, @abc.relative_humidity, unit: "%",
                                                                                                 format: 0..100)
-      node.property("waterflow", "Waterflow", :float, @abc.waterflow, unit: "gpm")
       node.property("fp1", "FP1 Sensor", :float, @abc.fp1, unit: "ºF")
       node.property("fp2", "FP2 Sensor", :float, @abc.fp2, unit: "ºF")
-      %i[compressor blower aux_heat loop_pump total].each do |component|
+      %i[compressor aux_heat total].each do |component|
         component = "#{component}_watts"
         node.property(component.tr("_", "-"), component.tr("_", " ").titleize, :integer,
                       @abc.public_send(component), unit: "W")
       end
+    end
+
+    @blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
+      if @abc.blower.respond_to?(:running)
+        node.property("running", "Blower is running", :boolean, @abc.blower.running?)
+      else
+        node.property("speed", "Current blower speed", :integer, @abc.blower.speed, format: @abc.blower.speed_range)
+      end
+      node.property("watts", "Energy Usage", :integer, @abc.blower.watts, unit: "W") if @abc.energy_monitoring?
+
+      next unless @abc.blower.is_a?(Aurora::Blower::ECM)
+
+      presets = %w[blower-only aux-heat]
+      presets.concat %w[low-compressor high-compressor] unless @abc.iz2?
+      presets.each do |setting|
+        field = "#{setting.tr('-', '_')}_speed"
+        node.property("#{setting}-speed", "#{setting.tr('-', ' ').titleize} Preset Speed", :integer,
+                      @abc.blower.public_send(field), format: 1..12) do |value, property|
+          @mutex.synchronize { property.value = @abc.blower.public_send("#{field}=", value) }
+        end
+      end
+      if @abc.iz2?
+        node.property("iz2-desired-speed", "IZ2 Desired Speed", :integer, @abc.blower.iz2_desired_speed,
+                      format: 0..100, unit: "%")
+      end
+    end
+
+    @pump = @homie.node("pump", "Loop Pump", @abc.pump.type) do |node|
+      node.property("waterflow", "Waterflow", :float, @abc.pump.waterflow, unit: "gpm")
+      node.property("watts", "Energy Usage", :integer, @abc.pump.watts, unit: "W") if @abc.energy_monitoring?
 
-      node.property("blower-only-ecm-speed", "Blower Only ECM Speed", :integer, @abc.blower_only_ecm_speed,
-                    format: 1..12) do |value, property|
-        @mutex.synchronize { property.value = @abc.blower_only_ecm_speed = value }
+      next unless @abc.pump.is_a?(Aurora::Pump::VSPump)
+
+      node.property("speed", "Speed", :integer, @abc.pump.speed, format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.speed = value }
+      end
+      node.property("manual-control", "If manual control is enabled", :boolean,
+                    @abc.pump.manual_control?) do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.manual_control = value }
+      end
+      node.property("minimum-speed", "Speed pump runs at compressor speed 0", :integer, @abc.pump.minimum_speed,
+                    format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.minimum_speed = value }
       end
-      node.property("aux-heat-ecm-speed", "Aux Heat ECM Speed", :integer, @abc.aux_heat_ecm_speed,
-                    format: 1..12) do |value, property|
-        @mutex.synchronize { property.value = @abc.aux_heat_ecm_speed = value }
+      node.property("maximum-speed", "Speed pump runs at compressor speed 12", :integer, @abc.pump.minimum_speed,
+                    format: 0..100, unit: "%") do |value, property|
+        @mutex.synchronize { property.value = @abc.pump.maximum_speed = value }
       end
     end
 

data/lib/aurora/abc_client.rb

@@ -3,6 +3,11 @@
 require "yaml"
 require "uri"
 
+require "aurora/blower"
+require "aurora/iz2_zone"
+require "aurora/pump"
+require "aurora/thermostat"
+
 module Aurora
   class ABCClient
     class << self
@@ -35,9 +40,10 @@ module Aurora
     attr_reader :modbus_slave,
                 :serial_number,
                 :zones,
+                :blower,
+                :pump,
                 :faults,
                 :current_mode,
-                :fan_speed,
                 :dhw_enabled,
                 :dhw_setpoint,
                 :entering_air_temperature,
@@ -46,27 +52,37 @@ module Aurora
                 :leaving_water_temperature,
                 :entering_water_temperature,
                 :dhw_water_temperature,
-                :waterflow,
                 :compressor_speed,
                 :outdoor_temperature,
                 :fp1,
                 :fp2,
-                :blower_only_ecm_speed,
-                :aux_heat_ecm_speed,
                 :compressor_watts,
-                :blower_watts,
                 :aux_heat_watts,
-                :loop_pump_watts,
                 :total_watts
 
     def initialize(uri)
       @modbus_slave = self.class.open_modbus_slave(uri)
       @modbus_slave.read_retry_timeout = 15
       @modbus_slave.read_retries = 2
-      registers = Aurora.transform_registers(@modbus_slave.holding_registers[88..91, 105...110, 1114])
+      raw_registers = @modbus_slave.holding_registers[88..91, 105...110, 404, 412..413, 1114]
+      registers = Aurora.transform_registers(raw_registers.dup)
       @program = registers[88]
       @serial_number = registers[105]
       @dhw_water_temperature = registers[1114]
+      @energy_monitor = raw_registers[412]
+
+      @blower = case raw_registers[404]
+                when 1, 2 then Blower::ECM.new(self, registers[404])
+                when 3 then Blower::FiveSpeed.new(self, registers[404])
+                else; Blower::PSC.new(self, registers[404])
+                end
+      @pump = if (3..5).include?(raw_registers[413])
+                Pump::VSPump.new(self,
+                                 registers[413])
+              else
+                Pump::GenericPump.new(self,
+                                      registers[413])
+              end
 
       @zones = if iz2?
                  iz2_zone_count = @modbus_slave.holding_registers[483]
@@ -112,9 +128,11 @@ module Aurora
     end
 
     def refresh
-      registers_to_read = [6, 19..20, 25, 30, 340, 344, 347, 740..741, 900, 1110..1111, 1114, 1117, 1147..1153, 1165,
+      registers_to_read = [6, 19..20, 25, 30, 344, 740..741, 900, 1110..1111, 1114, 1147..1153, 1165,
                            31_003]
       registers_to_read << (400..401) if dhw?
+      registers_to_read.concat(blower.registers_to_read)
+      registers_to_read.concat(pump.registers_to_read)
       registers_to_read.concat([362, 3001]) if vs_drive?
 
       if zones.first.is_a?(IZ2Zone)
@@ -138,7 +156,6 @@ module Aurora
 
       outputs = registers[30]
 
-      @fan_speed                  = registers[344]
       @dhw_enabled                = registers[400]
       @dhw_setpoint               = registers[401]
       @entering_air_temperature   = registers[740]
@@ -147,7 +164,6 @@ module Aurora
       @leaving_water_temperature  = registers[1110]
       @entering_water_temperature = registers[1111]
       @dhw_water_temperature      = registers[1114]
-      @waterflow                  = registers[1117]
       @compressor_speed = if vs_drive?
                             registers[3001]
                           elsif outputs.include?(:cc2)
@@ -164,12 +180,8 @@ module Aurora
       @error                      = registers[25] & 0x7fff
       @derated                    = (41..46).include?(@error)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@error)
-      @blower_only_ecm_speed      = registers[340]
-      @aux_heat_ecm_speed         = registers[347]
       @compressor_watts           = registers[1147]
-      @blower_watts               = registers[1149]
       @aux_heat_watts             = registers[1151]
-      @loop_pump_watts            = registers[1165]
       @total_watts                = registers[1153]
 
       @current_mode = if outputs.include?(:lockout)
@@ -190,23 +202,14 @@ module Aurora
                         :standby
                       end
 
+      blower.refresh(registers)
+      pump.refresh(registers)
+
       zones.each do |z|
         z.refresh(registers)
       end
     end
 
-    def blower_only_ecm_speed=(value)
-      return unless (1..12).include?(value)
-
-      @modbus_slave.holding_registers[340] = value
-    end
-
-    def aux_heat_ecm_speed=(value)
-      return unless (1..12).include?(value)
-
-      @modbus_slave.holding_registers[347] = value
-    end
-
     def cooling_airflow_adjustment=(value)
       value = 0x10000 + value if value.negative?
       @modbus_slave.holding_registers[346] = value
@@ -226,20 +229,6 @@ module Aurora
       @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
-
     def line_voltage=(value)
       raise ArgumentError unless (90..635).include?(value)
 
@@ -277,6 +266,10 @@ module Aurora
       @modbus_slave.holding_registers[323] = pump_speed == :with_compressor ? 0x7fff : pump_speed
     end
 
+    def energy_monitoring?
+      @energy_monitor == 2
+    end
+
     def vs_drive?
       @program == "ABCVSP"
     end
@@ -289,7 +282,8 @@ module Aurora
     { 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
+          return @#{component} if instance_variable_defined?(:@#{component})
+          @#{component} = @modbus_slave.holding_registers[#{register}] != 3
         end
 
         def add_#{component}

data/lib/aurora/blower.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Blower
+    class GenericBlower < Component
+      attr_reader :type, :watts
+
+      def initialize(abc, type)
+        super(abc)
+        @type = type
+      end
+
+      def registers_to_read
+        if abc.energy_monitoring?
+          [1148..1149]
+        else
+          []
+        end
+      end
+
+      def refresh(registers)
+        @watts = registers[1148] if abc.energy_monitoring?
+      end
+    end
+
+    class PSC < GenericBlower
+      attr_reader :running
+      alias running? running
+
+      def refresh(registers)
+        @running = registers[30].include?(:g)
+      end
+    end
+
+    class FiveSpeed < GenericBlower
+      attr_reader :speed
+
+      def speed_range
+        0..4
+      end
+
+      def refresh(registers)
+        outputs = registers[30]
+        @speed = if outputs.include?(:eh1)
+                   4
+                 elsif outputs.include?(:cc2)
+                   3
+                 elsif outputs.include?(:cc)
+                   2
+                 elsif outputs.include?(:g)
+                   1
+                 else
+                   0
+                 end
+      end
+    end
+
+    class ECM < GenericBlower
+      attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
+                  :iz2_desired_speed
+
+      def speed_range
+        0..12
+      end
+
+      def registers_to_read
+        result = super + [340..342, 344, 347]
+        result << 565 if abc.iz2?
+        result
+      end
+
+      def refresh(registers)
+        super
+
+        @speed                  = registers[344]
+        @blower_only_speed      = registers[340]
+        @low_compressor_speed   = registers[341]
+        @high_compressor_speed  = registers[342]
+        @aux_heat_speed         = registers[347]
+        @iz2_desired_speed      = registers[565] if abc.iz2?
+      end
+
+      { blower_only: 340,
+        low_compressor: 341,
+        high_compressor: 342,
+        aux_heat: 347 }.each do |(setting, register)|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{setting}_speed=(value)
+            raise ArgumentError unless (1..12).include?(value)
+
+            holding_registers[#{register}] = value
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/aurora/component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Aurora
+  class Component
+    def initialize(abc)
+      @abc = abc
+    end
+
+    private
+
+    attr_reader :abc
+
+    def holding_registers
+      abc.modbus_slave.holding_registers
+    end
+  end
+end

data/lib/aurora/iz2_zone.rb

@@ -41,28 +41,28 @@ module Aurora
     def target_mode=(value)
       return unless (raw_value = Aurora::HEATING_MODE.invert[value])
 
-      @abc.modbus_slave.holding_registers[21_202 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_202 + (zone_number - 1) * 9] = raw_value
       @target_mode = value
     end
 
     def target_fan_mode=(value)
       return unless (raw_value = Aurora::FAN_MODE.invert[value])
 
-      @abc.modbus_slave.holding_registers[21_205 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_205 + (zone_number - 1) * 9] = raw_value
       @target_fan_mode = value
     end
 
     def fan_intermittent_on=(value)
       return unless value >= 0 && value <= 25 && (value % 5).zero?
 
-      @abc.modbus_slave.holding_registers[21_206 + (zone_number - 1) * 9] = value
+      holding_registers[21_206 + (zone_number - 1) * 9] = value
       @fan_intermittent_on = value
     end
 
     def fan_intermittent_off=(value)
       return unless value >= 0 && value <= 40 && (value % 5).zero?
 
-      @abc.modbus_slave.holding_registers[21_207 + (zone_number - 1) * 9] = value
+      holding_registers[21_207 + (zone_number - 1) * 9] = value
       @fan_intermittent_off = value
     end
 
@@ -70,7 +70,7 @@ module Aurora
       return unless value >= 40 && value <= 90
 
       raw_value = (value * 10).to_i
-      @abc.modbus_slave.holding_registers[21_203 + (zone_number - 1) * 9] = raw_value
+      holding_registers[21_203 + (zone_number - 1) * 9] = raw_value
       @heating_target_temperature = value
     end
 
@@ -78,8 +78,8 @@ module Aurora
       return unless value >= 54 && value <= 99
 
       raw_value = (value * 10).to_i
-      @abc.modbus_slave.holding_registers[21_204 + (zone_number - 1) * 9] = value
-      @cooling_target_temperature = raw_value
+      holding_registers[21_204 + (zone_number - 1) * 9] = raw_value
+      @cooling_target_temperature = value
     end
   end
 end

data/lib/aurora/mock_abc.rb

@@ -44,5 +44,6 @@ module Aurora
     def write_holding_register(addr, value)
       @registers[addr] = value
     end
+    alias []= write_holding_register
   end
 end

data/lib/aurora/pump.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "aurora/component"
+
+module Aurora
+  module Pump
+    class GenericPump < Component
+      attr_reader :type, :watts, :waterflow
+
+      def initialize(abc, type)
+        super(abc)
+        @type = type
+      end
+
+      def registers_to_read
+        result = [1117]
+        result.concat([1164..1165]) if abc.energy_monitoring?
+        result
+      end
+
+      def refresh(registers)
+        @waterflow = registers[1117]
+        @watts = registers[1164] if abc.energy_monitoring?
+      end
+    end
+
+    class VSPump < GenericPump
+      attr_reader :speed, :minimum_speed, :maximum_speed, :manual_control
+      alias manual_control? manual_control
+
+      def registers_to_read
+        super + [321..325]
+      end
+
+      def refresh(registers)
+        super
+        @minimum_speed = registers[321]
+        @maximum_speed = registers[322]
+        @manual_control = registers[323] != :off
+        @speed = registers[325]
+      end
+
+      def manual_control=(value)
+        holding_registers[323] = value ? speed : 0x7fff
+      end
+
+      { speed: 323,
+        minimum_speed: 321,
+        maximum_speed: 322 }.each do |(setting, register)|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{setting}=(value)
+            raise ArgumentError unless (1..100).include?(value)
+
+            holding_registers[#{register}] = value
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/aurora/registers.rb

@@ -234,13 +234,6 @@ module Aurora
     0x800 => :alarm
   }.freeze
 
-  # 5-speed ECM shows
-  #  Aux if eh1 is on
-  #  High if cc2 is on
-  #  Med if cc1 is on
-  #  Low if blower is on
-  #  Off
-
   SYSTEM_INPUTS = {
     0x01 => :y1,
     0x02 => :y2,
@@ -483,7 +476,7 @@ module Aurora
   REGISTER_CONVERTERS = {
     TO_HUNDREDTHS => [2, 3, 417, 418, 801, 804, 807, 813, 816, 817, 819, 820, 825, 828],
     method(:dipswitch_settings) => [4, 33],
-    TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900,
+    TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900, 901, 903,
                   1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1119, 1124, 1125, 1134,
                   3322, 3323, 3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
                   12_619, 12_620,
@@ -547,7 +540,7 @@ module Aurora
   REGISTER_FORMATS = {
     "%ds" => [1, 6, 9, 15, 84, 85, 110],
     "%dV" => [16, 112, 3331, 3424, 3523],
-    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900,
+    "%0.1fºF" => [19, 20, 401, 501, 502, 567, 740, 745, 746, 747, 900, 903,
                   1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
                   3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
                   12_619, 12_620,
@@ -560,8 +553,8 @@ module Aurora
                   31_003,
                   31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
     "E%d" => [25, 26],
-    "%d%%" => [282, 321, 322, 325, 346, 565, 741, 1126, 3332, 3524, 3808],
-    "%0.1f psi" => [419, 1115, 1116, 1119, 3322, 3323],
+    "%d%%" => [282, 321, 322, 325, 346, 565, 741, 908, 1126, 3332, 3524, 3808],
+    "%0.1f psi" => [419, 901, 1115, 1116, 1119, 3322, 3323],
     "%0.1fA" => [1105, 1106, 1107, 1108],
     "%0.1fgpm" => [1117],
     "%dW" => [1146, 1148, 1150, 1152, 1164, 3422],
@@ -819,6 +812,10 @@ module Aurora
     828 => "AWL Version",
     829 => "AWL Revision",
     900 => "Leaving Air",
+    901 => "Suction Pressure",
+    903 => "SuperHeat Temperature",
+    908 => "EEV Open %",
+    909 => "SubCooling (Cooling)",
     1103 => "AXB Inputs",
     1104 => "AXB Outputs",
     1105 => "Blower Amps",
@@ -848,10 +845,6 @@ module Aurora
     1154 => "Heat of Extraction",
     1156 => "Heat of Rejection",
     1164 => "Pump Watts",
-    12_606 => "Heating Mode (write)",
-    12_619 => "Heating Setpoint (write)",
-    12_620 => "Cooling Setpoint (write)",
-    12_621 => "Fan Mode (write)",
     3000 => "Compressor Speed Desired",
     3001 => "Compressor Speed Actual",
     3002 => "Manual Operation",
@@ -883,6 +876,10 @@ module Aurora
     3904 => "VS Drive Leaving Air Temperature?",
     3905 => "VS Drive Saturated Evaporator Discharge Temperature",
     3906 => "VS Drive SuperHeat Temperature",
+    12_606 => "Heating Mode (write)",
+    12_619 => "Heating Setpoint (write)",
+    12_620 => "Cooling Setpoint (write)",
+    12_621 => "Fan Mode (write)",
     31_003 => "Outdoor Temp",
     31_005 => "IZ2 Demand",
     31_109 => "Humidifier Mode", # write to 21114

data/lib/aurora/thermostat.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
+require "aurora/component"
+
 module Aurora
-  class Thermostat
+  class Thermostat < Component
     attr_reader :target_mode,
                 :target_fan_mode,
                 :ambient_temperature,
                 :cooling_target_temperature,
                 :heating_target_temperature
 
-    def initialize(abc)
-      @abc = abc
-    end
-
     def refresh(registers)
       @ambient_temperature = registers[502]
-      @heating_target_temperature = registers[746]
-      @cooling_target_temperature = registers[745]
+      @heating_target_temperature = registers[745]
+      @cooling_target_temperature = registers[746]
     end
 
     def target_mode=(value)

data/lib/aurora/version.rb

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

data/lib/aurora.rb

@@ -3,9 +3,7 @@
 require "rmodbus"
 
 require "aurora/abc_client"
-require "aurora/iz2_zone"
 require "aurora/mock_abc"
-require "aurora/thermostat"
 require "aurora/modbus/server"
 require "aurora/modbus/slave"
 require "aurora/registers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.5
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -134,11 +134,14 @@ files:
 - exe/web_aid_tool
 - lib/aurora.rb
 - lib/aurora/abc_client.rb
+- lib/aurora/blower.rb
+- lib/aurora/component.rb
 - lib/aurora/core_ext/string.rb
 - lib/aurora/iz2_zone.rb
 - lib/aurora/mock_abc.rb
 - lib/aurora/modbus/server.rb
 - lib/aurora/modbus/slave.rb
+- lib/aurora/pump.rb
 - lib/aurora/registers.rb
 - lib/aurora/thermostat.rb
 - lib/aurora/version.rb