Changeset 1801b32

Timestamp:

12/09/2015 07:47:17 PM (9 years ago)

Author:

Norbert Wigbels <njw@…>

Branches:

master

Children:

7fbafc7

Parents:

b62bf13

Message:

Auf Eventmachine umgebaut

Location:

de.wigbels.ruby

Files:

• hotcoldrain/weather.rrd (modified) ( previous)
• hothotread/hothotpiper_gas.rb (modified) (3 diffs)
• hothotread/hothotpiper_power.rb (modified) (2 diffs)

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