ekm-omnimeter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 758e496aeac9d9f1cf799c3beaee919f2f322060
-  data.tar.gz: f703b60257dd10c354d4777ce804908cca9ed7dc
+  metadata.gz: 956b201ecc8c116268db81bb760d33d6f8a1fc64
+  data.tar.gz: b7ad7042d5e54af49457484ac419a9036727136f
 SHA512:
-  metadata.gz: cd0305137f9ec0e3f4bf6c2cb3da5286210ba4d267c93f89ca1a71500c952bf67c6821d6f40fd99bf33f576c50d99dffcbee2e7e2cd33bb23a520f38773fc59f
-  data.tar.gz: 6edc0ed3de4baefb7e57d72083aff3ea3b92cc0954480d9b39c4ff99d6c2be28a504a797c58e19bfe025ac1e7fb47903f48860f2bca14508e94d8a8227011c27
+  metadata.gz: 9746afa0fcbad02f08d06f82c316ee90793396afe7c8a8088d6042ed33780711e1d31d6a6469bbb9ac1c53ff6178cefc4455bddd64dbf6358e1b0ec72e2e61fa
+  data.tar.gz: c5cbd6cbd05c2fe74caed67c2a64a2e69c4c098d5fa490d671821dca18db0a7623b1f76504b7d9566ab9a1e3d7a93ff207ebf36facf506594f77f15a887f65a7

data/Gemfile.lock

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

data/README.md

@@ -49,44 +49,75 @@ m = EkmOmnimeter::Meter.new(
   :remote_address=>'192.168.1.125',             # The IP address of your iSerial device
   :remote_port => 50000)                        # The port on which your iSerial device is listening
 
-# Read some values
+# These values change based on the value of :power_configuration in the constructor
+m.volts			            # 248.7
+m.amps			            # 21.6
+m.watts			            # 2664
+
+# Warning: Dates seem off
+# My computer clock said 2014-04-03 3:32PM when these outputs came out
+m.meter_timestamp	        # 2014-04-03 05:15:32
+m.computer_timestamp	    # Time.now() = 2014-04-03 15:32:10 -0400
+
+# Read meter values
 m.remote_address            # 192.168.1.125
 m.remote_port               # 50000
 m.meter_number              # 000300000001
-m.address                   # 000300000001
-m.measurement_timestamp     # 2014-04-03 05:03:01
-m.total_active_kwh          # 00450609
-m.total_kvarh               # 00080417
-m.total_rev_kwh             # 00007590
-m.three_phase_kwh           # 002115660023898000000000
-m.three_phase_rev_kwh       # 000000000000759000000000
-m.resettable_kwh            # 00450609
-m.resettable_reverse_kwh    # 00007590
-m.volts_l1                  # 1245
-m.volts_l2                  # 1254
-m.volts_l3                  # 0000
-m.amps_l1                   # 00200
-m.amps_l2                   # 00056
-m.amps_l3                   # 00000
-m.watts_l1                  # 0002504
-m.watts_l2                  # 0000664
-m.watts_l3                  # 0000000
-m.watts_total               # 0003172
-m.cosϴ_l1                   # 100
-m.cosϴ_l2                   # 100
-m.cosϴ_l3                   # C000
-m.var_l1                    # 0000052
-m.var_l2                    # 0000000
-m.var_l3                    # 0000000
-m.var_total                 # 0000052
-m.freq                      # 6006
-m.pulse_count_1             # 00000003
-m.pulse_count_2             # 00000006
-m.pulse_count_3             # 00000000
-m.pulse_input_hilo          # 4
-m.direction_of_current      # 1
-m.outputs_onoff             # 1
-m.kwh_data_decimal_places   # 2
+m.address					# 000300000001
+m.total_kwh					# 4583.51
+m.total_forward_kwh			# 4507.610000000001
+m.total_reverse_kwh			# 75.9
+m.net_kwh					# 4431.710000000001
+m.total_kwh_t1				# 2826.64
+m.total_kwh_t2				# 1756.87
+m.total_kwh_t3				# 0.0
+m.total_kwh_t4				# 0.0
+m.reverse_kwh_t1			# 47.93
+m.reverse_kwh_t2			# 27.97
+m.reverse_kwh_t3			# 0.0
+m.reverse_kwh_t4			# 0.0
+m.volts_l1					# 123.9
+m.volts_l2					# 124.8
+m.volts_l3					# 0.0
+m.amps_l1					# 18.4
+m.amps_l2					# 3.2
+m.amps_l3					# 0.0
+m.watts_l1					# 2276
+m.watts_l2					# 384
+m.watts_l3					# 0
+m.watts_total				# 2664
+m.power_factor_1			# 1.0
+m.power_factor_2			# 0.0
+m.power_factor_3			# 0.0
+m.maximum_demand			# 226400
+m.maximum_demand_period		# 1
+m.ct_ratio					# 400
+m.pulse_1_count				# 3
+m.pulse_1_ratio				# 1000
+m.pulse_2_count				# 6
+m.pulse_2_ratio				# 3
+m.pulse_3_count				# 0
+m.pulse_3_ratio				# 1000
+m.reactive_kwh_kvarh		# 812.63
+m.total_kwh_l1				# 2165.46
+m.total_kwh_l2				# 2417.42
+m.total_kwh_l3				# 0.0
+m.reverse_kwh_l1			# 0.0
+m.reverse_kwh_l2			# 75.9
+m.reverse_kwh_l3			# 0.0
+m.resettable_total_kwh		# 4583.51
+m.resettable_reverse_kwh	# 75.9
+m.reactive_power_1			# 24
+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.kwh_data_decimal_places	# 2
+m.auto_reset_max_demand		# 0
+m.settable_pulse_per_kwh_ratio	# 800
 
 
 ```

data/lib/ekm-omnimeter/meter.rb

@@ -41,7 +41,7 @@ module EkmOmnimeter
 
       # Collect the power configurations
       if VALID_POWER_CONFIGURATIONS.index(options[:power_configuration])
-        power_configuration = options[:power_configuration]
+        @power_configuration = options[:power_configuration]
       else
         raise EkmOmnimeterError, "Invalid power configuration #{options[:power_configuration]}. Valid values are #{VALID_POWER_CONFIGURATIONS.join(', ')}"
       end
@@ -160,14 +160,15 @@ module EkmOmnimeter
 
     # Returns the correct measurement for voltage, current, and power based on the corresponding power_configuration
     def calculate_measurement(m1, m2, m3)
+      puts "****** #{power_configuration.inspect}   #{m1}, #{m2}, #{m3}"
       if power_configuration == :single_phase_2wire
-        volts_l1
+        m1
       elsif power_configuration == :single_phase_3wire
-        (volts_l1 + volts_l2)
+        (m1 + m2)
       elsif power_configuration == :three_phase_3wire
-        (volts_l1 + :volts_l3)
+        (m1 + m3)
       elsif power_configuration == :three_phase_4wire
-        (volts_l1 + volts_l2 + volts_l3)
+        (m1 + m2 + m3)
       end
     end
 
@@ -346,9 +347,9 @@ module EkmOmnimeter
 
       # Calculate totals based on wiring configuration
       @values[:meter_timestamp] = meter_timestamp
-      @values[:volts] = calculate_measurement(d[:volts_l1], d[:volts_l2], d[:volts_l3])
-      @values[:amps]  = calculate_measurement(d[:amps_l1], d[:amps_l2], d[:amps_l3])
-      @values[:watts] = calculate_measurement(d[:watts_l1], d[:watts_l2], d[:watts_l3])
+      @values[:volts] = calculate_measurement(volts_l1, volts_l2, volts_l3)
+      @values[:amps]  = calculate_measurement(amps_l1, amps_l2, amps_l3)
+      @values[:watts] = calculate_measurement(watts_l1, watts_l2, watts_l3)
       @values[:total_forward_kwh] = total_kwh - total_reverse_kwh
       @values[:net_kwh] = total_forward_kwh - total_reverse_kwh
 
@@ -437,9 +438,9 @@ module EkmOmnimeter
 
       # Calculate totals based on wiring configuration
       @values[:meter_timestamp] = meter_timestamp
-      @values[:volts] = calculate_measurement(d[:volts_l1], d[:volts_l2], d[:volts_l3])
-      @values[:amps]  = calculate_measurement(d[:amps_l1], d[:amps_l2], d[:amps_l3])
-      @values[:watts] = calculate_measurement(d[:watts_l1], d[:watts_l2], d[:watts_l3])
+      @values[:volts] = calculate_measurement(volts_l1, volts_l2, volts_l3)
+      @values[:amps]  = calculate_measurement(amps_l1, amps_l2, amps_l3)
+      @values[:watts] = calculate_measurement(watts_l1, watts_l2, watts_l3)
 
       # Return the hash as an open struct
       return d

data/lib/ekm-omnimeter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ekm-omnimeter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jordan Duggan