saal 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d7f9b51083356448d50bcb5ad66c729d84a38e152f85470ca4fa5f9f5fed15
-  data.tar.gz: 73f51e4736d14ee249531535577a8ff0568e0c19fb3115a4cf76bb0801d8e504
+  metadata.gz: a8e07d635b3ad4c944de3ccbe81096f826754aa457b9ebf06854f01a760d715d
+  data.tar.gz: 766a7168fa122a72b388b6547b1f6b9531cd4afd5bc1df9df52673b9fd8291ce
 SHA512:
-  metadata.gz: 349eed054b1fd37de656840840b92e1be279e77fe677b92cc47864fe96079f88e6dc784e608bf5a7843b08cc0025b1f141d1bf88be1cef553e18f104cc0c3d74
-  data.tar.gz: e07a22761c8f4f6c01d631abb29b01c63d6888c449fd67762e558ddd7693cd1bdfdf5b8bd7cdc35575006c6cb2fc9cbef49329bf08b754d5101d5dfc20d3421d
+  metadata.gz: 1ada5f05af261f043ef3e871c21d61b3f1924b4b99d8059233f1202a8594c30ea9af425e3f62d75050ee2f6c8bc15782c1535e4fc4696c277d7619c0569e40dc
+  data.tar.gz: 39ece8cad43590608d9410d7ffdcab1449e1fcc309f123343ffa6872dd84b820a59635a0f3a1aaf5807d05e111394674aa1aa49d9dcc2589930477d5f3c10426

data/bin/saal_envoy_read

@@ -130,14 +130,15 @@ envoy = SAAL::Envoy::Inverters::new(
   :host => ARGV[0],
   :user => ARGV[1],
   :password => ARGV[2],
+  :types => ["w_now", "last_report_date", "w_max"],
 )
 envoy.set_all_inverters!
 inverters = envoy.create_sensors
-puts "Found #{envoy.inverters.size} inverters"
+puts " Found #{envoy.inverters.size} inverters"
 envoy.inverters.each do |serial|
-  puts "INVERTER: #{serial} \
-date:#{l(inverters,"inverter_#{serial}_last_report_date")} \
-lastWatts:#{l(inverters,"inverter_#{serial}_w_now")} \
-maxWatts:#{l(inverters,"inverter_#{serial}_w_max")} \
+  puts " INVERTER: #{serial} \
+date:#{l(inverters,"inverters_#{serial}_last_report_date")} \
+lastWatts:#{l(inverters,"inverters_#{serial}_w_now")} \
+maxWatts:#{l(inverters,"inverters_#{serial}_w_max")} \
 "
 end

data/lib/envoy.rb

@@ -216,9 +216,10 @@ module SAAL
       DEFAULT_TIMEOUT = 2
       DEFAULT_CACHE_TIMEOUT = 50
       DEFAULT_SOURCES = []
-      DEFAULT_TYPES = ["last_report_date", "watts_now", "watts_max"]
+      DEFAULT_TYPES = ["w_now"] # "last_report_date", "w_max"
       DEFAULT_USER = nil
       DEFAULT_PASSWORD = nil
+      DEFAULT_PREFIX = "inverters"
       attr_reader :inverters
 
       def initialize(defs, opts={})
@@ -232,6 +233,7 @@ module SAAL
         @inverters_list = {}
         @inverters = defs[:inverters] || defs['inverters'] || DEFAULT_SOURCES
         @types = defs[:types] || defs['types'] || DEFAULT_TYPES
+        @prefix = defs[:prefix] || defs['prefix'] || DEFAULT_PREFIX
       end
 
       def read_val(name)
@@ -254,7 +256,7 @@ module SAAL
       def create_sensors
         sensors = {}
         @inverters.product(@types).each do |source, type|
-          key = "inverter_#{source}_#{type}"
+          key = "#{@prefix}_#{source}_#{type}"
           sensors[key] = InverterUnderlying.new(key, self)
         end
         sensors
@@ -268,12 +270,13 @@ module SAAL
         values = JSON.parse(response.body)
         inverters = {}
         values.each do |inverter|
+          serial = inverter["serialNumber"]
+          @inverters_list[serial] = true
           {"lastReportDate" => "last_report_date",
-           "lastReportWatts" => "watts_now",
-           "maxReportWatts" => "watts_max",
+           "lastReportWatts" => "w_now",
+           "maxReportWatts" => "w_max",
           }.each do |type, label|
-            inverters["inverter_#{inverter["serialNumber"]}_#{label}"] = inverter[type]
-            @inverters_list[inverter["serialNumber"]] = true
+            inverters["#{@prefix}_#{serial}_#{label}"] = inverter[type]
           end
         end
 

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/lib/sensors.rb

@@ -54,9 +54,15 @@ module SAAL
         return sensors.map do |name, underlying|
           Sensor.new(dbstore, name, underlying, defs, opts)
         end
+      elsif defs['envoy_inverters']
+        defs = defs['envoy_inverters'].merge('prefix' => name)
+        pe = SAAL::Envoy::Inverters::new(defs)
+        sensors = pe.create_sensors
+        return sensors.map do |name, underlying|
+          Sensor.new(dbstore, name, underlying, defs, opts)
+        end
       else
-        p defs, name
-        raise UnknownSensorType, "Couldn't figure out a valid sensor type for #{name}"
+        $stderror.puts "WARNING: Couldn't figure out a valid sensor type for #{name}"
       end
     end
   end

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.1'
-  s.date              = '2020-12-19'
+  s.version           = '0.3.2'
+  s.date              = '2020-12-25'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF
@@ -46,6 +46,7 @@ EOF
     bin/saal_chart
     bin/saal_daemon
     bin/saal_dump_database
+    bin/saal_envoy_generate_config
     bin/saal_envoy_read
     bin/saal_import_mysql
     bin/saal_readall

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Pedro Côrte-Real
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-19 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet