rm v0 v1

15 files changed, 0 insertions, 511 deletions

diff --git a/known-devices.yaml b/config/config.yaml
index 0986e39..0986e39 100644
--- a/known-devices.yaml
+++ b/config/config.yaml
diff --git a/v1/DEVICES b/v1/DEVICES
deleted file mode 100644
index 295a76a..0000000
--- a/v1/DEVICES
+++ /dev/null
@@ -1,10 +0,0 @@
-Berlin
-======
-- Inside: THGR810, THGN800
-- Outside: BTHR918
-
-HDH
-===
-- Wind '04:00'
-- Rain 'eb:00', '7d:00', '02:00'
-- Temp '10:02', 'ec:01', '25:01', '62:02', 'd9:00', '2a:0e', '60:01'
diff --git a/v1/README b/v1/README
deleted file mode 100644
index fb0448f..0000000
--- a/v1/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Dependencies:
-  Ruby
-    sqlite3
-  Python
-    pyRFXtrx
-
-```
-./create-db.rb
-``
-
-Time is in UTC.
diff --git a/v1/create-db.rb b/v1/create-db.rb
deleted file mode 100755
index 2866b7b..0000000
--- a/v1/create-db.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'sqlite3'
-
-db = SQLite3::Database.new("weather.db")
-
-db.execute <<-SQL
-          create table rain(
-           id INTEGER PRIMARY KEY,
-           timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
-           device_type TEXT,
-           device_id TEXT,
-           battery INTEGER,
-           rssi INTEGER,
-           rain_rate FLOAT,
-           rain_total FLOAT
-         );
-        SQL
-db.execute <<-SQL
-          create table wind(
-           id INTEGER PRIMARY KEY,
-           timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
-           device_type TEXT,
-           device_id TEXT,
-           battery INTEGER,
-           rssi INTEGER,
-           chill FLOAT,
-           temperature FLOAT,
-           average_speed FLOAT,
-           direction INTEGER,
-           gust FLOAT
-         );
-        SQL
-db.execute <<-SQL
-          create table temp(
-           id INTEGER PRIMARY KEY,
-           timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
-           device_type TEXT,
-           device_id TEXT,
-           battery INTEGER,
-           rssi INTEGER,
-           humidity FLOAT,
-           humidity_status TEXT,
-           humidity_status_numeric INTEGER,
-           temperature FLOAT,
-           forecast TEXT,
-           forecast_numeric INTEGER
-         );
-        SQL
-
-db.close
diff --git a/v1/fill-db-from-log.rb b/v1/fill-db-from-log.rb
deleted file mode 100755
index 1fb2ab3..0000000
--- a/v1/fill-db-from-log.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'sqlite3'
-
-
-int = Proc.new do  |x|
-  x.to_i
-end
-float = Proc.new do |x|
-  x.to_f
-end
-str = Proc.new do |x|
-  x.to_s
-end
-common_conv = { "db" => str, "timestamp"=>float, "device_type"=>str, "type"=>str, "device_id"=>str, "battery" => int, "battery_numeric" => int, "rssi" => int, "rssi_numeric" => int }
-rain_conv = {"rain_rate"=>float, "rain_total"=>float}.merge(common_conv)
-wind_conv = {"chill"=>float, "temperature"=>float,"average_speed"=>float,"direction"=>int,"gust"=>float}.merge(common_conv)
-temp_conv = {"humidity"=>float, "humidity_status"=>str,"humidity_status_numeric"=>int,"temperature"=>float,"barometer"=>float,"forecast"=>str,"forecast_numeric"=>int}.merge(common_conv)
-conv = { "rain" => rain_conv, "wind" => wind_conv, "temp" => temp_conv }
-
-$db = SQLite3::Database.new("weather.db")
-
-
-def parse_to_hash s, conv, type
-  h = {}
-  begin
-    s.split("\t").map { |i|
-      i=i.split("::")
-      if not conv.keys.include? i[0]
-        STDERR.write "Unknown key '#{i[0]}' in data point of type '#{type}', ignoring!\n"
-      end
-      h[i[0]] = conv[i[0]].call(i[1])
-    }
-  rescue
-    STDERR.write "Cannot parse '#{s.strip}', skipping data point!\n"
-    return false
-  end
-  return h
-end
-
-
-def db_execute s, d
-  begin
-    $db.execute(s, d)
-    rescue SQLite3::BusyException
-      sleep 3
-      begin
-        $db.execute(s, d)
-      rescue SQLite3::BusyException
-        STDERR.write "DB busy, skipping data point '#{d.to_s}'\n"
-      end
-  end
-end
-
-
-def insert_rain h
-  db_execute("INSERT INTO rain(timestamp, device_type, device_id, battery, rssi, rain_rate, rain_total) VALUES(?,?,?,?,?,?,?)", [h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["rain_rate"], h["rain_total"]])
-end
-
-
-def insert_wind h
-  db_execute("INSERT INTO wind(timestamp, device_type, device_id, battery, rssi, chill, temperature, average_speed, direction, gust) VALUES(?,?,?,?,?,?,?,?,?,?)", [h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["chill"], h["temperature"], h["average_speed"], h["direction"], h["gust"]])
-end
-
-
-def insert_temp h
-  if h.keys.include? "forecast"
-    db_execute("INSERT INTO temp(timestamp, device_type, device_id, battery, rssi, humidity, humidity_status, humidity_status_numeric, temperature, forecast, forecast_numeric) VALUES(?,?,?,?,?,?,?,?,?,?,?)",[h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["humidity"], h["humidity_status"], h["humidity_status_numeric"], h["temperature"], h["forecast"], h["forecast_numeric"]])
-  else
-    db_execute("INSERT INTO temp(timestamp, device_type, device_id, battery, rssi, humidity, humidity_status, humidity_status_numeric, temperature) VALUES(?,?,?,?,?,?,?,?,?)",[h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["humidity"], h["humidity_status"], h["humidity_status_numeric"], h["temperature"]])
-  end
-end
-
-
-while line = STDIN.gets
-  break if line.strip=="stop"
-  type = line.split("\t").first.split("::")[1]
-  h = parse_to_hash(line, conv[type], type)
-  if h
-    if type    == "rain"
-      insert_rain h
-    elsif type == "wind"
-      insert_wind h
-    elsif type == "temp"
-      insert_temp h
-    end
-  end
-end
-
-$db.close
diff --git a/v1/fill-db.rb b/v1/fill-db.rb
deleted file mode 100755
index 1bfc0f2..0000000
--- a/v1/fill-db.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'sqlite3'
-
-int = Proc.new do  |x|
-  x.to_i
-end
-float = Proc.new do |x|
-  x.to_f
-end
-str = Proc.new do |x|
-  x.to_s
-end
-common_conv = { "db" => str, "timestamp"=>float, "device_type"=>str, "type"=>str, "device_id"=>str, "battery" => int, "battery_numeric" => int, "rssi" => int, "rssi_numeric" => int }
-rain_conv = {"rain_rate"=>float, "rain_total"=>float}.merge(common_conv)
-wind_conv = {"chill"=>float, "temperature"=>float,"average_speed"=>float,"direction"=>int,"gust"=>float}.merge(common_conv)
-temp_conv = {"humidity"=>float, "humidity_status"=>str,"humidity_status_numeric"=>int,"temperature"=>float}.merge(common_conv)
-conv = { "rain" => rain_conv, "wind" => wind_conv, "temp" => temp_conv }
-
-$db = SQLite3::Database.new("db/weather.db")
-
-def parse_to_hash s, conv
-  h = {}
-  s.split("\t").map { |i| i=i.split("::"); h[i[0]] = conv[i[0]].call(i[1]) }
-  return h
-end
-
-def db_execute s, d
-  begin
-    $db.execute(s, d)
-    rescue SQLite3::BusyException
-      sleep 3
-      begin
-        $db.execute(s, d)
-      rescue SQLite3::BusyException
-        STDERR.write "db busy, skipping data point '#{d.to_s}'\n"
-      end
-  end
-end
-
-def insert_rain h
-  #db::rain  type::PCR800  device_id::eb:00  battery::9  rain_rate::0.0  rain_total::0.9 rssi::6
-  db_execute("INSERT INTO rain(timestamp, device_type, device_id, battery, rssi, rain_rate, rain_total) VALUES(?,?,?,?,?,?,?)", [h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["rain_rate"], h["rain_total"]])
-end
-
-def insert_wind h
-  # db::wind  type::WGR800  device_id::04:00  battery::9  chill::0.0  rssi::5 temperature::0.0  average_speed::0.0  direction::270gust::0.0
-  db_execute("INSERT INTO wind(timestamp, device_type, device_id, battery, rssi, chill, temperature, average_speed, direction, gust) VALUES(?,?,?,?,?,?,?,?,?,?)", [h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["chill"], h["temperature"], h["average_speed"], h["direction"], h["gust"]])
-end
-
-def insert_temp h
-  #db::temp  type::THGR810, THGN800  device_id::10:02  battery::9  humidity::80  humidity_status::wet  humidity_status_numeric::3  rssi::5 temperature::2.6
-  #db::temp  type::THGR810, THGN800  device_id::25:01  battery::0  humidity::94  humidity_status::wet  humidity_status_numeric::3  rssi::6 temperature::1.1
-  db_execute("INSERT INTO temp(timestamp, device_type, device_id, battery, rssi, humidity, humidity_status, humidity_status_numeric, temperature) VALUES(?,?,?,?,?,?,?,?,?)",[h["timestamp"], h["device_type"],h["device_id"], h["battery"], h["rssi"], h["humidity"], h["humidity_status"], h["humidity_status_numeric"], h["temperature"]])
-end
-
-while line = STDIN.gets
-  break if line.strip=="stop"
-  db = line.split("\t").first.split("::")[1]
-  h = parse_to_hash(line, conv[db])
-  if db   == "rain"
-    insert_rain h
-  elsif db == "wind"
-    insert_wind h
-  elsif db == "temp"
-    insert_temp h
-  end
-end
-
-$db.close
-
diff --git a/v1/get-temps.rb b/v1/get-temps.rb
deleted file mode 100755
index f25540b..0000000
--- a/v1/get-temps.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-$devices = { "f4:01" => "outside", "1f:01" => "inside" }
-
-while line = STDIN.gets
-  a = line.split
-  d = {}
-  a.each { |i|
-    name, val = i.split("::")
-    if name == "timestamp"
-      d["timestamp"] = val.to_f
-    end
-    if name == "temperature"
-      d["temperature"] = val.to_f
-    end
-    if name == "device_id"
-      d["dev"] = devices[val]
-    end
-  }
-  puts d.to_s
-end
diff --git a/v1/get-temps.rb.bak b/v1/get-temps.rb.bak
deleted file mode 100755
index ac24051..0000000
--- a/v1/get-temps.rb.bak
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-while line = STDIN.gets
-  a = line.split
-  d = {}
-  a.each { |i|
-    name, val = i.split("::")
-    if name == "temperature"
-      d["temperature"] = val
-    end
-    if name == "device_id"
-      d["dev"] = val
-    end
-  }
-  puts d.to_s
-end
diff --git a/v1/query-db.rb b/v1/query-db.rb
deleted file mode 100755
index 984a59d..0000000
--- a/v1/query-db.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'sqlite3'
-
-db = SQLite3::Database.new("weather.db")
-
-#db.execute("select * from rain") do |result|
-#  puts result.to_s
-#end
-
-#db.execute("select * from wind") do |result|
-#  puts result.to_s
-#end
-
-db.execute("select * from temp") do |result|
-  puts result.to_s
-end
-
-db.close
diff --git a/v1/receive-test.py b/v1/receive-test.py
deleted file mode 100755
index c1d9783..0000000
--- a/v1/receive-test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-from RFXtrx import PySerialTransport
-import sys, datetime, os
-
-
-if __name__ == "__main__":
-    transport = PySerialTransport('/dev/ttyUSB0')
-    transport.reset()
-    while True:
-        if os.path.isfile('./stop'):
-            break
-        timestamp = datetime.datetime.timestamp(datetime.datetime.now())
-        recv = transport.receive_blocking()
-        print(str(recv))
diff --git a/v1/receive.py b/v1/receive.py
deleted file mode 100755
index 71d0a67..0000000
--- a/v1/receive.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-
-from RFXtrx import PySerialTransport
-import sys, datetime, os
-
-
-if __name__ == "__main__":
-    transport = PySerialTransport('/dev/ttyUSB0')
-    transport.reset()
-
-    while True:
-        if os.path.isfile('/home/pks/weather/stop'):
-            break
- 
-        recv = transport.receive_blocking()
-
-        if not recv:
-            continue
-
-        timestamp = datetime.datetime.timestamp(datetime.datetime.now())
- 
-        sys.stderr.write("Raw: %s\n"%str(recv))
- 
-        try:
-            device_id = recv.device.id_string
-            device_type = recv.device.type_string
-        except Exception as e:
-            sys.stderr.write("Cannot find device id, exception %s." % str(e))
-            continue
-
-        data = {}
-        for k,v in recv.values.items():
-            data[k.lower().replace(" ", "_")] = v
- 
-        data_type = None
-        if "rain_rate" in data:
-            data_type = "rain"
-        elif "wind_gust" in data:
-            data_type = "wind"
-        elif "temperature" in data:
-            data_type = "temp"
-        else:
-            sys.stderr.write("Unknown device '%s' with id '%s', ignoring.\n"%(device_type, device_id))
-            continue
-
-
-        out = [ "type::%s" % data_type,
-                "timestamp::%f" % timestamp,
-                "device_type::%s" % device_type,
-                "device_id::%s" % device_id ]
-
-        for key in sorted(data.keys()):
-            out.append("%s::%s" % (key, data[key]))
- 
-        print("\t".join(out))
-        sys.stderr.flush()
-        sys.stdout.flush()
-
-
-sys.stderr.write("stop\n")
-sys.stdout.flush()
diff --git a/v1/run b/v1/run
deleted file mode 100755
index c346553..0000000
--- a/v1/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/zsh -x
-
-source env/bin/activate
-python receive.py 2>received.err | tee received | ./fill-db.rb 2>db.err > db.out
-
diff --git a/v1/test.rb b/v1/test.rb
deleted file mode 100644
index 16ab18a..0000000
--- a/v1/test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-int = Proc.new do  |x|
-  x.to_i
-end
-float = Proc.new do |x|
-  x.to_f
-end
-str = Proc.new do |x|
-  x.to_s
-end
-
-def parse_to_hash s, conv
-  h = {}
-  puts s.split("\t").map { |i| i=i.split("::"); "#{i[0]} #{conv[i[0]].call}" }
-  return h
-end
-
-common_conv = { "db" => str, "timestamp"=>float, "device_type"=>str, "type"=>str, "device_id"=>str, "battery" => int, "battery_numeric" => int, "rssi" => int, "rssi_numeric" => int }
-rain_conv = {"rain_rate"=>float, "rain_total"=>float}.merge(common_conv)
-wind_conv = {"chill"=>float, "temperature"=>float,"average_speed"=>float,"direction"=>int,"gust"=>float}.merge(common_conv)
-temp_conv = {"humidity"=>float, "humidity_status"=>str,"humidity_status_numeric"=>int,"temperature"=>float}.merge(common_conv)
-conv = { "rain" => rain_conv, "wind" => wind_conv, "temp" => temp_conv }
-
-while line = STDIN.gets
-  db = line.split("\t").first.split("::")[1]
-  parse_to_hash line,  conv[db]
-end
-
diff --git a/v1/weather-logger b/v1/weather-logger
deleted file mode 100755
index 84be622..0000000
--- a/v1/weather-logger
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          weather-logger
-# Required-Start:    $all
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: weather-logger
-### END INIT INFO
-
-export SUFFIX=$(date +'%Y-%m-%d-%H:%M:%S')
-export USER=pks
-export DIR=/home/$USER/weather_logger/
-export PYTHONPATH=/home/$USER/.local/lib/python3.7/site-packages/
-
-case "$1" in
-  start)
-    echo "Starting weather-logger"
-    rm -f $DIR/stop
-    #runuser -l $USER -c "source $DIR/env/bin/activate && python $DIR/receive.py 2>$DIR/weather.$SUFFIX.err > $DIR/weather.$SUFFIX.out" &
-    runuser -l $USER -c "python3.7 $DIR/receive.py 2>$DIR/log/weather.$SUFFIX.err > $DIR/log/weather.$SUFFIX.out" &
-    ;;
-  stop)
-    echo "Stopping weather-logger"
-    runuser -l $USER -c "touch $DIR/stop"
-    ;;
-  *)
-    echo "Usage: /etc/init.d/weather-logger {start|stop}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/weather-db-from-old-log b/weather-db-from-old-log
deleted file mode 100755
index 3efa4b1..0000000
--- a/weather-db-from-old-log
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'sqlite3'
-
-# Berlin
-#$device_id_to_handle = {
-#  "b7:01" => "outside",
-#  "ca:01" => "outside",
-#  "d5:01" => "outside",
-#  "f4:01" => "outside",
-#  "1d:01" => "inside",
-#  "1f:01" => "inside",
-#  "37:01" => "inside",
-#  "38:01" => "inside",
-#  "9c:01" => "inside",
-#  "cb:01" => "inside"
-#}
-
-# Heidenheim
-$device_id_to_handle = {
-  "58:02" => "outside",
-  "62:02" => "outside",
-  "07:01" => "inside"
-}
-
-def db_execute s, d
-  begin
-    $db.execute(s, d)
-    rescue SQLite3::BusyException
-      sleep 3
-      begin
-        $db.execute(s, d)
-      rescue SQLite3::BusyException
-        STDERR.write "DB busy, skipping data point '#{d.to_s}'\n"
-      end
-  end
-end
-
-def db_insert timestamp, handle, temperature, humidity
-  db_execute("INSERT INTO weather(timestamp, handle, temperature, humidity) VALUES(?,?,?,?)", 
-             [timestamp, handle, temperature, humidity])
-end
-
-
-$db = SQLite3::Database.new("weather.db")
-
-$db.execute <<-SQL
-          create table weather(
-           id INTEGER PRIMARY KEY,
-           timestamp DATETIME,
-           handle TEXT,
-           temperature FLOAT,
-           humidity FLOAT
-         );
-        SQL
-
-while line = STDIN.gets
-  parts = line.split "\t"
-  log_entry_type = parts.first.split("::")[1]
-  if log_entry_type == "temp"
-    data = {}
-    parts.each { |i|
-      key, value = i.split "::"
-      data[key] = value
-    }
-    data["timestamp"] = data["timestamp"].to_i
-    data["temperature"] = data["temperature"].to_f
-    data["humidity"] = data["humidity"].to_f
-
-    handle = $device_id_to_handle[data["device_id"]]
-    if handle
-      db_insert \
-        data["timestamp"], \
-        handle, \
-        data["temperature"], \
-        data["humidity"]
-    end
-  end
-end
-
-$db.close