waterfurnace_aurora 1.4.12 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c4bed015e5efbf7e4ec8dddafc69b15e0134c2b0889f0c50855cf7c1dfbfa38
-  data.tar.gz: fd869a81144c60fcd019e20117854324b2ca06b66b325dc5991dc9b8d9731277
+  metadata.gz: 17aca7ac9e30306139488ac3cf493e783f3d06fe8b676de9a29ac7d953895064
+  data.tar.gz: 1b89fc8bd7a3b8746d3f1aec892d84739fcc2c18459207e7a0ef155d27a3a385
 SHA512:
-  metadata.gz: 0e45fe5fa6161a9356a179b1da06db3f16eff1494d16871ff325c144f26dee80ea8d15c65bc9a5b9a8a16596c4e4ef41f4c18827797402010d27ea66749b8e81
-  data.tar.gz: d9a5b40f3b33b43900f09e34cd90cbc8b2a20f2a919746060284adc001e21cb92c7faa334077ee49c2e62564656a6c68072c8a56d04bc57f471506a3591c6b4a
+  metadata.gz: 3932ed17dad06d64c7d0bff5cc4438fd0e049f1849129e62edfeeba584fb78076766dffe5c4c70d4c7a7c7b49ccbce1eea0d0649b2e4195dc7231211eae3daff
+  data.tar.gz: 24e95b2711a709fbb491731f1f9b65dfb042ba329596428c7caaecf76d9bce65f4393524f5c5113ebda4ec9533248f4f1b607f64016fb1625a43d51230b9b1c7

data/exe/aurora_mqtt_bridge

@@ -2,8 +2,7 @@
 # frozen_string_literal: true
 
 require "aurora"
-require "homie-mqtt"
-require "mqtt/home_assistant"
+require "mqtt/homie/home_assistant"
 require "ccutrer-serialport"
 require "uri"
 require "optparse"
@@ -584,8 +583,7 @@ class MQTTBridge
         node.property("enabled",
                       "Enabled",
                       :boolean,
-                      @abc.dhw.enabled,
-                      hass: { switch: { icon: "mdi:water-boiler" } }) do |value|
+                      @abc.dhw.enabled) do |value|
           @mutex.synchronize { @abc.dhw.enabled = value }
         end
         node.property("running",
@@ -598,27 +596,46 @@ class MQTTBridge
                       :float,
                       @abc.dhw.set_point,
                       format: 100..140,
-                      unit: "°F",
-                      hass: { number: { step: 5 } }) do |value|
+                      unit: "°F") do |value|
           @mutex.synchronize { @abc.dhw.set_point = value }
         end
         node.property("water-temperature",
                       "Water Temperature",
                       :float,
                       @abc.dhw.water_temperature,
-                      unit: "°F",
-                      hass: { sensor: { device_class: :temperature,
-                                        state_class: :measurement } })
+                      unit: "°F")
+        @homie.mqtt.unpublish_hass_switch("dhw_enabled", node_id: @homie.id)
+        @homie.mqtt.unpublish_hass_number("dhw_set-point", node_id: @homie.id)
+        @homie.mqtt.unpublish_hass_sensor("dhw_water-temperature", node_id: @homie.id)
+        node.hass_water_heater(current_temperature_property: "water-temperature",
+                               mode_property: "enabled",
+                               modes: %i[off heat_pump],
+                               mode_command_template: <<~JINJA,
+                                 {% if value == 'off' %}
+                                   false
+                                 {% else %}
+                                   true
+                                 {% endif %}
+                               JINJA
+                               mode_state_template: <<~JINJA,
+                                 {% if value == 'true' %}
+                                   heat_pump
+                                 {% elif value == 'false' %}
+                                   off
+                                 {% endif %}
+                               JINJA
+                               temperature_property: "set-point",
+                               icon: "mdi:water-boiler")
       end
     end
 
     if @abc.humidistat
       @humidistat = @homie.node("humidistat", "Humidistat", "Humidistat") do |node|
         if @abc.humidistat.humidifier?
-          node.property("humidifier-running",
-                        "Humidifier Running",
-                        :boolean,
-                        @abc.humidistat.humidifier_running?)
+          running = node.property("humidifier-running",
+                                  "Humidifier Running",
+                                  :boolean,
+                                  @abc.humidistat.humidifier_running?)
           if @abc.awl_communicating?
             node.property("humidifier-mode",
                           "Humidifier Mode",
@@ -636,21 +653,22 @@ class MQTTBridge
               @mutex.synchronize { @abc.humidistat.humidification_target = value }
             end
             node.hass_humidifier("humidifier-running",
-                                 target_property: "humidification-target",
+                                 target_humidity_property: "humidification-target",
                                  mode_property: "humidifier-mode",
-                                 id: "humidifier",
+                                 object_id: "humidifier",
                                  name: "Humidifier",
-                                 device_class: :humidifier)
+                                 device_class: :humidifier,
+                                 command_topic: "#{running.topic}/set")
           end
         end
 
         # VSDrive can perform active dehumidification, even without a dedicated dehumidifier
         if @abc.humidistat.dehumidifier? ||
            @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
-          node.property("dehumidifier-running",
-                        "Dehumidifier Running",
-                        :boolean,
-                        @abc.humidistat.dehumidifier_running?)
+          running = node.property("dehumidifier-running",
+                                  "Dehumidifier Running",
+                                  :boolean,
+                                  @abc.humidistat.dehumidifier_running?)
           if @abc.awl_communicating?
             node.property("dehumidifier-mode",
                           "Dehumidifier Mode",
@@ -668,11 +686,12 @@ class MQTTBridge
               @mutex.synchronize { @abc.humidistat.dehumidification_target = value }
             end
             node.hass_humidifier("dehumidifier-running",
-                                 target_property: "dehumidification-target",
+                                 target_humidity_property: "dehumidification-target",
                                  mode_property: "dehumidifier-mode",
-                                 id: "dehumidifier",
+                                 object_id: "dehumidifier",
                                  name: "Dehumidifier",
-                                 device_class: :dehumidifier)
+                                 device_class: :dehumidifier,
+                                 command_topic: "#{running.topic}/set")
           end
         end
         next unless @abc.awl_communicating?
@@ -819,17 +838,16 @@ class MQTTBridge
                           mode_property: "target-mode",
                           temperature_high_property: "cooling-target-temperature",
                           temperature_low_property: "heating-target-temperature",
-                          templates: {
-                            action_template: <<~JINJA
-                              {% if value.startswith('h') %}
-                                heating
-                              {% elif value.startswith('c') %}
-                                cooling
-                              {% elif value == 'standby' %}
-                                idle
-                              {% endif %}
-                            JINJA
-                          })
+                          action_template: <<~JINJA
+                            {% if value.startswith('h') %}
+                              heating
+                            {% elif value.startswith('c') %}
+                              cooling
+                            {% elif value == 'standby' %}
+                              idle
+                            {% endif %}
+                          JINJA
+                         )
       end
     end
 

data/lib/aurora/abc_client.rb

@@ -236,7 +236,7 @@ module Aurora
       end
       @outdoor_temperature        = registers[31_003]
       @air_coil_temperature       = registers[20]
-      @locked_out                 = !registers[25].nobits?(0x8000)
+      @locked_out                 = registers[25].anybits?(0x8000)
       @current_fault              = registers[25] & 0x7fff
       @derated                    = (41..46).cover?(@current_fault)
       @safe_mode                  = [47, 48, 49, 72, 74].include?(@current_fault)

data/lib/aurora/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.5.1
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -25,25 +25,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mqtt-homeassistant
+  name: mqtt-homie-homeassistant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement