ekm-omnimeter 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -2
- data/lib/ekm-omnimeter/meter.rb +4 -5
- data/lib/ekm-omnimeter/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 805b7edfbd3b7f9e44d1f93d0734abde1c97c3f0
|
4
|
+
data.tar.gz: db58b9036c43cbc237acca4560fca9d2b750ce68
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 70814f2e75bc91c8d5d41266e1cc7ecfbb636d2ec8852ba5a358de3d177fc03cea9b73c55b059fcbcd314702183f15a87601e6fcba9fe5429a6446b1622faa59
|
7
|
+
data.tar.gz: 92c36cd70fd8888eb5ad3c796cfc01d1f353fb3f3ecba13a176a27963f349739edca2273a232bca87879c4a83a84cd5eb30ce6accbef01026824c3378b49fb7b
|
data/README.md
CHANGED
@@ -13,7 +13,6 @@ contains a revenue-grade universal kWh power meter, three pulse counting inputs
|
|
13
13
|
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).
|
14
14
|
|
15
15
|
TODO:
|
16
|
-
* Cast values to their proper type and precision
|
17
16
|
* Add specs
|
18
17
|
* Add daemon to monitor meter's output at regular intervals
|
19
18
|
|
@@ -89,7 +88,7 @@ m.watts_total # 2664
|
|
89
88
|
m.power_factor_1 # 1.0
|
90
89
|
m.power_factor_2 # 0.0
|
91
90
|
m.power_factor_3 # 0.0
|
92
|
-
m.maximum_demand #
|
91
|
+
m.maximum_demand # 22640.0
|
93
92
|
m.maximum_demand_period # 1
|
94
93
|
m.ct_ratio # 400
|
95
94
|
m.pulse_1_count # 3
|
data/lib/ekm-omnimeter/meter.rb
CHANGED
@@ -160,7 +160,6 @@ module EkmOmnimeter
|
|
160
160
|
|
161
161
|
# Returns the correct measurement for voltage, current, and power based on the corresponding power_configuration
|
162
162
|
def calculate_measurement(m1, m2, m3)
|
163
|
-
puts "****** #{power_configuration.inspect} #{m1}, #{m2}, #{m3}"
|
164
163
|
if power_configuration == :single_phase_2wire
|
165
164
|
m1
|
166
165
|
elsif power_configuration == :single_phase_3wire
|
@@ -194,7 +193,6 @@ module EkmOmnimeter
|
|
194
193
|
:watts_l2,
|
195
194
|
:watts_l3,
|
196
195
|
:watts_total,
|
197
|
-
:maximum_demand,
|
198
196
|
:ct_ratio,
|
199
197
|
:pulse_1_count,
|
200
198
|
:pulse_1_ratio,
|
@@ -218,7 +216,8 @@ module EkmOmnimeter
|
|
218
216
|
:volts_l3,
|
219
217
|
:amps_l1,
|
220
218
|
:amps_l2,
|
221
|
-
:amps_l3
|
219
|
+
:amps_l3,
|
220
|
+
:maximum_demand
|
222
221
|
].each do |k|
|
223
222
|
logger.debug "Casting #{k}"
|
224
223
|
d[k] = to_f_with_decimal_places(d[k], 1) if d.has_key?(k)
|
@@ -276,7 +275,7 @@ module EkmOmnimeter
|
|
276
275
|
response = get_remote_meter_data(request, read_bytes)
|
277
276
|
|
278
277
|
if response.nil?
|
279
|
-
|
278
|
+
logger.error "No response to request_a from meter #{meter_number}"
|
280
279
|
raise EkmOmnimeter, "No response from meter."
|
281
280
|
end
|
282
281
|
|
@@ -370,7 +369,7 @@ module EkmOmnimeter
|
|
370
369
|
logger.debug "Socket write #{request}" unless logger.nil?
|
371
370
|
response = get_remote_meter_data(request, read_bytes)
|
372
371
|
if response.nil?
|
373
|
-
|
372
|
+
logger.error "No response to request_a from meter #{meter_number}"
|
374
373
|
raise EkmOmnimeter, "No response from meter."
|
375
374
|
end
|
376
375
|
|