RubyGems - sappho-heatmiser-proxy - Versions diffs - 0.1.2 → 0.1.3 - Mend

sappho-heatmiser-proxy 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/bin/sappho-heatmiser-proxy +12 -12
data/lib/sappho-heatmiser-proxy/command_queue.rb +60 -60
data/lib/sappho-heatmiser-proxy/heatmiser.rb +92 -96
data/lib/sappho-heatmiser-proxy/heatmiser_client.rb +78 -78
data/lib/sappho-heatmiser-proxy/heatmiser_crc.rb +48 -48
data/lib/sappho-heatmiser-proxy/heatmiser_status.rb +136 -131
data/lib/sappho-heatmiser-proxy/system_configuration.rb +34 -48
data/lib/sappho-heatmiser-proxy/version.rb +18 -18
data/lib/sappho-heatmiser-proxy.rb +35 -44
metadata +10 -59
data/lib/sappho-heatmiser-proxy/model/heatmiser_log.rb +0 -29

data/bin/sappho-heatmiser-proxy CHANGED Viewed

@@ -1,12 +1,12 @@
-#!/usr/bin/env ruby
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-$: << File.expand_path('../lib', __FILE__)
-require 'sappho-heatmiser-proxy'
-Sappho::Heatmiser::Proxy::CommandLine.process
+#!/usr/bin/env ruby
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+require 'sappho-heatmiser-proxy'
+Sappho::Heatmiser::Proxy::CommandLine.process

data/lib/sappho-heatmiser-proxy/command_queue.rb CHANGED Viewed

@@ -1,60 +1,60 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'singleton'
-      require 'thread'
-      require 'sappho-basics/auto_flush_log'
-      class CommandQueue
-        include Singleton, Sappho::LogUtilities
-        def initialize
-          @queue = []
-          @mutex = Mutex.new
-          @log = Sappho::ApplicationAutoFlushLog.instance
-        end
-        def push clientIP, command
-          @log.info "client #{clientIP} requests command: #{hexString command}"
-          @mutex.synchronize do
-            @queue << {
-                :clientIP => clientIP,
-                :command => command.dup
-            }
-          end
-        end
-        def get
-          command = nil
-          @mutex.synchronize do
-            if @queue.size > 0
-              queue = @queue[0]
-              command = queue[:command].dup
-              @log.info "client #{queue[:clientIP]} command executing: #{hexString command}"
-            end
-          end
-          command
-        end
-        def completed
-          @mutex.synchronize do
-            if @queue.size > 0
-              queue = @queue[0]
-              @log.info "client #{queue[:clientIP]} command completed: #{hexString queue[:command]}"
-              @queue.shift
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'singleton'
+      require 'thread'
+      require 'sappho-basics/auto_flush_log'
+      class CommandQueue
+        include Singleton, Sappho::LogUtilities
+        def initialize
+          @queue = []
+          @mutex = Mutex.new
+          @log = Sappho::ApplicationAutoFlushLog.instance
+        end
+        def push clientIP, command
+          @log.info "client #{clientIP} requests command: #{hexString command}"
+          @mutex.synchronize do
+            @queue << {
+                :clientIP => clientIP,
+                :command => command.dup
+            }
+          end
+        end
+        def get
+          command = nil
+          @mutex.synchronize do
+            if @queue.size > 0
+              queue = @queue[0]
+              command = queue[:command].dup
+              @log.info "client #{queue[:clientIP]} command executing: #{hexString command}"
+            end
+          end
+          command
+        end
+        def completed
+          @mutex.synchronize do
+            if @queue.size > 0
+              queue = @queue[0]
+              @log.info "client #{queue[:clientIP]} command completed: #{hexString queue[:command]}"
+              @queue.shift
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/heatmiser.rb CHANGED Viewed

@@ -1,96 +1,92 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'sappho-heatmiser-proxy/heatmiser_crc'
-      require 'sappho-heatmiser-proxy/heatmiser_status'
-      require 'sappho-basics/auto_flush_log'
-      require 'sappho-heatmiser-proxy/command_queue'
-      require 'sappho-heatmiser-proxy/system_configuration'
-      require 'sappho-heatmiser-proxy/model/heatmiser_log'
-      require 'sappho-socket/safe_socket'
-      class Heatmiser
-        include Sappho::LogUtilities
-        def monitor
-          status = HeatmiserStatus.instance
-          queue = CommandQueue.instance
-          log = Sappho::ApplicationAutoFlushLog.instance
-          config = SystemConfiguration.instance
-          desc = "heatmiser #{config.heatmiserId} at #{config.heatmiserHostname}:#{config.heatmiserPort}"
-          log.info "connecting to #{desc}"
-          queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, config.pinLo, config.pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
-          socket = Sappho::Socket::SafeSocket.new 5
-          loop do
-            begin
-              command = queryCommand
-              if queuedCommand = queue.get
-                command = queuedCommand
-              else
-                if status.get{status.valid ? status.deviceTimeOffset : 0.0}.abs > 5 and config.heatmiserHardware
-                  timeNow = Time.now
-                  dayOfWeek = timeNow.wday
-                  dayOfWeek = 7 if dayOfWeek == 0
-                  command = HeatmiserCRC.new([0xA3, 0x12, 0x00, config.pinLo, config.pinHi, 0x01, 0x2B, 0x00, 0x07,
-                                             timeNow.year - 2000,
-                                             timeNow.month,
-                                             timeNow.day,
-                                             dayOfWeek,
-                                             timeNow.hour,
-                                             timeNow.min,
-                                             timeNow.sec]).appendCRC
-                  log.info "clock correction: #{hexString command}"
-                end
-              end
-              log.debug "sending command: #{hexString command}" if log.debug?
-              socket.open config.heatmiserHostname, config.heatmiserPort
-              socket.settle 0.1
-              startTime = Time.now
-              socket.write command.pack('c*')
-              reply = socket.read(81).unpack('c*')
-              timestamp = Time.now
-              log.debug "reply: #{hexString reply}" if log.debug?
-              crcHi = reply.pop & 0xFF
-              crcLo = reply.pop & 0xFF
-              crc = HeatmiserCRC.new reply
-              if (reply[0] & 0xFF) == 0x94 and reply[1] == 0x51 and reply[2] == 0 and
-                  crc.crcHi == crcHi and crc.crcLo == crcLo
-                reply << crcLo << crcHi
-                status.set reply, timestamp, (timestamp - startTime)
-                queue.completed if queuedCommand
-                Sappho::Heatmiser::Model::HeatmiserLog.new(status.get{{
-                  :deviceId => config.heatmiserId,
-                  :timestamp => timestamp,
-                  :sensedTemperature => status.sensedTemperature,
-                  :requestedTemperature => status.requestedTemperature,
-                  :heatOn => status.heatOn,
-                  :frostProtectOn => status.frostProtectOn,
-                  :deviceTimeOffset => status.deviceTimeOffset}}).save if config.mongoLogging
-              else
-                log.info "#{desc} responded with invalid bytes - ignoring it this time"
-              end
-            rescue Timeout::Error
-              status.invalidate
-              log.info "#{desc} is not responding - the connection might be down"
-            rescue => error
-              status.invalidate
-              log.error error
-            end
-            socket.settle 0.1
-            socket.close
-            socket.settle 2
-          end
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'sappho-heatmiser-proxy/heatmiser_crc'
+      require 'sappho-heatmiser-proxy/heatmiser_status'
+      require 'sappho-basics/auto_flush_log'
+      require 'sappho-heatmiser-proxy/command_queue'
+      require 'sappho-heatmiser-proxy/system_configuration'
+      require 'sappho-socket/safe_socket'
+      class Heatmiser
+        include Sappho::LogUtilities
+        def monitor
+          status = HeatmiserStatus.instance
+          queue = CommandQueue.instance
+          log = Sappho::ApplicationAutoFlushLog.instance
+          config = SystemConfiguration.instance
+          desc = "heatmiser at #{config.heatmiserHostname}:#{config.heatmiserPort}"
+          queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, config.pinLo, config.pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
+          socket = Sappho::Socket::SafeSocket.new 5
+          timestamp = Time.now - config.sampleDelay
+          loop do
+            begin
+              command = nil
+              if queuedCommand = queue.get
+                command = queuedCommand
+              else
+                if status.get{status.valid ? status.deviceTimeOffset : 0.0}.abs > 150
+                  timeNow = Time.now
+                  dayOfWeek = timeNow.wday
+                  dayOfWeek = 7 if dayOfWeek == 0
+                  command = HeatmiserCRC.new([0xA3, 0x12, 0x00, config.pinLo, config.pinHi, 0x01, 0x2B, 0x00, 0x07,
+                                             timeNow.year - 2000,
+                                             timeNow.month,
+                                             timeNow.day,
+                                             dayOfWeek,
+                                             timeNow.hour,
+                                             timeNow.min,
+                                             timeNow.sec]).appendCRC
+                  log.info "clock correction: #{hexString command}"
+                end
+              end
+              unless command
+                command = queryCommand if (Time.now - timestamp) >= config.sampleDelay
+              end
+              if command
+                log.debug "sending command: #{hexString command}" if log.debug?
+                socket.close #  just in case it wasn't last time around
+                socket.open config.heatmiserHostname, config.heatmiserPort
+                socket.settle 0.1
+                startTime = Time.now
+                socket.write command.pack('c*')
+                reply = socket.read(81).unpack('c*')
+                timestamp = Time.now
+                socket.settle 0.1
+                socket.close
+                log.debug "reply: #{hexString reply}" if log.debug?
+                crcHi = reply.pop & 0xFF
+                crcLo = reply.pop & 0xFF
+                crc = HeatmiserCRC.new reply
+                if (reply[0] & 0xFF) == 0x94 and reply[1] == 0x51 and reply[2] == 0 and
+                    crc.crcHi == crcHi and crc.crcLo == crcLo
+                  reply << crcLo << crcHi
+                  status.set reply, timestamp, (timestamp - startTime) do
+                    queue.completed if queuedCommand
+                  end
+                end
+              end
+            rescue Timeout::Error
+              status.invalidate
+              log.info "#{desc} is not responding - assuming connection down"
+            rescue => error
+              status.invalidate
+              log.error error
+            end
+            socket.settle 2
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/heatmiser_client.rb CHANGED Viewed

@@ -1,78 +1,78 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'sappho-basics/auto_flush_log'
-      require 'sappho-heatmiser-proxy/heatmiser_status'
-      require 'sappho-heatmiser-proxy/command_queue'
-      require 'sappho-heatmiser-proxy/system_configuration'
-      class HeatmiserClient
-        include Sappho::LogUtilities
-        def initialize client, ip
-          @ip = ip
-          @client = client
-          @status = HeatmiserStatus.instance
-          @log = Sappho::ApplicationAutoFlushLog.instance
-        end
-        def communicate
-          config = SystemConfiguration.instance
-          active = true
-          while active do
-            begin
-              command = read 5
-              if command == 'check'
-                reply = @status.get {
-                  @status.timeSinceLastValid > 60 ?
-                      'error: no response from heatmiser unit in last minute' :
-                      @status.valid ? 'ok' : 'error: last response from heatmiser unit was invalid'
-                }
-                @log.info "client #{@ip} checking status - reply: #{reply}"
-                @client.write "#{reply}\r\n"
-                active = false
-              else
-                command = command.unpack('c*')
-                @log.debug "header: #{hexString command}" if @log.debug?
-                raise ClientDataError, "invalid pin" unless (command[3] & 0xFF) == config.pinLo and (command[4] & 0xFF) == config.pinHi
-                packetSize = (command[1] & 0xFF) | ((command[2] << 8) & 0xFF00)
-                raise ClientDataError, "invalid packet size" if packetSize < 7 or packetSize > 128
-                command += read(packetSize - 5).unpack('c*')
-                CommandQueue.instance.push @ip, command unless (command[0] & 0xFF) == 0x93
-                @status.get { @client.write @status.raw.pack('c*') if @status.valid }
-                @log.info "command received from client #{@ip} so it is alive"
-              end
-            rescue Timeout::Error
-              @log.info "timeout on client #{@ip} so presuming it dormant"
-              active = false
-            rescue ClientDataError => error
-              @log.info "data error from client #{@ip}: #{error.message}"
-              active = false
-            rescue => error
-              @log.error error
-              active = false
-            end
-          end
-        end
-        def read size
-          data = @client.read size
-          raise ClientDataError, "nothing received so presuming it has disconnected" unless data and data.size == size
-          data
-        end
-        class ClientDataError < Interrupt
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'sappho-basics/auto_flush_log'
+      require 'sappho-heatmiser-proxy/heatmiser_status'
+      require 'sappho-heatmiser-proxy/command_queue'
+      require 'sappho-heatmiser-proxy/system_configuration'
+      class HeatmiserClient
+        include Sappho::LogUtilities
+        def initialize client, ip
+          @ip = ip
+          @client = client
+          @status = HeatmiserStatus.instance
+          @log = Sappho::ApplicationAutoFlushLog.instance
+        end
+        def communicate
+          config = SystemConfiguration.instance
+          active = true
+          while active do
+            begin
+              command = read 5
+              if command == 'check'
+                reply = @status.get {
+                  @status.timeSinceLastValid > 60 ?
+                      'error: no response from heatmiser unit in last minute' :
+                      @status.valid ? 'ok' : 'error: last response from heatmiser unit was invalid'
+                }
+                @log.info "client #{@ip} checking status - reply: #{reply}"
+                @client.write "#{reply}\r\n"
+                active = false
+              else
+                command = command.unpack('c*')
+                @log.debug "header: #{hexString command}" if @log.debug?
+                raise ClientDataError, "invalid pin" unless (command[3] & 0xFF) == config.pinLo and (command[4] & 0xFF) == config.pinHi
+                packetSize = (command[1] & 0xFF) | ((command[2] << 8) & 0xFF00)
+                raise ClientDataError, "invalid packet size" if packetSize < 7 or packetSize > 128
+                command += read(packetSize - 5).unpack('c*')
+                CommandQueue.instance.push @ip, command unless (command[0] & 0xFF) == 0x93
+                @status.get { @client.write @status.raw.pack('c*') if @status.valid }
+                @log.info "command received from client #{@ip} so it is alive"
+              end
+            rescue Timeout::Error
+              @log.info "timeout on client #{@ip} so presuming it dormant"
+              active = false
+            rescue ClientDataError => error
+              @log.info "data error from client #{@ip}: #{error.message}"
+              active = false
+            rescue => error
+              @log.error error
+              active = false
+            end
+          end
+        end
+        def read size
+          data = @client.read size
+          raise ClientDataError, "nothing received so presuming it has disconnected" unless data and data.size == size
+          data
+        end
+        class ClientDataError < Interrupt
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/heatmiser_crc.rb CHANGED Viewed

@@ -1,48 +1,48 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      class HeatmiserCRC
-        LookupHi = [
-            0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-            0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1
-        ]
-        LookupLo = [
-            0x00, 0x21, 0x42, 0x63, 0x84, 0xA5, 0xC6, 0xE7,
-            0x08, 0x29, 0x4A, 0x6B, 0x8C, 0xAD, 0xCE, 0xEF
-        ]
-        attr_reader :crcHi, :crcLo
-        def initialize bytes
-          @bytes = bytes
-          @crcHi = 0xFF
-          @crcLo = 0xFF
-          bytes.each do |byte|
-            addNibble byte >> 4
-            addNibble byte & 0x0F
-          end
-        end
-        def appendCRC
-          @bytes << @crcLo << @crcHi
-        end
-        private
-        def addNibble nibble
-          t = ((@crcHi >> 4) ^ nibble) & 0x0F
-          @crcHi = (((@crcHi << 4) & 0xFF) | (@crcLo >> 4)) ^ LookupHi[t]
-          @crcLo = ((@crcLo << 4) & 0xFF) ^ LookupLo[t]
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      class HeatmiserCRC
+        LookupHi = [
+            0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+            0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1
+        ]
+        LookupLo = [
+            0x00, 0x21, 0x42, 0x63, 0x84, 0xA5, 0xC6, 0xE7,
+            0x08, 0x29, 0x4A, 0x6B, 0x8C, 0xAD, 0xCE, 0xEF
+        ]
+        attr_reader :crcHi, :crcLo
+        def initialize bytes
+          @bytes = bytes
+          @crcHi = 0xFF
+          @crcLo = 0xFF
+          bytes.each do |byte|
+            addNibble byte >> 4
+            addNibble byte & 0x0F
+          end
+        end
+        def appendCRC
+          @bytes << @crcLo << @crcHi
+        end
+        private
+        def addNibble nibble
+          t = ((@crcHi >> 4) ^ nibble) & 0x0F
+          @crcHi = (((@crcHi << 4) & 0xFF) | (@crcLo >> 4)) ^ LookupHi[t]
+          @crcLo = ((@crcLo << 4) & 0xFF) ^ LookupLo[t]
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/heatmiser_status.rb CHANGED Viewed

@@ -1,131 +1,136 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'singleton'
-      require 'thread'
-      require 'sappho-basics/auto_flush_log'
-      class HeatmiserStatus
-        include Singleton, Sappho::LogUtilities
-        attr_reader :valid, :timestamp, :sampleTime, :timeSinceLastValid, :sensedTemperature,
-            :requestedTemperature, :heatOn, :keyLockOn, :frostProtectOn, :deviceTimeOffset,
-            :dayOfWeek, :schedule
-        class TimedTemperature
-          attr_reader :hour, :minute, :temperature
-          def initialize raw, bytePosition
-            @hour = raw[bytePosition] & 0xFF
-            @minute = raw[bytePosition + 1] & 0xFF
-            @temperature = raw[bytePosition + 2] & 0xFF
-          end
-          def valid?
-            @hour < 24 and @minute < 60
-          end
-          def description
-            "#{@hour}:#{@minute}-#{@temperature}"
-          end
-        end
-        class Schedule
-          attr_reader :schedule
-          def initialize raw, bytePosition
-            @schedule = []
-            (0 ... 4).map do |position|
-              timedTemperature = TimedTemperature.new(raw, bytePosition + 3 * position)
-              @schedule << timedTemperature if timedTemperature.valid?
-            end
-          end
-          def description
-            (@schedule.collect {|timedTemperature| timedTemperature.description}).join(' ')
-          end
-        end
-        def initialize
-          @mutex = Mutex.new
-          @log = Sappho::ApplicationAutoFlushLog.instance
-          @valid = false
-          @raw = []
-          @timestamp = Time.now
-          @sampleTime = 0.0
-          @timeSinceLastValid = 0.0
-          @sensedTemperature = 0.0
-          @requestedTemperature = 0
-          @holidayReturnTime = Time.now
-          @holdMinutes = 0
-          @heatOn = false
-          @keyLockOn = false
-          @frostProtectOn = false
-          @holidayOn = false
-          @deviceTimeOffset = 0.0
-          @dayOfWeek = 0
-          @schedule = {}
-        end
-        def raw
-          @raw.dup
-        end
-        def get
-          @mutex.synchronize { yield }
-        end
-        def set raw, timestamp, sampleTime
-          @mutex.synchronize do
-            @valid = false
-            @raw = raw.dup
-            @sensedTemperature = ((raw[44] & 0xFF) | ((raw[45] << 8) & 0xFF00)) / 10.0
-            @holdMinutes = (raw[38] & 0xFF) | ((raw[39] << 8) & 0xFF00)
-            @heatOn = raw[47] == 1
-            @keyLockOn = raw[29] == 1
-            @frostProtectOn = raw[30] == 1
-            @holidayOn = raw[37] == 1
-            @holidayReturnTime = Time.local(2000 + (raw[32] & 0xFF), raw[33], raw[34], raw[35], raw[36], 0)
-            @requestedTemperature = @frostProtectOn ? raw[24] & 0xFF : raw[25] & 0xFF
-            @deviceTimeOffset = Time.local(2000 + (raw[48] & 0xFF), raw[49], raw[50],
-                                           raw[52], raw[53], raw[54]) - timestamp
-            dayOfWeek = raw[51]
-            @dayOfWeek = dayOfWeek == 7 ? 0 : dayOfWeek
-            @schedule = {
-                :weekday => Schedule.new(@raw, 55),
-                :weekend => Schedule.new(@raw, 67)
-            }
-            @timeSinceLastValid = timestamp - @timestamp
-            @timestamp = timestamp
-            @sampleTime = sampleTime
-            @valid = true
-            if @log.debug?
-              @log.debug "#{hexString raw}"
-              @log.debug "#{@requestedTemperature} #{@holdMinutes / 60}:#{@holdMinutes % 60} #{@sensedTemperature} #{@heatOn} #{@keyLockOn} #{@frostProtectOn} #{@timeSinceLastValid} #{@dayOfWeek} #{@deviceTimeOffset} #{sampleTime} #{@holidayOn} #{@holidayReturnTime}"
-              @log.debug "weekday: #{@schedule[:weekday].description} weekend: #{@schedule[:weekend].description}"
-            else
-              @log.info "received status: heating is #{@heatOn ? "on" : "off"} because required temperature is #{@requestedTemperature} and actual is #{@sensedTemperature}"
-            end
-          end
-        end
-        def invalidate
-          @mutex.synchronize { @valid = false }
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'singleton'
+      require 'thread'
+      require 'sappho-basics/auto_flush_log'
+      class HeatmiserStatus
+        include Singleton, Sappho::LogUtilities
+        attr_reader :valid, :timestamp, :sampleTime, :timeSinceLastValid, :sensedTemperature,
+            :requestedTemperature, :heatOn, :keyLockOn, :frostProtectOn, :deviceTimeOffset,
+            :dayOfWeek, :schedule
+        class TimedTemperature
+          attr_reader :hour, :minute, :temperature
+          def initialize raw, bytePosition
+            @hour = raw[bytePosition] & 0xFF
+            @minute = raw[bytePosition + 1] & 0xFF
+            @temperature = raw[bytePosition + 2] & 0xFF
+          end
+          def valid?
+            @hour < 24 and @minute < 60
+          end
+          def description
+            "#{@hour}:#{@minute}-#{@temperature}"
+          end
+        end
+        class Schedule
+          attr_reader :schedule
+          def initialize raw, bytePosition
+            @schedule = []
+            (0 ... 4).map do |position|
+              timedTemperature = TimedTemperature.new(raw, bytePosition + 3 * position)
+              @schedule << timedTemperature if timedTemperature.valid?
+            end
+          end
+          def description
+            (@schedule.collect {|timedTemperature| timedTemperature.description}).join(' ')
+          end
+        end
+        def initialize
+          @mutex = Mutex.new
+          @log = Sappho::ApplicationAutoFlushLog.instance
+          @valid = false
+          @raw = []
+          @timestamp = Time.now
+          @sampleTime = 0.0
+          @timeSinceLastValid = 0.0
+          @sensedTemperature = 0.0
+          @requestedTemperature = 0
+          @holidayReturnTime = Time.now
+          @holdMinutes = 0
+          @heatOn = false
+          @keyLockOn = false
+          @frostProtectOn = false
+          @holidayOn = false
+          @deviceTimeOffset = 0.0
+          @dayOfWeek = 0
+          @schedule = {}
+        end
+        def raw
+          @raw.dup
+        end
+        def get
+          @mutex.synchronize { yield }
+        end
+        def set raw, timestamp, sampleTime
+          @mutex.synchronize do
+            @valid = true
+            begin
+              @raw = raw.dup
+              @sensedTemperature = ((raw[44] & 0xFF) | ((raw[45] << 8) & 0xFF00)) / 10.0
+              @holdMinutes = (raw[38] & 0xFF) | ((raw[39] << 8) & 0xFF00)
+              @heatOn = raw[47] == 1
+              @keyLockOn = raw[29] == 1
+              @frostProtectOn = raw[30] == 1
+              @holidayOn = raw[37] == 1
+              @holidayReturnTime = Time.local(2000 + (raw[32] & 0xFF), raw[33], raw[34], raw[35], raw[36], 0)
+              @requestedTemperature = @frostProtectOn ? raw[24] & 0xFF : raw[25] & 0xFF
+              @deviceTimeOffset = Time.local(2000 + (raw[48] & 0xFF), raw[49], raw[50],
+                                             raw[52], raw[53], raw[54]) - timestamp
+              dayOfWeek = raw[51]
+              @dayOfWeek = dayOfWeek == 7 ? 0 : dayOfWeek
+              @schedule = {
+                  :weekday => Schedule.new(@raw, 55),
+                  :weekend => Schedule.new(@raw, 67)
+              }
+              @timeSinceLastValid = timestamp - @timestamp
+              @timestamp = timestamp
+              @sampleTime = sampleTime
+              if @log.debug?
+                @log.debug "#{hexString raw}"
+                @log.debug "#{@requestedTemperature} #{@holdMinutes / 60}:#{@holdMinutes % 60} #{@sensedTemperature} #{@heatOn} #{@keyLockOn} #{@frostProtectOn} #{@timeSinceLastValid} #{@dayOfWeek} #{@deviceTimeOffset} #{sampleTime} #{@holidayOn} #{@holidayReturnTime}"
+                @log.debug "weekday: #{@schedule[:weekday].description} weekend: #{@schedule[:weekend].description}"
+              else
+                @log.info "received status: heating is #{@heatOn ? "on" : "off"} because required temperature is #{@requestedTemperature} and actual is #{@sensedTemperature}"
+              end
+              yield
+            rescue => error
+              @log.error error
+              @valid = false
+            end
+          end
+        end
+        def invalidate
+          @mutex.synchronize { @valid = false }
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/system_configuration.rb CHANGED Viewed

@@ -1,48 +1,34 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'singleton'
-      require 'yaml'
-      require 'sappho-basics/auto_flush_log'
-      class SystemConfiguration
-        include Singleton
-        attr_reader :heatmiserId, :heatmiserHostname, :heatmiserPort, :heatmiserHardware,
-                    :pinLo, :pinHi, :maxClients,
-                    :mongoLogging, :mongodbHostname, :mongodbPort, :mongodbDatabase,
-                    :detailedLogging
-        def initialize
-          log = Sappho::ApplicationAutoFlushLog.instance
-          filename = File.expand_path(ARGV[0] || 'heatmiser-proxy.yml')
-          log.info "loading application configuration from #{filename}"
-          data = YAML.load_file(filename)
-          @heatmiserId = data['heatmiser.id']
-          @heatmiserHostname = data['heatmiser.address']
-          @heatmiserPort = data.has_key?('heatmiser.port') ? Integer(data['heatmiser.port']) : 8068
-          @heatmiserHardware = data.has_key? 'heatmiser.hardware'
-          pin = Integer data['heatmiser.pin']
-          @pinLo = pin & 0xFF
-          @pinHi = (pin >> 8) & 0xFF
-          @maxClients = data.has_key?('clients.max') ? Integer(data['clients.max']) : 10
-          @mongoLogging = data.has_key?('mongodb.address') and data.has_key?('mongodb.database')
-          @mongodbHostname = data['mongodb.address']
-          @mongodbPort = data.has_key?('mongodb.port') ? Integer(data['mongodb.port']) : 27017
-          @mongodbDatabase = data['mongodb.database']
-          @detailedLogging = data.has_key? 'logging.detailed'
-          raise "missing settings in #{filename}" unless @heatmiserId and @heatmiserHostname
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'singleton'
+      require 'yaml'
+      class SystemConfiguration
+        include Singleton
+        attr_reader :heatmiserHostname, :heatmiserPort, :pinLo, :pinHi, :sampleDelay, :maxClients
+        def initialize
+          data = YAML.load_file(File.expand_path(ARGV[0] || 'heatmiser-proxy.yml'))
+          @heatmiserHostname = data['heatmiser.address']
+          @heatmiserPort = Integer data['heatmiser.port']
+          pin = Integer data['heatmiser.pin']
+          @pinLo = pin & 0xFF
+          @pinHi = (pin >> 8) & 0xFF
+          @sampleDelay = Integer data['heatmiser.sample.delay']
+          @maxClients = Integer data['clients.max']
+        end
+      end
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy/version.rb CHANGED Viewed

@@ -1,18 +1,18 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      NAME = 'sappho-heatmiser-proxy'
-      VERSION = '0.1.2'
-      AUTHORS = ['Andrew Heald']
-      EMAILS = ['andrew@heald.co.uk']
-      HOMEPAGE = 'https://github.com/sappho/sappho-heatmiser-proxy/wiki'
-      SUMMARY = 'Acts as a proxy for Heatmiser hardware to allow continuous monitoring and control by many controllers'
-      DESCRIPTION = 'See the project home page for more information'
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      NAME = 'sappho-heatmiser-proxy'
+      VERSION = '0.1.3'
+      AUTHORS = ['Andrew Heald']
+      EMAILS = ['andrew@heald.co.uk']
+      HOMEPAGE = 'https://github.com/sappho/sappho-heatmiser-proxy/wiki'
+      SUMMARY = 'Acts as a proxy for Heatmiser hardware to allow continuous monitoring and control by many controllers'
+      DESCRIPTION = 'See the project home page for more information'
+    end
+  end
+end

data/lib/sappho-heatmiser-proxy.rb CHANGED Viewed

@@ -1,44 +1,35 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Proxy
-      require 'sappho-heatmiser-proxy/heatmiser'
-      require 'sappho-heatmiser-proxy/heatmiser_client'
-      require 'sappho-basics/auto_flush_log'
-      require 'sappho-socket/safe_server'
-      require 'sappho-heatmiser-proxy/version'
-      require 'mongo_mapper'
-      require 'mongo/connection'
-      require 'thread'
-      class CommandLine
-        def CommandLine.process
-          log = Sappho::ApplicationAutoFlushLog.instance
-          log.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
-          config = SystemConfiguration.instance
-          if config.mongoLogging
-            log.info "connecting to mongodb database #{config.mongodbDatabase} on #{config.mongodbHostname}:#{config.mongodbPort}"
-            MongoMapper.connection = Mongo::Connection.new config.mongodbHostname, config.mongodbPort
-            MongoMapper.database = config.mongodbDatabase
-          else
-            log.info 'logging to mongodb is disabled'
-          end
-          Sappho::Socket::SafeServer.new('heatmiser proxy', config.heatmiserPort, config.maxClients, config.detailedLogging).serve do
-            | socket, ip | HeatmiserClient.new(socket, ip).communicate
-          end
-          Thread.new do
-            Heatmiser.new.monitor
-          end.join
-        end
-      end
-    end
-  end
-end
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+module Sappho
+  module Heatmiser
+    module Proxy
+      require 'sappho-heatmiser-proxy/heatmiser'
+      require 'sappho-heatmiser-proxy/heatmiser_client'
+      require 'sappho-basics/auto_flush_log'
+      require 'sappho-socket/safe_server'
+      require 'sappho-heatmiser-proxy/version'
+      require 'thread'
+      class CommandLine
+        def CommandLine.process
+          Sappho::ApplicationAutoFlushLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
+          port = SystemConfiguration.instance.heatmiserPort
+          maxClients = SystemConfiguration.instance.maxClients
+          Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients).serve do
+            | socket, ip | HeatmiserClient.new(socket, ip).communicate
+          end
+          Thread.new do
+            Heatmiser.new.monitor
+          end.join
+        end
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sappho-heatmiser-proxy
 version: !ruby/object:Gem::Version
-  hash: 31
+  hash: 29
   prerelease:
   segments:
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00 Z
+date: 2012-03-29 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,54 +50,6 @@ dependencies:
         version: 0.1.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 51
-        segments:
-        - 0
-        - 11
-        - 0
-        version: 0.11.0
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: mongo
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 13
-        segments:
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 13
-        segments:
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :runtime
-  version_requirements: *id005
 description: See the project home page for more information
 email:
 - andrew@heald.co.uk
@@ -109,15 +61,14 @@ extra_rdoc_files: []
 files:
 - bin/sappho-heatmiser-proxy
-- lib/sappho-heatmiser-proxy/command_queue.rb
+- lib/sappho-heatmiser-proxy.rb
+- lib/sappho-heatmiser-proxy/version.rb
 - lib/sappho-heatmiser-proxy/heatmiser.rb
-- lib/sappho-heatmiser-proxy/heatmiser_client.rb
 - lib/sappho-heatmiser-proxy/heatmiser_crc.rb
-- lib/sappho-heatmiser-proxy/heatmiser_status.rb
-- lib/sappho-heatmiser-proxy/model/heatmiser_log.rb
 - lib/sappho-heatmiser-proxy/system_configuration.rb
-- lib/sappho-heatmiser-proxy/version.rb
-- lib/sappho-heatmiser-proxy.rb
+- lib/sappho-heatmiser-proxy/heatmiser_status.rb
+- lib/sappho-heatmiser-proxy/command_queue.rb
+- lib/sappho-heatmiser-proxy/heatmiser_client.rb
 homepage: https://github.com/sappho/sappho-heatmiser-proxy/wiki
 licenses: []
@@ -147,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: sappho-heatmiser-proxy
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key:
 specification_version: 3
 summary: Acts as a proxy for Heatmiser hardware to allow continuous monitoring and control by many controllers

data/lib/sappho-heatmiser-proxy/model/heatmiser_log.rb DELETED Viewed

@@ -1,29 +0,0 @@
-# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
-# This software is licensed under the GNU Affero General Public License, version 3.
-# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
-# Copyright 2012 Andrew Heald.
-module Sappho
-  module Heatmiser
-    module Model
-      require 'mongo_mapper'
-      require 'mongo_mapper/document'
-      class HeatmiserLog
-        include MongoMapper::Document
-        key :deviceId, String
-        key :timestamp, Time
-        key :sensedTemperature, Float
-        key :requestedTemperature, Integer
-        key :heatOn, Boolean
-        key :frostProtectOn, Boolean
-        key :deviceTimeOffset, Float
-      end
-    end
-  end
-end