waterfurnace_aurora 1.4.11 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53077daf9bf7047148ddb43fff7058c3a2e93d52673293fadc9b0a51bcd5bf06
-  data.tar.gz: 789a953ebc457a4d607a6e67916703ecf9fd48b8394953026544c95b85ad3ce6
+  metadata.gz: 4aa5d7eb7e44c106d01755ecdfce849f23503d3d6c10da86bfa4c9d4376669e3
+  data.tar.gz: '026036095b6c3f5a7fd98825970612dd0399908f255ddc6a98520535edb2922d'
 SHA512:
-  metadata.gz: aae7893a9da0786214b045fc5e8182590abac939461cc1df6c717bd4bbdf4391bf020a37a1d5e291f541f4d8f23d2a091d351d18f840edb4d091a210b6f33628
-  data.tar.gz: 5166996c59c556c961100347217afe9b2b29a38a27b3e109cf9b9f9399128a0c83c680a53e39e363861a93a0c0cf311c227af6a23ee814c7fdc84b310f6e1a22
+  metadata.gz: b9904a9e4941a113c3c2a41819ba3dd279155262394011fa4b089062571079981c741a086e21c34c67276cd5b1f35ba2358ec71a5794022d01c7837aa635911b
+  data.tar.gz: 683a618118d05978ba623e0df2a6adaac9ff2d436b70baaad6374d4760e980c34bad29124a16929d5a4edd062df3a537b7a26baf96fa7dc69419c01e111658eb

data/exe/aurora_mqtt_bridge

@@ -151,7 +151,7 @@ class MQTTBridge
                     :enum,
                     @abc.current_mode,
                     format: allowed_modes,
-                    hass: { sensor: { state_class: :measurement } })
+                    hass: :sensor)
       node.property("emergency-shutdown",
                     "Emergency Shutdown Requested",
                     :boolean,
@@ -584,8 +584,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 +597,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 +654,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 +687,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 +839,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] & 0x8000).zero?
+      @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/registers.rb

@@ -479,7 +479,7 @@ module Aurora
   def zone_configuration3(value)
     size = (value >> 3) & 0x3
     result = {
-      zone_priority: ((value & 0x20) == 0x20) ? :economy : :comfort,
+      zone_priority: value.allbits?(0x20) ? :economy : :comfort,
       zone_size: ZONE_SIZES[size],
       normalized_size: value >> 8
     }

data/lib/aurora/version.rb

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

data/lib/aurora/web_aid_tool.rb

@@ -43,7 +43,7 @@ module Aurora
     end
 
     get "/request.cgi" do
-      params = parse_query_string(request.query_string)
+      params = URI.decode_www_form(request.query_string).to_h
       result = params.slice("cmd", "id", "set", "addr")
       result["err"] = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfurnace_aurora
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.5.0
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -25,25 +25,19 @@ 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'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +126,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.a
-description: 
+description:
 email: cody@cutrer.us'
 executables:
 - aurora_fetch
@@ -173,7 +167,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.11
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Library for communication with WaterFurnace Aurora control systems
 test_files: []