Changeset e397ced for de.wigbels.ruby/hothotread/hothotpiper_power.rb

Timestamp:

Mar 3, 2016, 11:44:50 AM (8 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

File:

• de.wigbels.ruby/hothotread/hothotpiper_power.rb (modified) (2 diffs)

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