balboa_worldwide_app 1.1.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a309cfe60e168cb56a8a95ebdc80c6107428f4a700fc279889f6e27443a6c6f3
-  data.tar.gz: 9fcb57e4ea84ea69936eac347256df08af2bb0550efba9933487f7234160b8a7
+  metadata.gz: 6b84555384635c30873c0b10743bd87990e7fc3b6a85fc05f21ce3759d59ddbe
+  data.tar.gz: ef7e20ab1436da76d5024a9a5641e8301795246ee8afcfbfa3a6535f787f2ddb
 SHA512:
-  metadata.gz: 97e1def1e19e8beb851d8a2db516720d3732fc05d36d8ac61b1f2c77c1c62db2b9b5f9aebf9516a2a881ba15f29c0740d94cd7dedcae9d207ca31717e562587c
-  data.tar.gz: 236c323cc0fe8e108eb4099ae19a86f9389f5a5b6aa92d0bb89f77ff5f244cbcf9130c6d24631e460ac445fe604e1ac86f470499e886ac29f5b8dd21e1dd58d2
+  metadata.gz: 5cfe6592a743e415736015aadac86d71c6ba30d0fb1c562d4797103677daf725a2cfce22fd52c955d73c942bec9ea990f67a452a11244f1754a667ab9eed7c55
+  data.tar.gz: 00117540563ef4eebb1b577ab4f24a6414d7595b2312f220e84ae391715d472a333f5e92da150e0dce18bf9ae265c06d153f59da6dfe5abe834c3ee5648cebee

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 = ""
@@ -27,9 +27,10 @@ module BWA
         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.readpartial(64 * 1024))
+            @buffer.concat(@io.__send__(method, 64 * 1024))
           rescue EOFError
             @io.wait_readable
             retry
@@ -144,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

@@ -56,7 +56,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/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_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

@@ -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.1'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 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