ekm-omnimeter 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805b7edfbd3b7f9e44d1f93d0734abde1c97c3f0
-  data.tar.gz: db58b9036c43cbc237acca4560fca9d2b750ce68
+  metadata.gz: 81c9725bd9f827fc67d3b86adf622ba2cbd130a3
+  data.tar.gz: 07f927b1852af3a02f5c5df84fcc78aa2fb791e6
 SHA512:
-  metadata.gz: 70814f2e75bc91c8d5d41266e1cc7ecfbb636d2ec8852ba5a358de3d177fc03cea9b73c55b059fcbcd314702183f15a87601e6fcba9fe5429a6446b1622faa59
-  data.tar.gz: 92c36cd70fd8888eb5ad3c796cfc01d1f353fb3f3ecba13a176a27963f349739edca2273a232bca87879c4a83a84cd5eb30ce6accbef01026824c3378b49fb7b
+  metadata.gz: cf5880321ac3ba5961df65c25ef49ad9339224de1a451ee34712e3e2cc55e00ede182a70253b183075da0199a1b903140066abf29b8f000beb0f15d3822a584d
+  data.tar.gz: abd636ab283d8680a7256b3523f033be1370d70fd6d3f45c420bfaad0235335ee07c47de80cd4797bd67b97f80c4729d2fca8be3688ed623dd0be37b3eb638db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ekm-omnimeter (0.2.1)
+    ekm-omnimeter (0.2.2)
       log4r (~> 1.1)
       xively-rb-connector (~> 0.1)
 

data/README.md

@@ -89,7 +89,7 @@ m.power_factor_1			# 1.0
 m.power_factor_2			# 0.0
 m.power_factor_3			# 0.0
 m.maximum_demand			# 22640.0
-m.maximum_demand_period		# 1
+m.maximum_demand_period		# 15        (in minutes, can be 15, 30 or 60)
 m.ct_ratio					# 400
 m.pulse_1_count				# 3
 m.pulse_1_ratio				# 1000
@@ -111,11 +111,16 @@ m.reactive_power_2			# 60
 m.reactive_power_3			# 0
 m.total_reactive_power		# 84
 m.frequency					# 60.04
-m.pulse_input_hilo			# 0
-m.direction_of_current		# 1
-m.outputs_onoff				# 1
+m.pulse_1_input				# low
+m.pulse_2_input				# high
+m.pulse_3_input				# high
+m.current_direction_l1	    # forward
+m.current_direction_l2	    # forward
+m.current_direction_l3	    # forward
+m.output_1		   	   	   	# off
+m.output_2		   	   	   	# off
 m.kwh_data_decimal_places	# 2
-m.auto_reset_max_demand		# 0
+m.auto_reset_max_demand	    # off
 m.settable_pulse_per_kwh_ratio	# 800
 
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems/tasks'
 require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'

data/lib/ekm-omnimeter/meter.rb

@@ -340,6 +340,13 @@ module EkmOmnimeter
       @values[:kwh_data_decimal_places] = d[:kwh_data_decimal_places].to_i
       cast_response_to_correct_types(d)
 
+      # Lookup mapped values
+      puts "d[:pulse_input_hilo] = #{d[:pulse_input_hilo].inspect}"
+
+      d[:pulse_1_input], d[:pulse_2_input], d[:pulse_3_input] = lookup_pulse_input_states(d[:pulse_input_hilo])
+      d[:current_direction_l1], d[:current_direction_l2], d[:current_direction_l3] = lookup_direction_of_current(d[:direction_of_current])
+      d[:output_1], d[:output_2] = lookup_output_states(d[:outputs_onoff])
+
       # Merge to values and reset time
       @values.merge!(d)
       @last_read_timestamp = Time.now
@@ -431,6 +438,10 @@ module EkmOmnimeter
       # Cast types
       cast_response_to_correct_types(d)
 
+      # Lookup mapped values
+      d[:maximum_demand_period] = lookup_demand_period_time(d[:maximum_demand_period])
+      d[:auto_reset_max_demand] = lookup_auto_reset_max_demand_period(d[:auto_reset_max_demand])
+
       # Merge to values and reset time
       @values.merge!(d)
       @last_read_timestamp = Time.now
@@ -486,5 +497,70 @@ module EkmOmnimeter
 
     end
 
+
+
+    PULSE_INPUT_STATE_MAP = {
+      0 => [:high,:high,:high], # High/High/High = 0 (30)
+      1 => [:high,:high,:low],  # High/High/Low  = 1 (31)
+      2 => [:high,:low,:high],  # High/Low/High  = 2 (32)
+      3 => [:high,:low,:low],   # High Low/Low   = 3 (33)
+      4 => [:low,:high,:high],  # Low/High/High  = 4 (34)
+      5 => [:low,:high,:low],   # Low/High/Low   = 5 (35)
+      6 => [:low,:low,:high],   # Low/Low/High   = 6 (36)
+      7 => [:low,:low,:low]     # Low/Low/Low    = 7 (37)
+    }
+    def lookup_pulse_input_states(v)
+      PULSE_INPUT_STATE_MAP[v.to_i]
+    end
+
+
+    DIRECTION_OF_CURRENT_MAP = {
+      #Line1/Line2/Line3
+      1 => [:forward,:forward,:forward],  #Forward/Forward/Forward = 1 (31)
+      2 => [:forward,:forward,:reverse],  #Forward/Forward/Reverse = 2 (32)
+      3 => [:forward,:reverse,:forward],  #Forward/Reverse/Forward = 3 (33)
+      4 => [:reverse,:forward,:forward],  #Reverse/Forward/Forward = 4 (34)
+      5 => [:forward,:reverse,:reverse],  #Forward/Reverse/Reverse = 5 (35)
+      6 => [:reverse,:forward,:reverse],  #Reverse/Forward/Reverse = 6 (36)
+      7 => [:reverse,:reverse,:forward],  #Reverse/Reverse/Forward = 7 (37)
+      8 => [:reverse,:reverse,:reverse]   #Reverse/Reverse/Reverse = 8 (38)
+    }
+    def lookup_direction_of_current(v)
+      DIRECTION_OF_CURRENT_MAP[v.to_i]
+    end
+
+
+    OUTPUT_INDICATOR_MAP = {
+      1 => [:off,:off], # OFF/OFF = 1 (31)
+      2 => [:off,:on],  # OFF/ON  = 2 (32)
+      3 => [:on,:off],  # ON/OFF  = 3 (33)
+      4 => [:on,:on]    # ON/ON   = 4 (34)
+    }
+    def lookup_output_states(v)
+      OUTPUT_INDICATOR_MAP[v.to_i]
+    end
+
+
+    DEMAND_PERIOD_TIME_MAP = {
+      1 => 15,  # 15 min = 1 (31)
+      2 => 30,  # 30 min = 2 (31)
+      3 => 60   # Hour   = 3 (31)
+    }
+    def lookup_demand_period_time(v)
+      DEMAND_PERIOD_TIME_MAP[v.to_i]
+    end
+
+
+    AUTO_RESET_MAX_DEMAND_MAP = {
+      0 => :off,     # OFF = 0 (30)
+      1 => :monthly, # Monthly = 1 (31)
+      2 => :weekly,  # Weekly = 2 (32)
+      3 => :daily,   # Daily = 3 (33)
+      4 => :hourly   # Hourly = 4 (34)
+    }
+    def lookup_auto_reset_max_demand_period(v)
+      AUTO_RESET_MAX_DEMAND_MAP[v.to_i]
+    end
+
   end
 end

data/lib/ekm-omnimeter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ekm-omnimeter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jordan Duggan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler