kuhinja change color, draw lines for humidify

diff --git a/temp2.gnuplot b/temp2.gnuplot
index ca00a80..da700e4 100644 (file)
--- a/temp2.gnuplot
+++ b/temp2.gnuplot
@@ -57,7 +57,7 @@ set y2range [0:50]
 plot \
  "/dev/shm/DHT22-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DHT22 unutra" lt rgb "#ff00ff" \
 ,"/dev/shm/DS18B20-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DS18B20 unutra" lt rgb "#880088" \
-,"/dev/shm/rtl_433-kuhinja-temperature" using ($1+tz_secs):($2) with dots title "kuhinja" lt rgb "#ff4444" \
+,"/dev/shm/rtl_433-kuhinja-temperature" using ($1+tz_secs):($2) with dots title "kuhinja" lt rgb "#ff8844" \
 ,"/dev/shm/rtl_433-kupaona-temperature"  using ($1+tz_secs):($2) with dots title "kupaona" lt rgb "#8888ff" \
 ,"/dev/shm/rtl_433-soba-temperature" using ($1+tz_secs):($2) with dots title "soba" lt rgb "#ffcc00" \
 ,"/dev/shm/rtl_433-vani-temperature" using ($1+tz_secs):($2) with dots title "vani" lt rgb "#00cc00" \
@@ -69,7 +69,7 @@ if ( exists("lines") && lines == 1 ) {
 plot \
  "/dev/shm/DHT22-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DHT22 unutra" lt rgb "#ff00ff" \
 ,"/dev/shm/DS18B20-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DS18B20 unutra" lt rgb "#880088" \
-,"/dev/shm/rtl_433-kuhinja-temperature" using ($1+tz_secs):($2) with lines title "kuhinja" lt rgb "#ff4444" \
+,"/dev/shm/rtl_433-kuhinja-temperature" using ($1+tz_secs):($2) with lines title "kuhinja" lt rgb "#ff8844" \
 ,"/dev/shm/rtl_433-kupaona-temperature"  using ($1+tz_secs):($2) with lines title "kupaona" lt rgb "#8888ff" \
 ,"/dev/shm/rtl_433-soba-temperature" using ($1+tz_secs):($2) with lines title "soba" lt rgb "#ffcc00" \
 ,"/dev/shm/rtl_433-vani-temperature" using ($1+tz_secs):($2) with lines title "vani" lt rgb "#00cc00" \
@@ -87,13 +87,19 @@ max_h = h_mean + h_spread
 
 plot \
  "/dev/shm/DHT22-humidity" using ($1+tz_secs):($2 > min_h && $2 < max_h ? $2 : '') with dots title "DHT22 unutra" lt rgb "#ff00ff" \
-,"/dev/shm/rtl_433-kuhinja-humidity" using ($1+tz_secs):($2) with lines title "kuhunja" lt rgb "#ff4444" \
+,"/dev/shm/rtl_433-kuhinja-humidity" using ($1+tz_secs):($2) with lines title "kuhunja" lt rgb "#ff8844" \
 ,"/dev/shm/rtl_433-kupaona-humidity"  using ($1+tz_secs):($2) with lines title "kupaona" lt rgb "#8888ff" \
 ,"/dev/shm/rtl_433-vani-humidity" using ($1+tz_secs):($2) with lines title "vani" lt rgb "#00cc00 " \
 ,"/dev/shm/rtl_433-kutija-humidity" using ($1+tz_secs):($2) with lines title "kutija" lt rgb "#0088cc " \
 ,"/dev/shm/boiler.d" using ($1+tz_secs):($2 > 0 ? 48 : 2) axes x1y2 with dots title "boiler on/off" lt rgb "#000000"
 
 if ( exists("lines") && lines == 1 ) {
+plot \
+ "/dev/shm/DHT22-humidity" using ($1+tz_secs):($2 > min_h && $2 < max_h ? $2 : '') with lines title "DHT22 unutra" lt rgb "#ff00ff" \
+,"/dev/shm/rtl_433-kuhinja-humidity" using ($1+tz_secs):($2) with lines title "kuhunja" lt rgb "#ff8844" \
+,"/dev/shm/rtl_433-kupaona-humidity"  using ($1+tz_secs):($2) with lines title "kupaona" lt rgb "#8888ff" \
+,"/dev/shm/rtl_433-vani-humidity" using ($1+tz_secs):($2) with lines title "vani" lt rgb "#00cc00 " \
+,"/dev/shm/rtl_433-kutija-humidity" using ($1+tz_secs):($2) with lines title "kutija" lt rgb "#0088cc " 
 
 }
 unset multiplot

diff --git a/temp2.sh b/temp2.sh
index 9b19902..6e0a02a 100755 (executable)
--- a/temp2.sh
+++ b/temp2.sh
@@ -26,7 +26,7 @@ curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-url
 #curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"id\" = '5'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/rtl_433-temperature
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '231' or \"rid\" = '131'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-vani-temperature
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '55' or \"rid\" = '55'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kutija-temperature
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '103' or \"rid\" = '6'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kupaona-temperature
+curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '125' or \"rid\" = '6'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kupaona-temperature
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '19' or \"rid\" = '191'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kuhinja-temperature
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '125' or \"rid\" = '184'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-soba-temperature
 
@@ -37,7 +37,7 @@ curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-url
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"id\" = '5'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/rtl_433-humidity
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\",\"channel\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '231'  or \"rid\" = '131'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-vani-humidity
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\",\"channel\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '55'  or \"rid\" = '55'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kutija-humidity
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\",\"channel\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '103'  or \"rid\" = '6'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kupaona-humidity
+curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\",\"channel\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '125'  or \"rid\" = '6'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kupaona-humidity
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"humidity\",\"channel\" FROM \"rtl_433\" WHERE time > now() - $INTERVAL AND \"topic\"='rpi2/rtl_433/influx' AND \"rid\" = '19' or \"rid\" = '191'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-kuhinja-humidity
 
 __SHELL__