balboa_worldwide_app 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 474d2a26cc4dca552bcb29ff22aa486903d73b7707c40d9c160e77eb2baed5fb
-  data.tar.gz: f085680c104a2d42e1755cf63a44538a376e875820c12468f0fb955c39f69f07
+  metadata.gz: 9b3690c43f61e80376391c61d447f3e8430ae844ffc5d380afa9bb90636095bd
+  data.tar.gz: 284a4856cac4830956a8e944572ce724f0bbeba98efa3cba0a879d932193bc23
 SHA512:
-  metadata.gz: d6f16d2ae55926e145489f3b61d9df9be692e2a5a3d21920721ef657301d1e099fe28381e8c7eea9711efd2b314079b818e2f33bbda66234423c3be4c0ccacd5
-  data.tar.gz: d7a6d5640c2902c03e22a6f4b11f447b3f4e3b6c9da757070b7db363b8dbb4e1b77ecfbce1553779f68b077e5ac2eac98f06d5ca7c7abafc9e4433459b211e81
+  metadata.gz: 7a82e78b7f1ea26b74fe71117e9ca9c549708851f39a62c176650faf12c972f32658a541edac023ccd81def26fa6c2e8844adb3bf8b0f95bc4720ecf11d44e9c
+  data.tar.gz: 00ffc61f1eb37ac4025e03e3a0412835e1211f2faa82d46dc6115de3a13ede7e4526fe3527bd9d04b9dfb8873ccfe566992e7a8a6955adca55161a6be2d45dd3

data/bin/bwa_mqtt_bridge

@@ -126,7 +126,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
@@ -186,10 +186,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 'serialport'
-        @io = SerialPort.open(uri.path, "baud" => 115200)
+        require 'ccutrer-serialport'
+        @io = CCutrer::SerialPort.new(uri.path, baud: 115200)
         @queue = []
       end
       @buffer = ""
@@ -25,10 +25,16 @@ module BWA
       message = bytes_read = nil
       loop do
         message, bytes_read = Message.parse(@buffer)
-       # discard how much we read
-       @buffer = @buffer[bytes_read..-1] if bytes_read
+        # discard how much we read
+        @buffer = @buffer[bytes_read..-1] if bytes_read
+        method = @io.respond_to?(:readpartial) ? :readpartial : :read
         unless message
-          @buffer.concat(@io.readpartial(64 * 1024))
+          begin
+            @buffer.concat(@io.__send__(method, 64 * 1024))
+          rescue EOFError
+            @io.wait_readable
+            retry
+          end
           next
         end
         break
@@ -139,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

@@ -11,6 +11,9 @@ module BWA
   end
 
   class Message
+    class Unrecognized < Message
+    end
+
     class << self
       def inherited(klass)
         @messages ||= []
@@ -42,21 +45,31 @@ module BWA
         puts "discarding invalid data prior to message #{data[0...offset].unpack('H*').first}" unless offset == 0
         #puts "read #{data.slice(offset, length + 2).unpack('H*').first}"
 
-        message_type = data.slice(offset + 2, 3)
+        src = data[offset + 2].ord
+        message_type = data.slice(offset + 3, 2)
         klass = @messages.find { |k| k::MESSAGE_TYPE == message_type }
 
 
         return [nil, offset + length + 2] if [
-                      "\xfe\xbf\x00".force_encoding(Encoding::ASCII_8BIT),
-                      "\x10\xbf\xe1".force_encoding(Encoding::ASCII_8BIT),
-                      "\x10\xbf\x07".force_encoding(Encoding::ASCII_8BIT)].include?(message_type)
-
-        raise InvalidMessage.new("Unrecognized message #{message_type.unpack("H*").first}", data) unless klass
-        raise InvalidMessage.new("Unrecognized data length (#{length}) for message #{klass}", data) unless length - 5 == klass::MESSAGE_LENGTH
+                      "\xbf\x00".force_encoding(Encoding::ASCII_8BIT),
+                      "\xbf\xe1".force_encoding(Encoding::ASCII_8BIT),
+                      "\xbf\x07".force_encoding(Encoding::ASCII_8BIT)].include?(message_type)
+
+        if klass
+          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
 
         message = klass.new
         message.parse(data.slice(offset + 5, length - 5))
         message.instance_variable_set(:@raw_data, data.slice(offset, length + 2))
+        message.instance_variable_set(:@src, src)
         [message, offset + length + 2]
       end
 
@@ -76,14 +89,19 @@ module BWA
       end
     end
 
-    attr_reader :raw_data
+    attr_reader :raw_data, :src
+
+    def initialize
+      # most messages we're sending come from this address
+      @src = 0x0a
+    end
 
     def parse(_data)
     end
 
     def serialize(message = "")
       length = message.length + 5
-      full_message = "#{length.chr}#{self.class::MESSAGE_TYPE}#{message}".force_encoding(Encoding::ASCII_8BIT)
+      full_message = "#{length.chr}#{src.chr}#{self.class::MESSAGE_TYPE}#{message}".force_encoding(Encoding::ASCII_8BIT)
       checksum = CRC.checksum(full_message)
       "\x7e#{full_message}#{checksum.chr}\x7e".force_encoding(Encoding::ASCII_8BIT)
     end

data/lib/bwa/messages/configuration.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class Configuration < Message
-      MESSAGE_TYPE = "\x0a\xbf\x94".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x94".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 25
     end
   end

data/lib/bwa/messages/configuration_request.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class ConfigurationRequest < Message
-      MESSAGE_TYPE = "\x0a\xbf\x04".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x04".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 0
 
       def inspect

data/lib/bwa/messages/control_configuration.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class ControlConfiguration < Message
-      MESSAGE_TYPE = "\x0a\xbf\x24".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x24".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 21
 
       attr_accessor :model, :version
@@ -20,13 +20,9 @@ module BWA
         "#<BWA::Messages::ControlConfiguration #{model} #{version}>"
       end
     end
-  end
-end
 
-module BWA
-  module Messages
     class ControlConfiguration2 < Message
-      MESSAGE_TYPE = "\x0a\xbf\x2e".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x2e".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 6
 
       attr_accessor :pumps, :lights, :circ_pump, :blower, :mister, :aux

data/lib/bwa/messages/control_configuration_request.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class ControlConfigurationRequest < Message
-      MESSAGE_TYPE = "\x0a\xbf\x22".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x22".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 3
 
       attr_accessor :type

data/lib/bwa/messages/filter_cycles.rb

@@ -5,7 +5,7 @@ module BWA
                   :filter2_enabled,
                   :filter2_hour, :filter2_minute, :filter2_duration_hours, :filter2_duration_minutes
 
-      MESSAGE_TYPE = "\x0a\xbf\x23".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x23".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 8
 
       def parse(data)

data/lib/bwa/messages/ready.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class Ready < Message
-      MESSAGE_TYPE = "\x10\xbf\06".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\06".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 0
     end
   end

data/lib/bwa/messages/set_temperature.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class SetTemperature < Message
-      MESSAGE_TYPE = "\x0a\xbf\x20".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x20".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 1
 
       attr_accessor :temperature

data/lib/bwa/messages/set_temperature_scale.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class SetTemperatureScale < Message
-      MESSAGE_TYPE = "\x0a\xbf\x27".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x27".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 2
 
       attr_accessor :scale

data/lib/bwa/messages/set_time.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class SetTime < Message
-      MESSAGE_TYPE = "\x0a\xbf\x21".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x21".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 2
 
       attr_accessor :hour, :minute, :twenty_four_hour_time

data/lib/bwa/messages/status.rb

@@ -17,10 +17,12 @@ module BWA
                     :aux,
                     :current_temperature, :set_temperature
 
-      MESSAGE_TYPE = "\xff\xaf\x13".force_encoding(Encoding::ASCII_8BIT)
-      MESSAGE_LENGTH = 24
+      MESSAGE_TYPE = "\xaf\x13".force_encoding(Encoding::ASCII_8BIT)
+      # additional features have been added in later versions
+      MESSAGE_LENGTH = 24..32
 
       def initialize
+        @src = 0xff
         self.priming = false
         self.heating_mode = :ready
         @temperature_scale = :fahrenheit
@@ -170,4 +172,4 @@ module BWA
       end
     end
   end
-end
+end

data/lib/bwa/messages/toggle_item.rb

@@ -1,7 +1,7 @@
 module BWA
   module Messages
     class ToggleItem < Message
-      MESSAGE_TYPE = "\x0a\xbf\x11".force_encoding(Encoding::ASCII_8BIT)
+      MESSAGE_TYPE = "\xbf\x11".force_encoding(Encoding::ASCII_8BIT)
       MESSAGE_LENGTH = 2
 
       attr_accessor :item
@@ -15,8 +15,10 @@ module BWA
                       when 0x04; :pump1
                       when 0x05; :pump2
                       when 0x11; :light1
+                      when 0x3c; :hold
                       when 0x50; :temperature_range
                       when 0x51; :heating_mode
+                      else; data[0].ord
                     end
       end
 

data/lib/bwa/version.rb

@@ -1,3 +1,3 @@
 module BWA
-  VERSION = '1.1.0'
-end
+  VERSION = '1.2.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement