balboa_worldwide_app 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7daff60d63c09a23f5628f69102fa722745c343d5c3641d7d87f09e47be7549a
-  data.tar.gz: b70859344d26e0f7a54b3a8ffea6389637683c5b5f31de5a0defb8bb52176c0a
+  metadata.gz: 537f4b0048b2f972b06f90fc404fc9589845cc7550e5305a19e0bab892e647e4
+  data.tar.gz: 79fd85b3e8e95b6fade48c8135c170a52956b60d69199a84a31bed4ccd6f7c61
 SHA512:
-  metadata.gz: '085e33a524d9410cbd069592804a716448031eece734bf5d2209318ef387ef9b2cda6fe941f4956681015889ca70f6f4429805eabfbc56e0bd23322262c3f850'
-  data.tar.gz: 749b99bc33e6df19dec5f276206a62556310be025daec5b8c71f061f8fd45510d7a6f58f201655f8b9cfc0bfaf826cf7c7b5b3d5b43755bbedc44ed87bdd70b5
+  metadata.gz: f9517634786bc75db423f2a2b4e2941535fc31deb0dd38f610c94f613ce4d00eafeadcc43c517fd5f475fc62392d00ba42b57f8b0abaad9d18289e4bf65fa1a7
+  data.tar.gz: 7d4388cdeefa5477402594681fad8fee169ca02dc6449edec60cd827f80e81d9aba53251202217c6e8c20feca8e0ab29b20b4703d04641259a9eddeb47fc3d1c

data/bin/bwa_mqtt_bridge

@@ -13,6 +13,7 @@ class MQTTBridge
     @mqtt.connect
     @bwa = bwa
     @attributes = {}
+    @things = Set.new
 
     publish_basic_attributes
 
@@ -22,11 +23,37 @@ class MQTTBridge
           message = @bwa.poll
           next if message.is_a?(BWA::Messages::Ready)
 
+          puts message.inspect unless message.is_a?(BWA::Messages::Status)
           case message
+          when BWA::Messages::ControlConfiguration
+            publish("spa/$type", message.model)
+          when BWA::Messages::ControlConfiguration2
+            message.pumps.each_with_index do |speed, i|
+              publish_pump(i + 1, speed) if speed != 0
+            end
+            message.lights.each_with_index do |exists, i|
+              publish_thing("light", i + 1) if exists
+            end
+            message.aux.each_with_index do |exists, i|
+              publish_thing("aux", i + 1) if exists
+            end
+            publish_mister if message.mister
+            publish_blower(message.blower) if message.blower != 0
+            publish_circpump if message.circ_pump
+            publish("$state", "ready")
           when BWA::Messages::Status
+            @bwa.request_control_info unless @bwa.last_control_configuration
+            @bwa.request_control_info2 unless @bwa.last_control_configuration2
+
             # make sure time is in sync
             now = Time.now
-            if message.hour != now.hour || message.minute != now.min
+            now_minutes = now.hour * 60 + now.min
+            spa_minutes = message.hour * 60 + message.minute
+            # check the difference in both directions
+            diff = [(spa_minutes - now_minutes) % 1440, 1440 - (spa_minutes - now_minutes) % 1440].min
+
+            # allow a skew of 1 minute, since the seconds will always be off
+            if diff > 1
               @bwa.set_time(now.hour, now.min, message.twenty_four_hour_time)
             end
             publish_attribute("spa/priming", message.priming)
@@ -35,10 +62,6 @@ class MQTTBridge
             publish_attribute("spa/24htime", message.twenty_four_hour_time)
             publish_attribute("spa/heating", message.heating)
             publish_attribute("spa/temperaturerange", message.temperature_range)
-            publish_attribute("spa/circpump", message.circ_pump)
-            publish_attribute("spa/pump1", message.pump1)
-            publish_attribute("spa/pump2", message.pump2)
-            publish_attribute("spa/light1", message.light1)
             publish_attribute("spa/currenttemperature", message.current_temperature)
             publish_attribute("spa/currenttemperature/$unit", "º#{message.temperature_scale.to_s[0].upcase}")
             publish_attribute("spa/settemperature", message.set_temperature)
@@ -50,6 +73,21 @@ class MQTTBridge
               publish_attribute("spa/currenttemperature/$format", message.temperature_range == :high ? "80:104" : "26:40")
               publish_attribute("spa/settemperature/$format", message.temperature_range == :high ? "80:104" : "26:40")
             end
+            publish_attribute("spa/filter1", message.filter[0])
+            publish_attribute("spa/filter2", message.filter[1])
+
+            publish_attribute("spa/circpump", message.circ_pump) if @bwa.last_control_configuration2&.circ_pump
+            publish_attribute("spa/blower", message.blower) if @bwa.last_control_configuration2&.blower.to_i != 0
+            publish_attribute("spa/mister", message.mister) if @bwa.last_control_configuration2&.mister
+            (0..5).each do |i|
+              publish_attribute("spa/pump#{i + 1}", message.pumps[i]) if @bwa.last_control_configuration2&.pumps&.[](i).to_i != 0
+            end
+            (0..1).each do |i|
+              publish_attribute("spa/light#{i + 1}", message.lights[i]) if @bwa.last_control_configuration2&.lights&.[](i)
+            end
+            (0..1).each do |i|
+              publish_attribute("spa/aux#{i + 1}", message.lights[i]) if @bwa.last_control_configuration2&.aux&.[](i)
+            end
           end
         end
       end
@@ -58,24 +96,35 @@ class MQTTBridge
     @mqtt.get do |topic, value|
       puts "got #{value.inspect} at #{topic}"
       case topic[@base_topic.length + 1..-1]
-      when "heatingmode"
-        next unless %w{ready rest ready_in_rest}.include?(value)
-        # @bwa.set_heating_mode(value.to_sym)
-      when "temperaturescale"
+      when "spa/heatingmode/set"
+        next @bwa.toggle_heating_mode if value == 'toggle'
+        next unless %w{ready rest}.include?(value)
+        @bwa.set_heating_mode(value.to_sym)
+      when "spa/temperaturescale/set"
         next unless %w{fahrenheit celsius}.include?(value)
-        # @bwa.set_temperature_scale(value.to_sym)
+        @bwa.set_temperature_scale(value.to_sym)
       when "spa/24htime/set"
         next unless %w{true false}.include?(value)
         now = Time.now
         @bwa.set_time(now.hour, now.min, value == 'true')
-      when "temperaturerange"
+      when "spa/temperaturerange/set"
+        next @bwa.toggle_temperature_range if value == 'toggle'
         next unless %w{low high}.include?(value)
-        # @bwa.set_temperature_range(value.to_sym)
-      when %r{^spa/(pump[12])/set}
-        @bwa.send(:"set_#{$1}", value.to_i)
-      when "spa/light1/set"
+        @bwa.set_temperature_range(value.to_sym)
+      when %r{^spa/pump([1-6])/set$}
+        next @bwa.toggle_pump($1.to_i) if value == 'toggle'
+        @bwa.set_pump($1.to_i, value.to_i)
+      when %r{^spa/(light|aux)([12])/set$}
+        next @bwa.send(:"toggle_#{$1}", $2.to_i) if value == 'toggle'
         next unless %w{true false}.include?(value)
-        @bwa.set_light1(value == 'true')
+        @bwa.send(:"set_#{$1}", $2.to_i, value == 'true')
+      when "spa/mister/set"
+        next @bwa.toggle_mister if value == 'toggle'
+        next unless %w{true false}.include?(value)
+        @bwa.set_mister(value == 'true')
+      when "spa/blower/set"
+        next @bwa.toggle_blower if value == 'toggle'
+        @bwa.set_blower(value.to_i)
       when "spa/settemperature/set"
         @bwa.set_temperature(value.to_i)
       end
@@ -105,7 +154,7 @@ class MQTTBridge
 
     publish("spa/$name", "BWA Spa")
     publish("spa/$type", "spa")
-    publish("spa/$properties", "priming,heatingmode,temperaturescale,24htime,heating,temperaturerange,circpump,pump1,pump2,light1,currenttemperature,settemperature")
+    publish_nodes
 
     publish("spa/priming/$name", "Is the pump priming")
     publish("spa/priming/$datatype", "boolean")
@@ -136,26 +185,6 @@ class MQTTBridge
     publish("spa/temperaturerange/$settable", "true")
     subscribe("spa/temperaturerange/set")
 
-    publish("spa/circpump/$name", "Circ pump is currently running")
-    publish("spa/circpump/$datatype", "boolean")
-
-    publish("spa/pump1/$name", "Pump 1 speed")
-    publish("spa/pump1/$datatype", "integer")
-    publish("spa/pump1/$format", "0:2")
-    publish("spa/pump1/$settable", "true")
-    subscribe("spa/pump1/set")
-
-    publish("spa/pump2/$name", "Pump 2 speed")
-    publish("spa/pump2/$datatype", "integer")
-    publish("spa/pump2/$format", "0:2")
-    publish("spa/pump2/$settable", "true")
-    subscribe("spa/pump2/set")
-
-    publish("spa/light1/$name", "Light 1")
-    publish("spa/light1/$datatype", "boolean")
-    publish("spa/light1/$settable", "true")
-    subscribe("spa/light1/set")
-
     publish("spa/currenttemperature/$name", "Current temperature")
     publish("spa/currenttemperature/$datatype", "integer")
 
@@ -164,7 +193,65 @@ class MQTTBridge
     publish("spa/settemperature/$settable", "true")
     subscribe("spa/settemperature/set")
 
-    publish("$state", "ready")
+    publish("spa/filter1/$name", "Filter cycle 1 is currently running")
+    publish("spa/filter1/$datatype", "boolean")
+
+    publish("spa/filter2/$name", "Filter cycle 2 is currently running")
+    publish("spa/filter2/$datatype", "boolean")
+  end
+
+  def publish_pump(i, speeds)
+    publish("spa/pump#{i}/$name", "Pump #{i} speed")
+    publish("spa/pump#{i}/$datatype", "integer")
+    publish("spa/pump#{i}/$format", "0:#{speeds}")
+    publish("spa/pump#{i}/$settable", "true")
+    subscribe("spa/pump#{i}/set")
+
+    @things << "pump#{i}"
+    publish_nodes
+  end
+
+  def publish_thing(type, i)
+    publish("spa/#{type}#{i}/$name", "#{type} #{i}")
+    publish("spa/#{type}#{i}/$datatype", "boolean")
+    publish("spa/#{type}#{i}/$settable", "true")
+    subscribe("spa/#{type}#{i}/set")
+
+    @things << "#{type}#{i}"
+    publish_nodes
+  end
+
+  def publish_mister
+    publish("spa/mister/$name", type)
+    publish("spa/mister/$datatype", "boolean")
+    publish("spa/mister/$settable", "true")
+    subscribe("spa/mister/set")
+
+    @things << "mister"
+    publish_nodes
+  end
+
+  def publish_blower(speeds)
+    publish("spa/blower/$name", "Blower speed")
+    publish("spa/blower/$datatype", "integer")
+    publish("spa/blower/$format", "0:#{speeds}")
+    publish("spa/blower/$settable", "true")
+    subscribe("spa/blower/set")
+
+    @things << "blower"
+    publish_nodes
+  end
+
+  def publish_circpump
+    publish("spa/circpump/$name", "Circ pump is currently running")
+    publish("spa/circpump/$datatype", "boolean")
+    @things << "circpump"
+
+    publish_nodes
+  end
+
+  def publish_nodes
+    publish("spa/$properties", (["priming,heatingmode,temperaturescale,24htime,heating,temperaturerange,currenttemperature,settemperature,filter1,filter2"] + @things.to_a).join(','))
   end
 end
 
@@ -176,7 +263,7 @@ if ARGV.empty?
     $stderr.puts "Could not find spa!"
     exit 1
   end
-  spa_ip = spas.first.first
+  spa_ip = "tcp://#{spas.first.first}/"
 else
   spa_ip = ARGV[0]
 end

data/lib/bwa/client.rb

@@ -2,36 +2,52 @@ require 'bwa/message'
 
 module BWA
   class Client
-    attr_reader :last_status, :last_filter_configuration
+    attr_reader :last_status, :last_control_configuration, :last_control_configuration2, :last_filter_configuration
 
-    def initialize(host, port = 4257)
-      if host =~ %r{^/dev}
-        require 'serialport'
-        @io = SerialPort.open(host, "baud" => 115200)
+    def initialize(uri)
+      uri = URI.parse(uri)
+      if uri.scheme == 'tcp'
+        require 'socket'
+        @io = TCPSocket.new(uri.host, uri.port || 4217)
+      elsif uri.scheme == 'telnet' || uri.scheme == 'rfc2217'
+        require 'net/telnet/rfc2217'
+        @io = Net::Telnet::RFC2217.new("Host" => uri.host, "Port" => uri.port || 23, "baud" => 115200)
         @queue = []
       else
-        require 'socket'
-        @io = TCPSocket.new(host, port)
+        require 'ccutrer-serialport'
+        @io = CCutrer::SerialPort.new(uri.path, baud: 115200)
+        @queue = []
       end
+      @buffer = ""
     end
 
     def poll
-      message = nil
-      while message.nil?
-        begin
-          message = Message.parse(@io)
-          if message.is_a?(Messages::Ready) && (msg = @queue.shift)
-            @io.write(msg)
-          end
-        rescue BWA::InvalidMessage => e
-          unless e.message =~ /Incorrect data length/
-            puts e.message
-            puts e.raw_data.unpack("H*").first.scan(/[0-9a-f]{2}/).join(' ')
+      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
+        method = @io.respond_to?(:readpartial) ? :readpartial : :read
+        unless message
+          begin
+            @buffer.concat(@io.__send__(method, 64 * 1024))
+          rescue EOFError
+            @io.wait_readable
+            retry
           end
+          next
         end
+        break
+      end
+
+      if message.is_a?(Messages::Ready) && (msg = @queue&.shift)
+        puts "wrote #{msg.unpack('H*').first}"
+        @io.write(msg)
       end
       @last_status = message.dup if message.is_a?(Messages::Status)
       @last_filter_configuration = message.dup if message.is_a?(Messages::FilterCycles)
+      @last_control_configuration = message.dup if message.is_a?(Messages::ControlConfiguration)
+      @last_control_configuration2 = message.dup if message.is_a?(Messages::ControlConfiguration2)
       message
     end
 
@@ -59,6 +75,10 @@ module BWA
       send_message("\x0a\xbf\x04")
     end
 
+    def request_control_info2
+      send_message("\x0a\xbf\x22\x00\x00\x01")
+    end
+
     def request_control_info
       send_message("\x0a\xbf\x22\x02\x00\x00")
     end
@@ -67,39 +87,58 @@ module BWA
       send_message("\x0a\xbf\x22\x01\x00\x00")
     end
 
-    def toggle_item(args)
-      send_message("\x0a\xbf\x11#{args}")
+    def toggle_item(item)
+      send_message("\x0a\xbf\x11#{item.chr}\x00")
     end
 
-    def toggle_light1
-      toggle_item("\x11\x00")
+    def toggle_pump(i)
+      toggle_item(i + 3)
     end
 
-    def toggle_pump1
-      toggle_item("\x04\x00")
+    def toggle_light(i)
+      toggle_item(i + 0x10)
     end
 
-    def toggle_pump2
-      toggle_item("\x05\x00")
+    def toggle_mister
+      toggle_item(0x0e)
     end
 
-    (1..2).each do |i|
+    def toggle_blower
+      toggle_item(0x0c)
+    end
+
+    def set_pump(i, desired)
+      return unless last_status && last_control_configuration2
+      times = (desired - last_status.pumps[i - 1]) % (last_control_configuration2.pumps[i - 1] + 1)
+      times.times do
+        toggle_pump(i)
+        sleep(0.1)
+      end
+    end
+
+    %w{light aux}.each do |type|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      def set_pump#{i}(desired)
-        return unless last_status
-        times = (desired - last_status.pump#{i}) % 3
-        times.times do
-          toggle_pump#{i}
-          sleep(0.1)
+        def set_#{type}(i, desired)
+          return unless last_status
+          return if last_status.#{type}s[i - 1] == desired
+          toggle_#{type}(i)
         end
-      end
       RUBY
     end
 
-    def set_light1(desired)
+    def set_mister(desired)
       return unless last_status
-      return if last_status.light1 == desired
-      toggle_light1
+      return if last_status.mister == desired
+      toggle_mister
+    end
+
+    def set_blower(desired)
+      return unless last_status && last_control_configuration2
+      times = (desired - last_status.blower) % (last_control_configuration2.blower + 1)
+      times.times do
+        toggle_blower
+        sleep(0.1)
+      end
     end
 
     # high range is 80-104 for F, 26-40 for C (by 0.5)
@@ -113,5 +152,41 @@ module BWA
       hour |= 0x80 if twenty_four_hour_time
       send_message("\x0a\xbf\x21".force_encoding(Encoding::ASCII_8BIT) + hour.chr + minute.chr)
     end
+
+    def set_temperature_scale(scale)
+      raise ArgumentError, "scale must be :fahrenheit or :celsius" unless %I{fahrenheit :celsius}.include?(scale)
+      arg = scale == :fahrenheit ? 0 : 1
+      send_message("\x0a\xbf\x27\x01".force_encoding(Encoding::ASCII_8BIT) + arg.chr)
+    end
+
+    def toggle_temperature_range
+      toggle_item(0x50)
+    end
+
+    def set_temperature_range(desired)
+      return unless last_status
+      return if last_status.temperature_range == desired
+      toggle_temperature_range
+    end
+
+    def toggle_heating_mode
+      toggle_item(0x51)
+    end
+
+    HEATING_MODES = %I{ready rest ready_in_rest}.freeze
+    def set_heating_mode(desired)
+      raise ArgumentError, "heating_mode must be :ready or :rest" unless %I{ready rest}.include?(desired)
+      return unless last_status
+      times = if last_status.heating_mode == :ready && desired == :rest ||
+                 last_status.heating_mode == :rest && desired == :ready ||
+                 last_status.heating_mode == :ready_in_rest && desired == :rest
+          1
+        elsif last_status.heating_mode == :ready_in_rest && desired == :ready
+          2
+        else
+          0
+        end
+      times.times { toggle_heating_mode }
+    end
   end
 end

data/lib/bwa/message.rb

@@ -11,65 +11,66 @@ module BWA
   end
 
   class Message
+    class Unrecognized < Message
+    end
+
     class << self
       def inherited(klass)
         @messages ||= []
         @messages << klass
       end
 
-      def parse(io)
-        io = StringIO.new(io) if io.is_a?(String)
-        data = ''
-        # skim through until a start-of-message indicator
-        until data[0] == '~'
-          data = io.read(1)
-        end
+      def parse(data)
+        offset = -1
+        message_type = length = message_class = nil
+        loop do
+          offset += 1
+          return nil if data.length - offset < 5
 
-        data.concat(io.read(1))
-        length = data[-1].ord
+          next unless data[offset] == '~'
+          length = data[offset + 1].ord
+          # impossible message
+          next if length < 5
 
-        if length < 5
-          bytes = data.bytes
-          bytes.shift
-          bytes.reverse.each { |byte| io.ungetbyte(byte) }
-          raise InvalidMessage.new("Message has bogus length: #{length}", data)
-        end
+          # 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
 
-        data.concat(io.read(length))
-        if data.length != length + 2
-          data.bytes.reverse.each { |b| io.ungetbyte(b) }
-          raise InvalidMessage.new("Incorrect data length (received #{data.length - 2}, expected #{length})", data)
+          next unless data[offset + length + 1] == '~'
+
+          next unless CRC.checksum(data.slice(offset + 1, length - 1)) == data[offset + length].ord
+          break
         end
 
-        message_type = data[2..4]
-        klass = @messages.find { |k| k::MESSAGE_TYPE == message_type }
+        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}"
 
-        unless data[-1] == '~'
-          bytes = data.bytes
-          bytes.shift
-          bytes.reverse.each { |b| io.ungetbyte(b) }
-          raise InvalidMessage.new("Missing trailing message indicator", data)
-        end
+        src = data[offset + 2].ord
+        message_type = data.slice(offset + 3, 2)
+        klass = @messages.find { |k| k::MESSAGE_TYPE == message_type }
 
-        unless CRC.checksum(data[1...-2]) == data[-2].ord
-          bytes = data.bytes
-          bytes.shift
-          bytes.reverse.each { |b| io.ungetbyte(b) }
-          raise InvalidMessage.new("Invalid checksum", data)
-        end
 
-        return nil 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)
+        return [nil, offset + length + 2] if [
+                      "\xbf\x00".force_encoding(Encoding::ASCII_8BIT),
+                      "\xbf\xe1".force_encoding(Encoding::ASCII_8BIT),
+                      "\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
+        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[5..-2])
-        message.instance_variable_set(:@raw_data, data)
-        message
+        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
 
       def format_time(hour, minute, twenty_four_hour_time = true)
@@ -88,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,17 +1,75 @@
 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
+
+      def initialize
+        @model = ''
+        @version = 0
+      end
+
+      def parse(data)
+        self.version = "V#{data[2].ord}.#{data[3].ord}"
+        self.model = data[4..11].strip
+      end
+
+      def inspect
+        "#<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
+
+      def initialize
+        self.pumps = Array.new(6, 0)
+        self.lights = Array.new(2, false)
+        self.circ_pump = false
+        self.blower = 0
+        self.mister = false
+        self.aux = Array.new(2, false)
+      end
+
+      def parse(data)
+        flags = data[0].ord
+        pumps[0] = flags & 0x03
+        pumps[1] = (flags >> 2) & 0x03
+        pumps[2] = (flags >> 4) & 0x03
+        pumps[3] = (flags >> 6) & 0x03
+        flags = data[1].ord
+        pumps[4] = flags & 0x03
+        pumps[5] = (flags >> 6) & 0x03
+        flags = data[2].ord
+        lights[0] = (flags & 0x03 != 0)
+        lights[1] = ((flags >> 6) & 0x03 != 0)
+        flags = data[3].ord
+        self.blower = flags & 0x03
+        self.circ_pump = ((flags >> 6) & 0x03 != 0)
+        flags = data[4].ord
+        self.mister = (flags & 0x30 != 0)
+        aux[0] = (flags & 0x01 != 0)
+        aux[1] = (flags & 0x02 != 0)
+      end
+
+      def inspect
+        result = "#<BWA::Messages::ControlConfiguration2 "
+        items = []
+
+        items << "pumps=#{pumps.inspect}"
+        items << "lights=#{lights.inspect}"
+        items << "circ_pump" if circ_pump
+        items << "blower=#{blower}" if blower != 0
+        items << "mister" if mister
+        items << "aux=#{aux.inspect}"
+
+        result << items.join(' ') << ">"
+      end
     end
   end
 end

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

@@ -5,28 +5,37 @@ module BWA
                     :heating_mode,
                     :temperature_scale,
                     :twenty_four_hour_time,
+                    :filter,
                     :heating,
                     :temperature_range,
                     :hour, :minute,
                     :circ_pump,
-                    :pump1, :pump2,
-                    :light1,
+                    :blower,
+                    :pumps,
+                    :lights,
+                    :mister,
+                    :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
         self.twenty_four_hour_time = false
+        self.filter = Array.new(2, false)
         self.heating = false
         self.temperature_range = :high
         self.hour = self.minute = 0
         self.circ_pump = false
-        self.pump1 = self.pump2 = 0
-        self.light1 = false
+        self.pumps = Array.new(6, 0)
+        self.lights = Array.new(2, false)
+        self.mister = false
+        self.aux = Array.new(2, false)
         self.set_temperature = 100
       end
 
@@ -42,16 +51,30 @@ module BWA
         flags = data[9].ord
         self.temperature_scale = (flags & 0x01 == 0x01) ? :celsius : :fahrenheit
         self.twenty_four_hour_time = (flags & 0x02 == 0x02)
+        filter[0] = (flags & 0x04 != 0)
+        filter[1] = (flags & 0x08 != 0)
         flags = data[10].ord
         self.heating = (flags & 0x30 != 0)
         self.temperature_range = (flags & 0x04 == 0x04) ? :high : :low
         flags = data[11].ord
-        self.pump1 = flags & 0x03
-        self.pump2 = (flags / 4) & 0x03
+        pumps[0] = flags & 0x03
+        pumps[1] = (flags >> 2) & 0x03
+        pumps[2] = (flags >> 4) & 0x03
+        pumps[3] = (flags >> 6) & 0x03
+        flags = data[12].ord
+        pumps[4] = flags & 0x03
+        pumps[5] = (flags >> 2) & 0x03
+
         flags = data[13].ord
         self.circ_pump = (flags & 0x02 == 0x02)
+        self.blower = (flags & 0x0C == 0x0C)
         flags = data[14].ord
-        self.light1 = (flags & 0x03 == 0x03)
+        lights[0] = (flags & 0x03 != 0)
+        lights[1] = ((flags >> 2) & 0x03 != 0)
+        flags = data[15].ord
+        self.mister = (flags & 0x01 == 0x01)
+        aux[0] = (flags & 0x08 != 0)
+        aux[1] = (flags & 0x10 != 0)
         self.hour = data[3].ord
         self.minute = data[4].ord
         self.current_temperature = data[2].ord
@@ -134,16 +157,19 @@ module BWA
         items << "priming" if priming
         items << self.class.format_time(hour, minute, twenty_four_hour_time)
         items << "#{current_temperature || '--'}/#{set_temperature}º#{temperature_scale.to_s[0].upcase}"
+        items << "filter=#{filter.inspect}"
         items << heating_mode
         items << "heating" if heating
         items << temperature_range
         items << "circ_pump" if circ_pump
-        items << "pump1=#{pump1}" unless pump1 == 0
-        items << "pump2=#{pump2}" unless pump2 == 0
-        items << "light1" if light1
+        items << "blower" if blower
+        items << "pumps=#{pumps.inspect}"
+        items << "lights=#{lights.inspect}"
+        items << "aux=#{aux.inspect}"
+        items << "mister" if mister
 
         result << items.join(' ') << ">"
       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.0.0'
-end
+  VERSION = '1.2.1'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc
@@ -25,33 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: mqtt
+  name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: ccutrer-serialport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: cody@cutrer.com'
 executables:
 - bwa_mqtt_bridge
@@ -114,7 +128,7 @@ homepage: https://github.com/ccutrer/bwa
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Library for communication with Balboa Water Group's WiFi module or RS-485
 test_files: []