Changeset e397ced for de.wigbels.ruby/hothotread

Timestamp:

03/03/2016 11:44:50 AM (9 years ago)

Author:

Norbert Wigbels <norbert.wigbels@…>

Branches:

master

Children:

8b9b145

Parents:

7e221fe (diff), 20d3261 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of wigbels.net:/var/git/public

Location:

de.wigbels.ruby/hothotread

Files:

• draw_graphs.sh (modified) (2 diffs)
• hothotpiper_gas.rb (modified) (3 diffs)
• hothotpiper_power.rb (modified) (2 diffs)
• web/index.html (modified) (2 diffs)

de.wigbels.ruby/hothotread/draw_graphs.sh

@@ -1 +1 @@
 #!/bin/bash 
 
+rrdtool graph web/gas_3hour.png -s 'now - 3 hour' -e 'now' DEF:consum=gasneu.rrd:consum:AVERAGE CDEF:conph=consum,3600,* CDEF:conpd=conph,24,* VDEF:gastotal=conpd,AVERAGE GPRINT:gastotal:"Total %4.2lf m³/d" LINE2:conph#c17d11:m³/h 
+rrdtool graph web/gas_6hour.png -s 'now - 6 hour' -e 'now' DEF:consum=gasneu.rrd:consum:AVERAGE CDEF:conph=consum,3600,* CDEF:conpd=conph,24,* VDEF:gastotal=conpd,AVERAGE GPRINT:gastotal:"Total %4.2lf m³/d" LINE2:conph#c17d11:m³/h 
+rrdtool graph web/gas_12hour.png -s 'now - 12 hour' -e 'now' DEF:consum=gasneu.rrd:consum:AVERAGE CDEF:conph=consum,3600,* CDEF:conpd=conph,24,* VDEF:gastotal=conpd,AVERAGE GPRINT:gastotal:"Total %4.2lf m³/d" LINE2:conph#c17d11:m³/h 
 rrdtool graph web/gas_1tag.png -s 'now - 1 day' -e 'now' DEF:consum=gasneu.rrd:consum:AVERAGE CDEF:conph=consum,3600,* CDEF:conpd=conph,24,* VDEF:gastotal=conpd,AVERAGE GPRINT:gastotal:"Total %4.2lf m³/d" LINE2:conph#c17d11:m³/h 
 rrdtool graph web/gas_1week.png -s 'now - 1 week' -e 'now' DEF:consum=gasneu.rrd:consum:AVERAGE CDEF:conpd=consum,3600,*,24,* LINE2:conpd#c17d11:m³/h 
@@ -10 +13 @@
 
 
+rrdtool graph web/consum_10minutes.png   -s 'now -10 minutes' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+rrdtool graph web/consum_30minutes.png   -s 'now -30 minutes' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+rrdtool graph web/consum_1hour.png   -s 'now -1 hour' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch[W]"
+rrdtool graph web/consum_3hour.png   -s 'now -3 hour' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+rrdtool graph web/consum_6hour.png   -s 'now -6 hour' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+rrdtool graph web/consum_12hour.png   -s 'now -12 hour' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
 rrdtool graph web/consum_1day.png   -s 'now -1 day' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
 rrdtool graph web/consum_1week.png   -s 'now -1 week' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"

de.wigbels.ruby/hothotread/hothotpiper_gas.rb

@@ -1 +1 @@
 #!/usr/bin/env ruby
+require 'pi_piper'
+require 'eventmachine'
 
-require 'pi_piper'
 include PiPiper
+
 
 mypath = File.expand_path(File.dirname(__FILE__))
@@ -9 +11 @@
 counter = 0.0
 timestamp =  Time.now.to_i
+
 
 def last_rrd_count(concretepath)
@@ -28 +31 @@
 end
 
+
 rrdpath = mypath + "/gasneu.rrd"
 counter = last_rrd_count(rrdpath)
-puts('Counter restored to: '+counter.to_s)
+puts('Counter restored to: ' + counter.to_s)
 
-loop do
-  if trigger_watch == 1 then
-    counter = counter + trigger_step
-    system("rrdtool update #{rrdpath} N:#{counter}:#{trigger_step}")
-    puts('Counter updated to: '+counter.to_s)
-    timestamp =  Time.now.to_i
-    trigger_watch = 0
-  elsif Time.now.to_i - timestamp > 3600
-    system("rrdtool update #{rrdpath} N:#{counter}:0")
-    timestamp = Time.now.to_i
+
+EventMachine.run do
+  EM.add_periodic_timer(1) do
+    if trigger_watch == 1 then
+      counter = counter + trigger_step
+      system("rrdtool update #{rrdpath} N:#{counter}:#{trigger_step}")
+      puts('Counter updated to: ' + counter.to_s)
+      timestamp =  Time.now.to_i
+      trigger_watch = 0
+    elsif Time.now.to_i - timestamp > 3600
+      system("rrdtool update #{rrdpath} N:#{counter}:0")
+      timestamp = Time.now.to_i
+    end
   end
-  sleep(1)
 end
 

de.wigbels.ruby/hothotread/hothotpiper_power.rb

@@ -1 +1 @@
 require 'pi_piper'
+require 'eventmachine'
+
 include PiPiper
+
 
 mypath = File.expand_path(File.dirname(__FILE__))
 trigger_step = 1.0 / 96
+trigger_watch = 0
 counter = 0
+
 
 def last_rrd_count(concretepath)
@@ -19 +24 @@
 end
 
-
 watch :pin => 11, :trigger => :falling  do
   puts('updated power consumption')
-  counter = counter + trigger_step
-  trigger_update = trigger_step * 3600000.0
-  system("rrdtool update #{rrdpath} N:#{counter}:#{trigger_update}")
+  trigger_watch = 1
 end
+
 
 rrdpath = mypath + "/power.rrd"
 counter = last_rrd_count(rrdpath)
-PiPiper.wait
+puts('Counter restored to: ' + counter.to_s)
+
+
+EventMachine.run do
+  EM.add_periodic_timer(1) do
+    if trigger_watch == 1 then
+      counter = counter + trigger_step
+      trigger_update = trigger_step * 3600000.0
+      system("rrdtool update #{rrdpath} N:#{counter}:#{trigger_update}")
+      puts('Counter updated to: ' + counter.to_s)
+      trigger_watch = 0
+    end
+  end
+end

de.wigbels.ruby/hothotread/web/index.html

@@ -3 +3 @@
 <body>
 
+<h2>Temperatur</h2>
+<img src="../temperatur_1tag.png">
+
 <h2>Gas</h2>
+<img src="gas_3hour.png">
+<img src="gas_6hour.png">
+<img src="gas_12hour.png">
 <img src="gas_1tag.png">
 <img src="gas_1week.png">
@@ -12 +18 @@
 
 <h2>Strom</h2>
+<img src="consum_10minutes.png">
+<img src="consum_30minutes.png">
+<img src="consum_1hour.png">
+<img src="consum_3hour.png">
+<img src="consum_6hour.png">
+<img src="consum_12hour.png">
 <img src="consum_1day.png">
 <img src="consum_1week.png">