X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=temp2.sh;h=ed69d78287c3a12ab5ff1ca733322c6524ab5f55;hb=ba95c2283b358a60aed1daf7eec65d9bef008f8b;hp=3d50c6c64cc3d29fb39ff327c5ce57915b492080;hpb=7ec574f0b4df35ef042d22dad76f221c88f8f7be;p=vaillant-thermostat

diff --git a/temp2.sh b/temp2.sh
index 3d50c6c..ed69d78 100755
--- a/temp2.sh
+++ b/temp2.sh
@@ -24,6 +24,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 \"rid\" = '172'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-9-172-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\" = '75'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-9-75-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\" = '141'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-9-141-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\" = '82'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' | tr -d '\\"' > /dev/shm/rtl_433-183-temperature
 
 
 curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT mean(\"value\"),spread(\"value\") FROM \"mqtt_consumer\" WHERE time > now() - $INTERVAL AND \"topic\"='stat/boiler/DS18B20/temperature'"  | jq '.results[0].series[0].values[0][1,2]' > /dev/shm/temperature.mean.spread
@@ -37,8 +38,10 @@ curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-url
 
 GRAY=`echo $QUERY_STRING | grep -i gray | wc -l`
 
+tz_secs=`date +%:z | cut -d: -f1 | sed -e 's/^+//' -e 's/$/ * 3600/' | bc`
+
 cd /home/pi/vaillant-thermostat/
-gnuplot -e "t_mean=`head -1 /dev/shm/temperature.mean.spread`;t_spread=`tail -1 /dev/shm/temperature.mean.spread`;h_mean=`head -1 /dev/shm/humidity.mean.spread` ; h_spread=`tail -1 /dev/shm/humidity.mean.spread` ; gray=$GRAY ; lines=$LINES" temp2.gnuplot
+gnuplot -e "t_mean=`head -1 /dev/shm/temperature.mean.spread`;t_spread=`tail -1 /dev/shm/temperature.mean.spread`;h_mean=`head -1 /dev/shm/humidity.mean.spread` ; h_spread=`tail -1 /dev/shm/humidity.mean.spread` ; gray=$GRAY ; lines=$LINES ; interval=\"$INTERVAL\" ; tz_secs=$tz_secs" temp2.gnuplot
 
 if [ "$GRAY" = 1 ] ; then
 	convert /dev/shm/temp2.png -gravity center -extent 600x800 -colorspace Gray /dev/shm/temp2-gray.png
@@ -49,6 +52,9 @@ fi
 
 set > /dev/shm/temp2.cgi.vars
 
+lines_checked=""
+test "$LINES" = 1 && lines_checked="checked"
+
 if echo $HTTP_USER_AGENT | grep Mozilla > /dev/null ; then
 	echo "Content-type: text/html\r\n\r\n"
 	cat << __HTML__
@@ -56,9 +62,10 @@ if echo $HTTP_USER_AGENT | grep Mozilla > /dev/null ; then
 <form method="get" action="/temp2.sh" style="position: fixed; top: 0; left: 0">
 <input type=submit name="t" value="48h">
 <input type=submit name="t" value="24h">
+<input type=submit name="t" value="12h">
 <input type=submit name="t" value="6h">
 <input type=submit name="t" value="1h">
-<input type=checkbox name="lines" value="1">
+<input type=checkbox name="lines" $lines_checked> <!-- $LINES -->
 </form>
 <img src="/temp2.png">
 </body>