balboa_worldwide_app 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2c576e6a37c43c681729ff2657eb07f9424be814bb1ecbb8a22639f3edb83b
-  data.tar.gz: d3c157c5a9c3776c66d061b15deec4b10d5c51ba4b4866e26ea79e703084e9a8
+  metadata.gz: 64fc310dcf147c2786084dcd1fd792942a46d4af3a9e3a32caed05aafd3af2db
+  data.tar.gz: 881215be0b0f7ec906c0c1fa36f8866abe16e0dd748d906ddaa324c9b46f7af9
 SHA512:
-  metadata.gz: f42ac7f5102742a13735b6661837611f179e2e8b8c6bbaa7c9938dc451ded4aa277f5314260cf0ee552b4422fc95c8fb669c6ba343f9eaee1216fbd10c4da574
-  data.tar.gz: 6a66e7afff3ce43eb0cc1bfb571f621ce3870547b82da5c0f82aea7f56d582b221e08f34967b1b766499406b36e25e8dc7028172ed8ad0f985d9ff7d310dd2f5
+  metadata.gz: 54ddd001789885a8134d2cc0d479c5506a51a000394fb4cf6f268d49f8dfa90f216468dcbe1fbc0f947568ea52ccab55975a65d4605e23330e8d8a5dc5feeb62
+  data.tar.gz: 06a454791a33e646ecc8e10c7362c978e138d4a82ea404466ef5207ad2cc2624ae65ecadd425744306922aa18b008a2f3c9b2dd1003896da7be50d6ab3089831

data/exe/bwa_mqtt_bridge

@@ -137,6 +137,11 @@ class MQTTBridge
     allow_toggle = lambda do |value|
       next value if value == "toggle"
     end
+    allow_toggle_or_speed = lambda do |value|
+      next value if value == "toggle"
+
+      value.to_i if value.match?(/^\d+$/)
+    end
 
     @homie.node("spa", "Hot Tub", @bwa.model) do |spa|
       spa.property("hold",
@@ -216,7 +221,7 @@ class MQTTBridge
         spa.property("blower",
                      "Blower",
                      *args,
-                     non_standard_value_check: allow_toggle,
+                     non_standard_value_check: allow_toggle_or_speed,
                      **kwargs) do |value|
           next @bwa.toggle_blower if value == "toggle"
 
@@ -261,7 +266,7 @@ class MQTTBridge
         spa.property("pump#{i + 1}",
                      name,
                      *args,
-                     non_standard_value_check: allow_toggle,
+                     non_standard_value_check: allow_toggle_or_speed,
                      **kwargs) do |value|
           next @bwa.toggle_pump(i) if value == "toggle"
 

data/lib/bwa/client.rb

@@ -160,7 +160,8 @@ module BWA
       return unless status && configuration
 
       desired = 0 if desired == false
-      desired = 1 if desired == true
+      desired = configuration.pumps[index] if desired == true
+      desired = [desired, configuration.pumps[index]].min
       times = (desired - status.pumps[index]) % (configuration.pumps[index] + 1)
       times.times do
         toggle_pump(index)
@@ -190,6 +191,9 @@ module BWA
     def blower=(desired)
       return unless status && configuration
 
+      desired = 0 if desired == false
+      desired = configuration.blower if desired == true
+      desired = [desired, configuration.blower].min
       times = (desired - status.blower) % (configuration.blower + 1)
       times.times do
         toggle_blower

data/lib/bwa/messages/status.rb

@@ -81,7 +81,7 @@ module BWA
 
         flags = data[13].ord
         self.circulation_pump = (flags & 0x02 == 0x02)
-        self.blower = (flags & 0x0C == 0x0C)
+        self.blower = (flags >> 2) & 0x03
         flags = data[14].ord
         lights[0] = (flags & 0x03 != 0)
         lights[1] = ((flags >> 2) & 0x03 != 0)
@@ -176,7 +176,7 @@ module BWA
         items << "heating" if heating
         items << temperature_range
         items << "circulation_pump" if circulation_pump
-        items << "blower" if blower
+        items << "blower=#{blower}"
         items << "pumps=#{pumps.inspect}"
         items << "lights=#{lights.inspect}"
         items << "aux=#{aux.inspect}"

data/lib/bwa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BWA
-  VERSION = "2.0.0"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement