saal 0.2.24 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 90aa53b1093427163af28bee630532e79ccefea47de44463641c3e387f038640
+  data.tar.gz: 41fca314cb32d91ca10bfb1982cf7e60a6b584c3c521b8ddcd148b18f465fd86
+SHA512:
+  metadata.gz: ff26de3ff3cca4750a365b9672a82165d449f7c11fb3bd57d7f3f27758636a521d766ae99dc84b50cd30e940453eb30826ad485e44f9e50d723bb5625cd07915
+  data.tar.gz: f93e18eacc3a2eb6555c95b9ea91f74506a39af91c6083ab6dbb3acc1ef2d83387db9ed59a573afcb7bbd1354cfdf7af51ec11122d9f48f287baf273c235debf

data/bin/saal_chart

@@ -16,7 +16,11 @@ if ARGV.size != 1
   exit (2)
 end
 
-SENSOR_RANGES = {:temperature=>[-15, 45], :humidity=>[0,100], :pressure=>[950,1050]}
+MAX_RANGES = {:temperature=>[-10,70], 
+              :humidity=>[0,110], 
+              :pressure=>[900,1200]}
+
+TYPES = {:temperature => "ºC", :humidity => "%", :pressure => "hPa"}
 
 
 SAAL::Charts.new.each do |chart|
@@ -57,9 +61,35 @@ SAAL::Charts.new.each do |chart|
                NUM_VALUES_SMALL
 
   @averages = chart.average(num_values)
+  @ranges = {}
+
+  # First find the smallest interval that fits all sensors for each type
+  @data = chart.sensors.map do |sensor|
+    avgs = @averages[sensor.name.to_sym]
+
+    min = avgs.select{|o| o != nil}.min
+    max = avgs.select{|o| o != nil}.max
+    if min and max
+      range = [(min/5).floor*5, (max/5).ceil*5]
+      @ranges[sensor.sensor_type] ||= range
+      previous = @ranges[sensor.sensor_type]
+      @ranges[sensor.sensor_type] = [[range[0],previous[0]].min, 
+                                     [range[1],previous[1]].max]
+    end
+  end
 
+  # Then clip those intervals to MAX_RANGES
   @data = chart.sensors.map do |sensor|
-    normalize_data(@averages[sensor.name.to_sym], *(SENSOR_RANGES[sensor.sensor_type]))
+    maxrange = MAX_RANGES[sensor.sensor_type]
+    @ranges[sensor.sensor_type] ||= maxrange
+    previous = @ranges[sensor.sensor_type]
+    @ranges[sensor.sensor_type] = [[maxrange[0],previous[0]].max, 
+                                   [maxrange[1],previous[1]].min]
+  end
+
+  # Finally use those intervals to normalize the data
+  @data = chart.sensors.map do |sensor|
+    normalize_data(@averages[sensor.name.to_sym], *@ranges[sensor.sensor_type])
   end
 
   @dataurl = @data.map {|values| values.join(",")}.join('|')
@@ -74,12 +104,27 @@ SAAL::Charts.new.each do |chart|
   end
   @xincr = 100.0/@numperiods.to_f*10000.truncate.to_f/10000
 
+  @axes = []
+  @ranges.each do |type, range| 
+    min,max = range
+    step = (max-min).to_f/4.0
+    steps = (0..4).map{|i| (min+i*step).to_i.to_s}
+    steps[0] = "#{min} #{TYPES[type]}"
+    steps[4] = "#{max} #{TYPES[type]}"
+    @axes << steps.join("||")
+  end
+  # Duplicate the axis if there's only one
+  @axes *= 2 if @axes.size == 1
+  # Alternate between left and right axes
+  @axisset = (['y','r']*@axes.size)[0..@axes.size-1].join(",")
+  @axes = @axes.each_with_index.map {|a,i| "#{i+1}:|#{a}"}.join("|")
+
   r[:chof] = "png"
   r[:chs] = "700x300"
   r[:cht] = "lc"
   r[:chco] = "00ff00,ff0000,0000ff,ff9933,800080"
-  r[:chxt] = "x,y,y,r"
-  r[:chxl] = "0:#{@periodnamesurl}1:|-15ºC||0||15||30||45ºC|2:|0%|25|50|75|100%|3:|950||975||1000||1025||1050 hPa"
+  r[:chxt] = "x,#{@axisset}"
+  r[:chxl] = "0:#{@periodnamesurl}#{@axes}"
   r[:chg] = "#{@xincr},12.5,1,5"
   r[:chd] = "t:#{@dataurl}"
 

data/bin/saal_denkovi_relays

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/saal.rb'
+
+def usage
+  $stderr.puts "USAGE: saal_denkovi_relays <host>"
+  $stderr.puts "USAGE: saal_denkovi_relays <host> <num> <ON/OFF>"
+end
+
+if ARGV.size != 1 && ARGV.size != 3
+  usage()
+  exit(1)
+end
+
+denkovi = SAAL::Denkovi::OutletGroup::new(
+  :host => ARGV[0],
+)
+
+if ARGV.size == 3
+  num = ARGV[1].to_i
+  newstate = ARGV[2]
+  if !["ON","OFF"].include? newstate
+    $stderr.puts "ERROR: Unknown state '#{newstate}'"
+    usage()
+    exit(1)
+  end
+  puts "Setting Relay #{num} to #{newstate}"
+  denkovi.set_state(num, newstate)
+end
+
+(1..16).each do |num|
+  puts "Relay #{num} is #{denkovi.state(num)}"
+end
+

data/bin/saal_envoy_generate_config

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/saal.rb'
+
+if ARGV.size != 1 && ARGV.size != 3
+  $stderr.puts "USAGE: saal_envoy_generate_config <host> [<user> <password>]"
+  exit(1)
+end
+
+puts "power:"
+puts "  envoy_power_energy:"
+puts "    host: \"#{ARGV[0]}\""
+puts
+puts "ac:"
+puts "  envoy_ac_quality:"
+puts "    host: \"#{ARGV[0]}\""
+
+user = "envoy"
+password = nil
+
+if ARGV[2]
+  user = ARGV[1]
+  password = ARGV[2]
+else
+  Net::HTTP.get(ARGV[0], '/home').split("\n").each do |line|
+    if line.include?("serial:")
+      password = line.split('"')[1][-6..-1]
+    end
+  end
+  if !password
+    $stderr.puts "Couldn't find serial number for envoy"
+    exit 2
+  end
+end
+
+envoy = SAAL::Envoy::Inverters::new(
+  :host => ARGV[0],
+  :user => user,
+  :password => password,
+)
+envoy.set_all_inverters!
+exit 0 if envoy.inverters.size <= 0
+
+puts
+puts "inverters:"
+puts "  envoy_inverters:"
+puts "    host: \"#{ARGV[0]}\""
+puts "    user: \"#{user}\""
+puts "    password: \"#{password}\""
+puts "    inverters:"
+envoy.inverters.each do |serial|
+  puts "    - #{serial}"
+end

data/bin/saal_envoy_read

@@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/saal.rb'
+
+if ARGV.size != 3
+  $stderr.puts "USAGE: saal_envoy_read <host> <user> <password>"
+  exit(1)
+end
+
+def fdisp(val)
+  if val
+    '%10.0f' % val
+  else
+    "       n/a"
+  end
+end
+
+def fdispk(val)
+  if val
+    '%10.2f' % (val / 1000.0)
+  else
+    "       n/a"
+  end
+end
+
+def fdisp_dec(val)
+  if val
+    '%10.2f' % val
+  else
+    "       n/a"
+  end
+end
+
+def l(vals, name)
+  sensor = vals[name]
+  if sensor
+    sensor.read
+  else
+    nil
+  end
+end
+
+def lratio(vals, name1, name2)
+  v1 = l(vals, name1)
+  v2 = l(vals, name2)
+  if v1 && v2
+    v1 / v2
+  else
+    nil
+  end
+end
+
+ac_quality = SAAL::Envoy::ACQuality::new(:host => ARGV[0]).create_sensors
+
+puts " ========= AC QUALITY ========"
+puts "        voltage (V)  freq (Hz)"
+def qual_line(vals,name, type)
+  puts " #{name} \
+#{fdisp_dec(l(vals,"ac_#{type}_voltage"))} \
+#{fdisp_dec(l(vals,"ac_#{type}_frequency"))} \
+"
+end
+qual_line(ac_quality, "Total: ", "total")
+qual_line(ac_quality, "Phase1:", "phase1")
+qual_line(ac_quality, "Phase2:", "phase2")
+qual_line(ac_quality, "Phase3:", "phase3")
+
+production = SAAL::Envoy::PowerEnergy::new(:host => ARGV[0]).create_sensors
+
+puts ""
+puts " ============ TRUE POWER (W) ============  ======= TRUE ENERGY (kWh) ======="
+puts "        consumption production        net  consumption production        net"
+def p_line(vals, name, type, metric)
+  puts " #{name} \
+#{fdisp(l(vals,"pv_total_consumption_#{type}_#{metric}_now"))} \
+#{fdisp(l(vals,"pv_production_#{type}_#{metric}_now"))} \
+#{fdisp(l(vals,"pv_net_consumption_#{type}_#{metric}_now"))}   \
+#{fdispk(l(vals,"pv_total_consumption_#{type}_#{metric}h_lifetime"))} \
+#{fdispk(l(vals,"pv_production_#{type}_#{metric}h_lifetime"))} \
+#{fdispk(l(vals,"pv_net_consumption_#{type}_#{metric}h_lifetime"))} \
+"
+end
+p_line(production, "Total: ", "total", "w")
+p_line(production, "Phase1:", "phase1", "w")
+p_line(production, "Phase2:", "phase2", "w")
+p_line(production, "Phase3:", "phase3", "w")
+puts " Total Inverters:   \
+#{fdisp(l(production,"pv_production_inverters_w_now"))} \
+                        \
+#{fdispk(l(production,"pv_production_inverters_wh_lifetime"))} \
+"
+
+puts ""
+puts " ========== APPARENT POWER (VA) ========= ===== APPARENT ENERGY (kVAh) ===="
+puts "        consumption production        net  consumption production        net"
+p_line(production, "Total: ", "total", "va")
+p_line(production, "Phase1:", "phase1", "va")
+p_line(production, "Phase2:", "phase2", "va")
+p_line(production, "Phase3:", "phase3", "va")
+
+def pf_line(vals, name, type, metric)
+  pf_total_consumption_instant = lratio(vals,"pv_total_consumption_#{type}_w_now","pv_total_consumption_#{type}_va_now")
+  pf_total_production_instant = lratio(vals,"pv_production_#{type}_w_now","pv_production_#{type}_va_now")
+  pf_net_production_instant = lratio(vals,"pv_net_consumption_#{type}_w_now","pv_net_consumption_#{type}_va_now")
+
+  pf_total_consumption_lifetime = lratio(vals,"pv_total_consumption_#{type}_wh_lifetime","pv_total_consumption_#{type}_vah_lifetime")
+  pf_total_production_lifetime = lratio(vals,"pv_production_#{type}_wh_lifetime","pv_production_#{type}_vah_lifetime")
+  pf_net_production_lifetime = lratio(vals,"pv_net_consumption_#{type}_wh_lifetime","pv_net_consumption_#{type}_vah_lifetime")
+
+  puts " #{name} \
+#{fdisp_dec(pf_total_consumption_instant)} \
+#{fdisp_dec(pf_total_production_instant)} \
+#{fdisp_dec(pf_net_production_instant)}   \
+#{fdisp_dec(pf_total_consumption_lifetime)} \
+#{fdisp_dec(pf_total_production_lifetime)} \
+#{fdisp_dec(pf_net_production_lifetime)} \
+"
+end
+
+puts ""
+puts " ========= INSTANT POWER FACTOR ========= ====== LIFETIME POWER FACTOR ====="
+puts "        consumption production        net  consumption production        net"
+pf_line(production, "Total: ", "total", "va")
+pf_line(production, "Phase1:", "phase1", "va")
+pf_line(production, "Phase2:", "phase2", "va")
+pf_line(production, "Phase3:", "phase3", "va")
+
+puts ""
+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"
+envoy.inverters.each do |serial|
+  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/chart.rb

@@ -5,7 +5,7 @@ module SAAL
       @name = name
       @defs = defs
       @alignlabels = (defs['alignlabels'] || :center).to_sym
-      @sensors = defs['sensors'].map{|name| sensors.send(name)} 
+      @sensors = defs['sensors'].map{|sname| sensors.send(sname)}
       @num = defs['last']
       @periods = defs['periods']
       @alt = defs['alt']

data/lib/chart_data.rb

@@ -39,7 +39,7 @@ module SAAL
       (0..num-2).map do |i|
         f = t + 1
         t = (f+step)
-        v = sensor.send(method, f.to_i, t.to_i)
+        _v = sensor.send(method, f.to_i, t.to_i)
       end << sensor.send(method, (t+1).to_i, to.to_i)
     end
 

data/lib/dbstore.rb

@@ -46,54 +46,51 @@ module SAAL
                   WHERE sensor = '#{db_quote(sensor.to_s)}'
                   AND date > '#{Time.now.utc.to_i - MAX_LAST_VAL_AGE}'
                   ORDER BY date DESC LIMIT 1" do |r|
-        if r.num_rows == 0
-          return nil
+        row = r.first
+        if row
+          _date, value = [row["date"].to_i, row["value"].to_f]
+          value
         else
-          row = r.fetch_row
-          date, value = [row[0].to_i, row[1].to_f]
-          return value
+          nil
         end
       end
     end
 
     def each
       db_query "SELECT sensor,date,value FROM sensor_reads" do |r|
-        r.num_rows.times do
-          row = r.fetch_row
-          yield [row[0],row[1].to_i, row[2].to_f]
+        r.each do |row|
+          yield [row["sensor"],row["date"].to_i, row["value"].to_f]
         end
       end
     end
     
     private
     def db_range(function, sensor, from, to)
-      db_query "SELECT #{function}(value) AS average FROM sensor_reads
+      db_query "SELECT #{function}(value) AS func FROM sensor_reads
                        WHERE sensor = '#{db_quote(sensor.to_s)}' 
                          AND date >= #{from.to_s} 
                          AND date <= #{to.to_s}" do |r|
-        if r.num_rows == 0 
-          nil
+        row = r.first
+        if row && row["func"]
+          row["func"].to_f
         else
-          row = r.fetch_row
-          row[0] ? row[0].to_f : nil
+          nil
         end
       end
     end
 
     def db_quote(text)
-      Mysql.quote(text)
+      Mysql2::Client.escape(text)
     end
 
     def db_query(query, opts={})
       db = nil
       begin
         # connect to the MySQL server
-        db = Mysql.new(@dbopts['host'],@dbopts['user'],@dbopts['pass'],
-                       @dbopts['db'],@dbopts['port'],@dbopts['socket'],
-                       @dbopts['flags'])
+        db = Mysql2::Client.new(@dbopts)
         res = db.query(query)
         yield res if block_given?
-      rescue Mysql::Error => e
+      rescue Mysql2::Error => e
         $stderr.puts "MySQL Error #{e.errno}: #{e.error}" if !(e.errno == opts[:ignoreerr])
       ensure
         db.close if db

data/lib/denkovi.rb

@@ -0,0 +1,101 @@
+require 'net/http'
+require 'json'
+
+module SAAL
+  module Denkovi
+    class Outlet < SensorUnderlying
+      writeable!
+
+      def initialize(num, outletgroup)
+        @num = num
+        @og = outletgroup
+      end
+
+      def sensor_type
+        :onoff
+      end
+
+      def read(uncached = false)
+        {'ON' => 1.0, 'OFF' => 0.0}[@og.state(@num)]
+      end
+
+      def write(value)
+        newstate = {1.0 => 'ON', 0.0 => 'OFF'}[value]
+        if newstate
+          @og.set_state(@num,newstate)
+          value
+        end
+      end
+    end
+
+    class OutletGroup
+      DEFAULT_TIMEOUT = 2
+      DEFAULT_CACHE_TIMEOUT = 60
+      DEFAULT_OUTLETS = {}
+      DEFAULT_DESCRIPTIONS = {}
+
+      attr_accessor :host, :port, :pass, :timeout, :cache_timeout
+
+      def initialize(opts={})
+        @host = opts[:host] || opts['host'] || 'localhost'
+        @port = opts[:port] || opts['port'] || 80
+        @pass = opts[:pass] || opts['pass'] || 'admin'
+        @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
+        @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
+        @outlets = opts[:outlets] || opts["outlets"] || DEFAULT_OUTLETS
+        @descriptions = opts[:descriptions] || opts["descriptions"] || DEFAULT_DESCRIPTIONS
+        @cache = nil
+        @cachehit = nil
+        @cachetime = nil
+      end
+
+      def state(num)
+        if !@cachetime or @cachetime < Time.now - @cache_timeout
+          @cache = do_get("/current_state.json?pw=#{@pass}")
+          @cachetime = Time.now
+        end
+        return nil if !@cache
+        json = JSON.parse(@cache.body)
+        num = num - 1
+        if json &&
+           json["CurrentState"] &&
+           json["CurrentState"]["Output"] &&
+           json["CurrentState"]["Output"][num] &&
+           json["CurrentState"]["Output"][num]["Value"]
+           val = json["CurrentState"]["Output"][num]["Value"]
+           {"1" => "ON", "0" => "OFF"}[val]
+        else
+          nil
+        end
+      end
+
+      def set_state(num, state)
+        @cachetime = nil
+        val = {"ON" => "1", "OFF" => "0"}[state]
+        if val
+          response = do_get("/current_state.json?pw=#{@pass}&Relay#{num}=#{val}")
+          response != nil
+        else
+          false
+        end
+      end
+
+      def create_sensors
+        sensors = {}
+        (1..16).each do |num|
+          name = @outlets[num]
+          if name
+            description = @descriptions[num] || ""
+            sensors[name] = [Outlet.new(num, self), description]
+          end
+        end
+        sensors
+      end
+
+      private
+      def do_get(path)
+        SAAL::do_http_get(@host, @port, path, nil, nil, @timeout)
+      end
+    end
+  end
+end