balboa_worldwide_app 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0291c14ad60589f11fdeffee50a92741cad4b43bf0f8ea84f7fe08f23d7e0182'
-  data.tar.gz: b9ece98fd0e7b52130e67e633bbd06cc8cb9638fac0a4b9d19b213312c20a351
+  metadata.gz: f98b3b4e56ddb3c9616fec737a7ae9df0af3cf6d0878b71fa290d72f8e12d8a6
+  data.tar.gz: c96c5fc591aeb27859b25107771bf05e2e03bb1a4492433bc8a47769930ea455
 SHA512:
-  metadata.gz: 2f8342fe70025de40baa56a8a9b030cbec20a891ec7a4aaadb3ea3107b8d7b40441b840ad85333db043ccee752e4994f4dc8bdc2c4874e8ae31e1a05ca2cda5e
-  data.tar.gz: '057971154699cd8a293928119368c5a54862720315cc99e2c5f621f515caa6da6c58ff9627a3e4f22b33ca06cb28a8b8af85799dc72e8087762ac85de04854f4'
+  metadata.gz: dad20a7cf67d11e97f4fae5d1679fc8309e5e8d9974b03c05bc451d702496bdf3771d0a47e6316eedff63e27db8476820bb4624e60c3f9f6cbc95fabf85fa580
+  data.tar.gz: ec482f620eb4ae5ce138b12e8f03de615616d024394f24ceec4243ef301e0f194c3a0d684fb5db954fd18313a254536e9fd45a67a81eb25a72ef1b7987bdfff2

data/exe/bwa_mqtt_bridge

@@ -137,6 +137,13 @@ 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"
+      next true if value == "true"
+      next false if value == "false"
+
+      value.to_i if value.match?(/^\d+$/)
+    end
 
     @homie.node("spa", "Hot Tub", @bwa.model) do |spa|
       spa.property("hold",
@@ -216,7 +223,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 +268,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

@@ -64,9 +64,15 @@ module BWA
         @buffer = @buffer[bytes_read..-1] if bytes_read
         method = @io.respond_to?(:readpartial) ? :readpartial : :read
         unless message
+          # one EOF is just serial ports saying they have no data;
+          # several EOFs in a row is the file is dead and gone
+          eofs = 0
           begin
             @buffer.concat(@io.__send__(method, 64 * 1024))
           rescue EOFError
+            eofs += 1
+            raise if eofs == 5
+
             @io.wait_readable
             retry
           end
@@ -160,7 +166,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)
@@ -191,7 +198,8 @@ module BWA
       return unless status && configuration
 
       desired = 0 if desired == false
-      desired = 1 if desired == true
+      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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ccutrer-serialport