Changeset af9afaf for de.wigbels.ruby

Timestamp:

Nov 23, 2014, 8:52:47 AM (9 years ago)

Author:

njw <njw@…>

Branches:

master

Children:

daaef3e

Parents:

516b934

Message:

RRD Support, Testing mit MQTT

Location:

de.wigbels.ruby/hotcoldrain

Files:

• draw_graphs.sh (added)
• hotcoldrain.rb (modified) (3 diffs)

de.wigbels.ruby/hotcoldrain/hotcoldrain.rb

@@ -28 +28 @@
   end
 
+  def logOutReadableData(datagrams)
+    puts "TemperaturUnten: " + datagrams[3]
+    puts "LuftfeuchtigkeitUnten: " + datagrams[11]
+    puts
+    puts "TemperaturOben: " + datagrams[4]
+    puts "LuftfeuchtigkeitOben: " + datagrams[12]
+    puts        
+    puts "TemperaturAussen: " + datagrams[19]
+    puts "LuftfeuchtigkeitAussen: " + datagrams[20]
+    puts "Windgeschwindigkeit km/h: " + datagrams[21]
+    puts "Niederschlag: " + datagrams[22]
+    puts "Regen ja/nein: " + datagrams[23]        
+    puts "---------------------"
+  end
+
   def run
     begin
       while true do
         openformat = @serialport.readline
+        #openformat = "$1;1;;21,3;20,0;;;;;;;50;55;;;;;;;4,9;74;3,0;6;0;0"
         datagrams = openformat.split(';')
-#        puts openformat
-        puts "TemperaturUnten: " + datagrams[3]
-        puts "LuftfeuchtigkeitUnten: " + datagrams[11]
-        puts
-        puts "TemperaturOben: " + datagrams[4]
-        puts "LuftfeuchtigkeitOben: " + datagrams[12]
-        puts        
-        puts "TemperaturAussen: " + datagrams[19]
-        puts "LuftfeuchtigkeitAussen: " + datagrams[20]
-        puts "Windgeschwindigkeit km/h: " + datagrams[21]
-        puts "Niederschlag: " + datagrams[22]
-        puts "Regen ja/nein: " + datagrams[23]        
-        puts "---------------------"
+
+        logOutReadableData(datagrams)
+
+        # $1;1;;21,3;20,0;;;;;;;50;55;;;;;;;4,9;74;3,0;6;0;0
+        # extract only data
+        # then replace empty data with U
+        # then localize float value
+        # finally prepare updatestring for rrdtool
+        datagrams = datagrams.values_at(3..23)
+        datagrams.collect! { |element| (element.empty?) ? "U" : element }
+        datagrams.collect! { |element| (element.include? ',') ? element.sub!(',','.') : element }
+        rrddata = 'N:'+datagrams.join(':')
+
+        system("rrdtool update weather.rrd #{rrddata}")
+
         MQTT::Client.connect('mqtt://notwist:pixies@wigbels.net') do |c|
-          c.publish('oben/temperatur', datagrams[3])
+          c.publish('oben/temperatur', datagrams[0])
         end
         #log(INFO, 'added 100 liter of gas to sensor-database')
@@ -58 +76 @@
       @serialport.close
     end
-#    puts "Filename: "+__FILE__.to_s
-#    puts "Linenumber: "+__LINE__.to_s
-#    log(WARN, 'warning',  'mymethod' )
-#    @log.error('my_method2') { 'Error!' }
   end
 end
@@ -69 +83 @@
 status = HotColdRain.new("HotColdRain").start
 
-#if status != 0
-#  puts "Some error occured."
-#endd
 
 
 
 
-
-