saj_collector 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 669e9d65767c5457376d5c97928fe67af2a70e00
-  data.tar.gz: 973475c0af31b95f8396ed858a3c5f156f34c37b
+SHA256:
+  metadata.gz: 3cd6cde289ad4c8172d81fe8328aaed9d80739b034e373e76b2a84e3d7378fad
+  data.tar.gz: c6c71fc42fe81350dcbf3edaf7f9e26c02f90b07f412340702d3ecaa830d2806
 SHA512:
-  metadata.gz: 13c34bad146027c732bea6831e990a23030539363415ad371fb8a05c3c9083391c0fc9a99b3309d00c35e5790bac1ab386e52e2d6bafc2be11dca37de9f32a39
-  data.tar.gz: 9fcb9531181d277488c1a4cac41461aa1f2b8bf7d7c9f0b212bde089a87f5dec39060d4995975311ea7fcd201d26afce804ecf01411ac95502f671297280f291
+  metadata.gz: ba424ce76bf030ff3afb5ba7a4e300e8934ae8086f237e1f933ffbd92a449c953e594c31a374ddd45dd3e232b6001069ef42199f2b03adb3604ccf176203bd26
+  data.tar.gz: f3a2a0145efc2ea370e73353907b59e59a32f3d4caec503b005d322ffa92141e5b855d6459679cbe5eeaeccd8a615ccacab351da8613ae596e119358f50f65b7

data/README.md

@@ -1,5 +1,7 @@
 # SAJ Collector
 
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fdb313b9a4b24614867b91e45a5505f9)](https://www.codacy.com/app/jwillemsen/saj_collector?utm_source=github.com&utm_medium=referral&utm_content=jwillemsen/saj_collector&utm_campaign=badger)
+
 Pull stats from SAJ Solar Inverter and push them to PVOutput. This
 ruby gem is based on https://github.com/johnf/jfy_collector
 
@@ -12,14 +14,15 @@ Install it:
 ## Usage
 
 Create a config file for PVOutput in ```saj_collector.yaml```.
-This should contain the IP address of your SAJ Solar Invertor, and your
-PVOutput system id and API key
+This should contain the IP address of your SAJ Solar Invertor (```saj```), your
+PVOutput system id (```system_id```) and API key (```api_key```).
 
 ``` yaml
 ---
 :saj: a.b.c.d
 :system_id: 123456
 :api_key: fb6a2e3
+:day_trend_multiplication_factor: 100
 ```
 
 Run the SAJ Collector in a screen or via init of some sort
@@ -31,16 +34,19 @@ data once to PVOutput. You can add
 ``saj_collector`` to your crontab or a custom script to let it automatically push with
 a certain frequency.
 
+The SAJ Output Collector will retrieve the generation of each day of the current month and
+push the data once to PVOutput.
 Run the SAJ Output Collector in a screen or via init of some sort
 
     $ saj_output_collector
 
-This will retrieve the generation of each day of the current month and
-push the data once to PVOutput.
-You can add
-``saj_output_collector`` to your crontab or a custom script to let it automatically push with
+You can add ``saj_output_collector`` to your crontab or a custom script to let it automatically push with
 a certain frequency.
 
+Some SAJ Solar Inverters provide the generation of each day with a granularity of 0.1kWh and some with
+a granularity of 0.01kWh. In case of the last you have to change the ```day_trend_multiplication_factor```
+within your ```saj_collector.yaml``` to 10.
+
 At the moment you add any of these to your crontab you have to make sure
 that the ``saj_collector.yaml`` file can be found. For example when you put the ``saj_collector.yaml`` file
 in /usr/local/bin (and also the gem) and want to run it each 5 minutes between 6AM and 10PM you should

data/exe/saj_output_collector

@@ -30,13 +30,20 @@ options = {
 
 counter = 0
 current_day = '00'
+day_trend_multiplication = 100
+
+# Some SAJ Inverters provide they energy_generated in granularity of 0.1kWh and
+# others in 0.01kWh.
+if !sajcollector_config[:day_trend_multiplication_factor].nil?
+    day_trend_multiplication = sajcollector_config[:day_trend_multiplication_factor].to_i
+end
 
 while counter < days
   value = {
     :energy_generated => 0 }
   # Get the power output of the day,
   doc.elements.each("day_trend/d#{counter}"){
-    |e| value[:energy_generated] = (e.text.to_i * 100).to_s
+    |e| value[:energy_generated] = (e.text.to_i * day_trend_multiplication).to_s
   }
   options[:"#{m}#{current_day.next!}"] = value
 
@@ -44,7 +51,7 @@ while counter < days
 end
 
 options.each do |date, values|
-  puts "Energy generated #{date}: #{values[:energy_generated]} WH"
+  puts "Energy generated #{date}: #{values[:energy_generated]} Wh"
 end
 
 pvoutput.add_batch_output(options)

data/lib/saj_collector/version.rb

@@ -1,3 +1,3 @@
 module SAJCollector
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saj_collector
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Johnny Willemsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pvoutput
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pull stats from SAJ Solar Inverter and push them to PVOutput