ekm-omnimeter 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956b201ecc8c116268db81bb760d33d6f8a1fc64
-  data.tar.gz: b7ad7042d5e54af49457484ac419a9036727136f
+  metadata.gz: 805b7edfbd3b7f9e44d1f93d0734abde1c97c3f0
+  data.tar.gz: db58b9036c43cbc237acca4560fca9d2b750ce68
 SHA512:
-  metadata.gz: 9746afa0fcbad02f08d06f82c316ee90793396afe7c8a8088d6042ed33780711e1d31d6a6469bbb9ac1c53ff6178cefc4455bddd64dbf6358e1b0ec72e2e61fa
-  data.tar.gz: c5cbd6cbd05c2fe74caed67c2a64a2e69c4c098d5fa490d671821dca18db0a7623b1f76504b7d9566ab9a1e3d7a93ff207ebf36facf506594f77f15a887f65a7
+  metadata.gz: 70814f2e75bc91c8d5d41266e1cc7ecfbb636d2ec8852ba5a358de3d177fc03cea9b73c55b059fcbcd314702183f15a87601e6fcba9fe5429a6446b1622faa59
+  data.tar.gz: 92c36cd70fd8888eb5ad3c796cfc01d1f353fb3f3ecba13a176a27963f349739edca2273a232bca87879c4a83a84cd5eb30ce6accbef01026824c3378b49fb7b

data/README.md

@@ -13,7 +13,6 @@ contains a revenue-grade universal kWh power meter, three pulse counting inputs
 and 2 controllable 50 mA at 12 volts relay outputs that can toggle 120v circuits when connected to their [EKM Switch120 power cord](http://www.ekmmetering.com/ekm-metering-products/accessories/switch120.html).
 
 TODO:
-* Cast values to their proper type and precision
 * Add specs
 * Add daemon to monitor meter's output at regular intervals
 
@@ -89,7 +88,7 @@ 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			# 22640.0
 m.maximum_demand_period		# 1
 m.ct_ratio					# 400
 m.pulse_1_count				# 3

data/lib/ekm-omnimeter/meter.rb

@@ -160,7 +160,6 @@ 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
         m1
       elsif power_configuration == :single_phase_3wire
@@ -194,7 +193,6 @@ module EkmOmnimeter
        :watts_l2,
        :watts_l3,
        :watts_total,
-       :maximum_demand,
        :ct_ratio,
        :pulse_1_count,
        :pulse_1_ratio,
@@ -218,7 +216,8 @@ module EkmOmnimeter
        :volts_l3,
        :amps_l1,
        :amps_l2,
-       :amps_l3
+       :amps_l3,
+       :maximum_demand
       ].each do |k|
         logger.debug "Casting #{k}"
         d[k] = to_f_with_decimal_places(d[k], 1) if d.has_key?(k)
@@ -276,7 +275,7 @@ module EkmOmnimeter
       response = get_remote_meter_data(request, read_bytes)
 
       if response.nil?
-        log.error "No response to request_a from meter #{address}"
+        logger.error "No response to request_a from meter #{meter_number}"
         raise EkmOmnimeter, "No response from meter."
       end
 
@@ -370,7 +369,7 @@ module EkmOmnimeter
       logger.debug "Socket write #{request}" unless logger.nil?
       response = get_remote_meter_data(request, read_bytes)
       if response.nil?
-        log.error "No response to request_a from meter #{address}"
+        logger.error "No response to request_a from meter #{meter_number}"
         raise EkmOmnimeter, "No response from meter."
       end
 

data/lib/ekm-omnimeter/version.rb

@@ -7,7 +7,7 @@ module EkmOmnimeter
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
 
     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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jordan Duggan