Floppy-currentcost 0.3.0 → 0.3.1

data/lib/currentcost/meter.rb

@@ -22,7 +22,7 @@ module CurrentCost
   #     end
   #   end
   # 
-  #   meter = CurrentCost::Meter.new
+  #   meter = CurrentCost::Meter.new(:cc128 => true)
   #   observer = SimpleObserver.new
   #   meter.add_observer(observer)
   #   sleep(30) # wait a while, let some readings come in
@@ -35,10 +35,12 @@ module CurrentCost
 
     # Constructor. 'port' is the name of the serial port that the physical
     # meter is connected to.
+    # Connection is to a classic meter by default. To connect to a new-stlye
+    # CC128, pass :cc128 => true at the end
     # This function will automatically start processing serial data on the
     # specified port. To stop this processing, call close.
-    def initialize(port = '/dev/ttyS0')
-      @port = RB232::Port.new(port, :baud_rate => 9600)
+    def initialize(port = '/dev/ttyS0', options = {})
+      @port = RB232::Port.new(port, :baud_rate => options[:cc128] == true ? 57600 : 9600)
       @protocol = RB232::TextProtocol.new(@port, "\n")
       @protocol.add_observer(self)
       @protocol.start

data/lib/currentcost/reading.rb

@@ -22,9 +22,33 @@ module CurrentCost
       if r.software_version.include? "CC128"
         r.days_since_birth = REXML::XPath.first(doc, "/msg/dsb").text.to_i
         r.hour, r.minute, r.second = REXML::XPath.first(doc, "/msg/time").text.split(':').map{|x| x.to_i}
-        r.id = REXML::XPath.first(doc, "/msg/id").text
-        r.type = REXML::XPath.first(doc, "/msg/type").text
-        r.temperature = REXML::XPath.first(doc, "/msg/tmpr").text.to_f
+        r.id = REXML::XPath.first(doc, "/msg/id").text rescue nil
+        r.type = REXML::XPath.first(doc, "/msg/type").text rescue nil
+        r.temperature = REXML::XPath.first(doc, "/msg/tmpr").text.to_f rescue nil
+        r.sensor = REXML::XPath.first(doc, "/msg/sensor").text rescue nil
+        # Extract history data
+        if REXML::XPath.first(doc, "/msg/hist")
+          r.history = {}
+          REXML::XPath.each(doc, "/msg/hist/data") do |sensor|
+            sensor_num = sensor.elements['sensor'].text.to_i
+            sensor.elements.each do |item|
+              match = item.name.match "([hdm])([0-9][0-9][0-9])"
+              if match
+                case match[1]
+                when 'h'
+                  type = :hours
+                when 'd'
+                  type = :days
+                when 'm'
+                  type = :months
+                end
+                r.history[type] ||= []
+                r.history[type][match[2].to_i] ||= []
+                r.history[type][match[2].to_i][sensor_num] = item.text.to_f
+              end
+            end
+          end
+        end
       else
         r.days_since_birth = REXML::XPath.first(doc, "/msg/date/dsb").text.to_i
         r.hour = REXML::XPath.first(doc, "/msg/date/hr").text.to_i
@@ -39,19 +63,19 @@ module CurrentCost
           r.history = {}
           r.history[:hours] = []
           REXML::XPath.each(doc, "/msg/hist/hrs/*") do |node|
-            r.history[:hours][node.name.slice(1,2).to_i] = node.text.to_f
+            r.history[:hours][node.name.slice(1,2).to_i] = [node.text.to_f]
           end
           r.history[:days] = []
           REXML::XPath.each(doc, "/msg/hist/days/*") do |node|
-            r.history[:days][node.name.slice(1,2).to_i] = node.text.to_i
+            r.history[:days][node.name.slice(1,2).to_i] = [node.text.to_i]
           end
           r.history[:months] = []
           REXML::XPath.each(doc, "/msg/hist/mths/*") do |node|
-            r.history[:months][node.name.slice(1,2).to_i] = node.text.to_i
+            r.history[:months][node.name.slice(1,2).to_i] = [node.text.to_i]
           end
           r.history[:years] = []
           REXML::XPath.each(doc, "/msg/hist/yrs/*") do |node|
-            r.history[:years][node.name.slice(1,2).to_i] = node.text.to_i
+            r.history[:years][node.name.slice(1,2).to_i] = [node.text.to_i]
           end
         end
       end
@@ -86,7 +110,9 @@ module CurrentCost
     attr_accessor :channels
     # Current temperature
     attr_accessor :temperature
-    # Historical data, represented as a hash. There is a hash entry for days, weeks, months, and years. Each of these is an array of historical kWh data.
+    # Sensor number
+    attr_accessor :sensor
+    # Historical data, represented as a hash. There is a hash entry for days, weeks, months, and years. Each of these is an array of sensors, each of which contains an array of historical kWh data.
     attr_accessor :history
 
     # The sum of the current wattage for all channels, as shown on the meter

data/lib/currentcost/version.rb

@@ -3,7 +3,7 @@ module CurrentCost
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-currentcost
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency