Changeset c22952c for de.wigbels.ruby/hothotread

Timestamp:

12/05/2015 09:53:28 PM (9 years ago)

Author:

Norbert Wigbels <njw@…>

Branches:

master

Children:

8cc14b9

Parents:

b342b88

Message:

Stromzaehler

Location:

de.wigbels.ruby/hothotread

Files:

• archiv/hothotread.rb (moved) (moved from de.wigbels.ruby/hothotread/hothotread.rb )
• archiv/sockconnect.rb (moved) (moved from de.wigbels.ruby/hothotread/bla.rb )
• draw_graphs.sh (modified) (3 diffs)
• hothotpiper.rb (modified) (2 diffs)
• info/created_rrd_engergy_through (added)
• lastupdate.rb (added)
• web/gas_1monat.png (modified) ( previous)
• web/gas_1tag.png (modified) ( previous)
• web/gas_1woche.png (modified) ( previous)
• web/index.html (modified) (1 diff)

de.wigbels.ruby/hothotread/draw_graphs.sh

@@ -11 +11 @@
 CDEF:gash=gas,120,* \
 VDEF:gastotal=gas,TOTAL \
-GPRINT:gastotal:"Total %6.0lf m3 Gas" \
+GPRINT:gastotal:"Total %6.0lf Liter Gas" \
 LINE2:gash#c17d11:"Gasverbrauch"
 
@@ -22 +22 @@
 CDEF:gasd=gas,2880,* \
 VDEF:gastotal=gas,TOTAL \
-GPRINT:gastotal:"Total %6.0lf m3 Gas" \
+GPRINT:gastotal:"Total %6.0lf Liter Gas" \
 LINE2:gasd#c17d11:"Gasverbrauch/Tag"
 
@@ -33 +33 @@
 CDEF:gasd=gas,2880,* \
 VDEF:gastotal=gas,TOTAL \
-GPRINT:gastotal:"Total %6.0lf m3 Gas" \
+GPRINT:gastotal:"Total %6.0lf Liter Gas" \
 LINE2:gasd#c17d11:"Gasverbrauch/Tag"
 
+rrdtool graph web/gas_1jahr.png \
+-w 800 -h 500 \
+-s 'now - 1 year' -e 'now' \
+--title "Gasverbrauch im Jahresverlauf" \
+--font TITLE:12 --vertical-label="Liter/Tag" \
+DEF:gas=gas.rrd:gas:AVERAGE \
+CDEF:gasd=gas,2880,* \
+VDEF:gastotal=gas,TOTAL \
+GPRINT:gastotal:"Total %6.0lf Liter Gas" \
+LINE2:gasd#c17d11:"Gasverbrauch/Tag"
+
+
+
+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]"
+rrdtool graph web/consum_1month.png   -s 'now -1 month' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+rrdtool graph web/consum_1year.png   -s 'now -1 year' -e 'now'   -Y -A   DEF:consum=power.rrd:consum:AVERAGE   LINE2:consum#00FF00:"Verbrauch [W]"
+
+rrdtool graph web/counter_1week.png   -s 'now -1 week' -e 'now'   -X 0 -Y -A   DEF:counter=power.rrd:counter:LAST   LINE2:counter#000000:"ZÀhlerstand [kWh]"
+rrdtool graph web/counter_1month.png   -s 'now -1 month' -e 'now'   -X 0 -Y -A   DEF:counter=power.rrd:counter:LAST   LINE2:counter#000000:"ZÀhlerstand [kWh]"

de.wigbels.ruby/hothotread/hothotpiper.rb

@@ -19 +19 @@
 
 #------------------------------------------
-require 'net/http'
 require 'pi_piper'
-
 include PiPiper
 
@@ -27 +25 @@
 
 
+def last_rrd_count
+  val = 0.0
+  handle = IO.popen("rrdtool lastupdate #{$mypath}/power.rrd")
+  handle.each_line do |line|
+    m = line.match("^[0-9]*: ([0-9.]*) [0-9.]*")
+    if m
+      val = m[1].to_f
+      break
+    end
+  end
+  return val
+end
+
+
 watch :pin => 4, :trigger => :falling do 
   puts('added 10 liter of gas to sensor-database')
-  Net::HTTP.get(URI.parse('http://www.wigbels.net/cgi-bin/hhw.rb?sensorid=1&data=10'))
   system("rrdtool update #{$mypath}/gas.rrd N:10")
 end
 
+watch :pin => 11, :trigger => :falling  do
+  puts('updated power consumption')
+  $counter = $counter + $trigger_step
+  trigger_update = $trigger_step * 3600000.0
+  system("rrdtool update #{$mypath}/power.rrd N:#{$counter}:#{trigger_update}")
+end
+
+$trigger_step = 1.0 / 96
+$counter = last_rrd_count
+
 PiPiper.wait

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

@@ -7 +7 @@
 <img src="gas_1woche.png">
 <img src="gas_1monat.png">
+<img src="gas_1jahr.png">
+
+<h2>Strom</h2>
+<img src="consum_1day.png">
+<img src="consum_1week.png">
+<img src="consum_1month.png">
+<img src="consum_1year.png">
+<img src="counter_1month.png">
+<img src="counter_1week.png">
 
 </body>