balboa_worldwide_app 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537f4b0048b2f972b06f90fc404fc9589845cc7550e5305a19e0bab892e647e4
-  data.tar.gz: 79fd85b3e8e95b6fade48c8135c170a52956b60d69199a84a31bed4ccd6f7c61
+  metadata.gz: c54bf4de74bdb4e53dce087127534357ec05b1b0b69921f6d7c6956a566ca844
+  data.tar.gz: 17a7574e1134c7976505777567fd90209ebb5dc85fd358f132cb4088329a1e07
 SHA512:
-  metadata.gz: f9517634786bc75db423f2a2b4e2941535fc31deb0dd38f610c94f613ce4d00eafeadcc43c517fd5f475fc62392d00ba42b57f8b0abaad9d18289e4bf65fa1a7
-  data.tar.gz: 7d4388cdeefa5477402594681fad8fee169ca02dc6449edec60cd827f80e81d9aba53251202217c6e8c20feca8e0ab29b20b4703d04641259a9eddeb47fc3d1c
+  metadata.gz: 0d9feac37083c472fb2609a337cd55d7e9415230f0c3192a76b161278fadf6e51659f54559b3596957c03a486359c3b2d0e5bc78f130685dba07865eac31144a
+  data.tar.gz: 7e10ebe03a3ac43ecbad06ea3783bbbf517ad2cde7c78f6e0bbed333399a873b6549a0db80990e15fd2b94b74c898190b626f71c49db8c84f3cdf4e25643707a

data/bin/bwa_mqtt_bridge

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'mqtt'
+require 'sd_notify'
+require 'set'
 
 require 'bwa/client'
 require 'bwa/discovery'
@@ -17,6 +19,9 @@ class MQTTBridge
 
     publish_basic_attributes
 
+    # Tell systemd we've started up OK. Ignored if systemd not in use.
+    SdNotify.ready
+
     bwa_thread = Thread.new do
       loop do
         begin
@@ -88,6 +93,9 @@ class MQTTBridge
             (0..1).each do |i|
               publish_attribute("spa/aux#{i + 1}", message.lights[i]) if @bwa.last_control_configuration2&.aux&.[](i)
             end
+
+            # Tell systemd we are still alive and kicking. Ignored if systemd not in use.
+            SdNotify.watchdog
           end
         end
       end
@@ -126,7 +134,7 @@ class MQTTBridge
         next @bwa.toggle_blower if value == 'toggle'
         @bwa.set_blower(value.to_i)
       when "spa/settemperature/set"
-        @bwa.set_temperature(value.to_i)
+        @bwa.set_temperature(value.to_f)
       end
     end
   end
@@ -147,7 +155,7 @@ class MQTTBridge
   end
 
   def publish_basic_attributes
-    publish("$homie", "v4.0.0")
+    publish("$homie", "4.0.0")
     publish("$name", "BWA Spa")
     publish("$state", "init")
     publish("$nodes", "spa")
@@ -186,10 +194,10 @@ class MQTTBridge
     subscribe("spa/temperaturerange/set")
 
     publish("spa/currenttemperature/$name", "Current temperature")
-    publish("spa/currenttemperature/$datatype", "integer")
+    publish("spa/currenttemperature/$datatype", "float")
 
     publish("spa/settemperature/$name", "Set Temperature")
-    publish("spa/settemperature/$datatype", "integer")
+    publish("spa/settemperature/$datatype", "float")
     publish("spa/settemperature/$settable", "true")
     subscribe("spa/settemperature/set")
 

data/lib/bwa/client.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 require 'bwa/message'
 
 module BWA
@@ -145,7 +147,7 @@ module BWA
     # low range is 50-80 for F, 10-26 for C (by 0.5)
     def set_temperature(desired)
       desired *= 2 if last_status && last_status.temperature_scale == :celsius || desired < 50
-      send_message("\x0a\xbf\x20#{desired.chr}")
+      send_message("\x0a\xbf\x20#{desired.round.chr}")
     end
 
     def set_time(hour, minute, twenty_four_hour_time = false)

data/lib/bwa/message.rb

@@ -27,18 +27,28 @@ module BWA
           offset += 1
           return nil if data.length - offset < 5
 
+          # Keep scanning until message start char
           next unless data[offset] == '~'
+
+          # Read length (safe since we have at least 5 chars)
           length = data[offset + 1].ord
-          # impossible message
-          next if length < 5
+
+          # No message is this short or this long; keep scanning
+          next if length < 5 or length >= '~'.ord
 
           # don't have enough data for what this message wants;
-          # it could be garbage on the line so keep scanning
-          next if length + 2 > data.length - offset
+          # return and hope for more (yes this might cause a
+          # delay, but the protocol is very chatty so it won't
+          # be long)
+          return nil if length + 2 > data.length - offset
 
+          # Not properly terminated; keep scanning
           next unless data[offset + length + 1] == '~'
 
+          # Not a valid checksum; keep scanning
           next unless CRC.checksum(data.slice(offset + 1, length - 1)) == data[offset + length].ord
+
+          # Got a valid message!
           break
         end
 

data/lib/bwa/messages/status.rb

@@ -81,8 +81,8 @@ module BWA
         self.current_temperature = nil if self.current_temperature == 0xff
         self.set_temperature = data[20].ord
         if temperature_scale == :celsius
-          self.current_temperature /= 2.0
-          self.set_temperature /= 2.0
+          self.current_temperature /= 2.0 if self.current_temperature
+          self.set_temperature /= 2.0 if self.set_temperature
         end
       end
 

data/lib/bwa/version.rb

@@ -1,3 +1,3 @@
 module BWA
-  VERSION = '1.2.1'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.5
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sd_notify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description:
+description: 
 email: cody@cutrer.com'
 executables:
 - bwa_mqtt_bridge
@@ -128,7 +142,7 @@ homepage: https://github.com/ccutrer/bwa
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Library for communication with Balboa Water Group's WiFi module or RS-485
 test_files: []