balboa_worldwide_app 1.1.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e24d4fa8787d36a34d66af9993561f237ecfdf7876e121176870ba93fdd4f67
-  data.tar.gz: f223828f21309f8742616ab27ee925ddc02eab02304220418a015f25b79802a2
+  metadata.gz: 6c8aedb1449973af5ee03ee3927e31e6c5edaa76305ff556ab48eaccc94fc7bf
+  data.tar.gz: e43450ff21fe2bfabf8514642b7ce98576a32b60aa3b06a8364c5e8fd8d3ed1a
 SHA512:
-  metadata.gz: 2c12165571d6d619af2019fa30d85bee8af5d6758ffd9829363614b4ddab16993706dde33e91b0d5bc76578734a053f12fdad73290018317ec618ef04a6e6beb
-  data.tar.gz: 8256ecee88d74681ed4b1f25d1b5d75b7f9d20ff3681b973f8ef9f1d80de08ca63c7c622cc60d0ec3394c2323e5013e8a5b073d23dce80dec08c25f7fb4c25f4
+  metadata.gz: af663ca63be3bd5f2a80da01d038e9853bdb7781972a2da443ad22cf89f2915f5dd3feeab030a4be8e62682aa8c472a6610537583c8d48674ff68fce5527db31
+  data.tar.gz: aa3fbecd9f50d93097852eaf13124c671a488afc2001ec12ec4500c46349db6be6f7b81631f44dccdc9f68e3ff0157e090018b8a615fe28662eb18bdcdb26285

data/bin/bwa_mqtt_bridge

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'mqtt'
+require 'sd_notify'
 
 require 'bwa/client'
 require 'bwa/discovery'
@@ -17,6 +18,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 +92,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 +133,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 +154,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 +193,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

@@ -14,8 +14,8 @@ module BWA
         @io = Net::Telnet::RFC2217.new("Host" => uri.host, "Port" => uri.port || 23, "baud" => 115200)
         @queue = []
       else
-        require 'rubyserial'
-        @io = Serial.new(uri.path, 115200)
+        require 'ccutrer-serialport'
+        @io = CCutrer::SerialPort.new(uri.path, baud: 115200)
         @queue = []
       end
       @buffer = ""
@@ -30,7 +30,7 @@ module BWA
         method = @io.respond_to?(:readpartial) ? :readpartial : :read
         unless message
           begin
-            @buffer.concat(@io.send(method, 64 * 1024))
+            @buffer.concat(@io.__send__(method, 64 * 1024))
           rescue EOFError
             @io.wait_readable
             retry
@@ -145,7 +145,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
 
@@ -56,7 +66,12 @@ module BWA
                       "\xbf\x07".force_encoding(Encoding::ASCII_8BIT)].include?(message_type)
 
         if klass
-          raise InvalidMessage.new("Unrecognized data length (#{length}) for message #{klass}", data) unless length - 5 == klass::MESSAGE_LENGTH
+          valid_length = if klass::MESSAGE_LENGTH.respond_to?(:include?)
+            klass::MESSAGE_LENGTH.include?(length - 5)
+          else
+            length - 5 == klass::MESSAGE_LENGTH
+          end
+          raise InvalidMessage.new("Unrecognized data length (#{length}) for message #{klass}", data) unless valid_length
         else
           klass = Unrecognized
         end

data/lib/bwa/messages/status.rb

@@ -18,7 +18,8 @@ module BWA
                     :current_temperature, :set_temperature
 
       MESSAGE_TYPE = "\xaf\x13".force_encoding(Encoding::ASCII_8BIT)
-      MESSAGE_LENGTH = 24
+      # additional features have been added in later versions
+      MESSAGE_LENGTH = 24..32
 
       def initialize
         @src = 0xff
@@ -80,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
 
@@ -171,4 +172,4 @@ module BWA
       end
     end
   end
-end
+end

data/lib/bwa/version.rb

@@ -1,3 +1,3 @@
 module BWA
-  VERSION = '1.1.2'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc
@@ -53,19 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: rubyserial
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        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
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Library for communication with Balboa Water Group's WiFi module or RS-485
 test_files: []