X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=temp3.sh;h=5770a92a5a55d0c77f0551dc47aff7977fad6df3;hb=HEAD;hp=6de1e574c92df3976f05cd561b06636d1cbea821;hpb=0f9342d1bd49465a91256be355c20f7931083abc;p=vaillant-thermostat

diff --git a/temp3.sh b/temp3.sh
index 6de1e57..5673c1a 100755
--- a/temp3.sh
+++ b/temp3.sh
@@ -24,7 +24,7 @@ influx_mqtt() {
 
 #	echo "# $topic [$rids] -> $file"
 	cat <<__SHELL__ >> /dev/shm/curl
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"value\" FROM \"mqtt_stat\" WHERE time > now() - $INTERVAL AND \"topic\"='$topic' " | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"value\" FROM \"mqtt_stat\" WHERE time > now() - $INTERVAL AND \"topic\"='$topic' " | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
 __SHELL__
 }
 
@@ -35,7 +35,7 @@ influx_rtl() {
 
 #	echo "# $topic [$rids] -> $file"
 	cat <<__SHELL__ >> /dev/shm/curl
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\",\"humidity\" FROM \"mqtt_rtl_433\" WHERE time > now() - $INTERVAL and model='Prologue-TH' AND ( $rids )" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"temperature_C\",\"humidity\" FROM \"mqtt_rtl_433\" WHERE time > now() - $INTERVAL and model='Prologue-TH' AND ( $rids )" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
 __SHELL__
 }
 
@@ -46,7 +46,7 @@ influx_tele() {
 	file=$4
 
 	cat <<__SHELL__ >> /dev/shm/curl
-curl -G 'http://10.60.0.89:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"$t_col\",\"$h_col\" FROM \"mqtt_tele_sensor\" WHERE time > now() - $INTERVAL and topic='$topic'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=telegraf" --data-urlencode "epoch=s" --data-urlencode "q=SELECT \"$t_col\",\"$h_col\" FROM \"mqtt_tele_sensor\" WHERE time > now() - $INTERVAL and topic='$topic'" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
 __SHELL__
 }
 
@@ -54,32 +54,42 @@ curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=rtl_433" --data-urle
 	| tee /dev/shm/rtl_433.th \
 	| awk -F, '{print $3" "$5" "$6 > "/dev/shm/id."$4 }'
 
+psql_subvision() {
+	to=$1
+	echo "select extract(epoch from time), temperature, humidity from s_1 where time > now() - interval '$INTERVAL' order by time" | \
+		ssh subvision psql -t -A eg5120 | sed 's/|/ /g' > /dev/shm/data.$to
+}
+
+
 rename_ids() {
 	to=$1
-	rm /dev/shm/data.$to
 	shift
 	while [ ! -z "$1" ] ; do
 		if [ -e /dev/shm/id.$1 ] ; then
 			cat /dev/shm/id.$1 > /dev/shm/data.$to
 			rm  /dev/shm/id.$1
+		else
+			rm /dev/shm/data.$to
 		fi
 		shift
 	done
 }
 
-rename_ids	'vani-t-h' 0 165 234
-rename_ids	'kutija-t-h' 104 228 241 # hlad
-rename_ids	'kupaona-t-h' 114 98
-rename_ids	'kuhinja-t-h' 199 27
-rename_ids	'soba-t-h' 59 252
+rename_ids	'vani-t-h' 156 # sunce
+rename_ids	'kutija-t-h' 138 # hlad
+#rename_ids	'kupaona-t-h' 78 15
+psql_subvision	'kupaona-t-h'
+rename_ids	'kuhinja-t-h' 144
+rename_ids	'soba-t-h' 251
+rename_ids	'hodnik-t-h' 234
 
 
 influx_mqtt	'stat/boiler/DS18B20/temperature'	'DS18B20-t'
 influx_mqtt	'stat/boiler/DHT22/temperature'		'DHT22-t'
 influx_mqtt	'stat/boiler/DHT22/humidity'		'DHT22-h'
 
-influx_tele	'tele/ir/SENSOR' 'AM2301_Temperature' 'AM2301_Humidity' 'ir-dht22-t-h'
-influx_tele	'tele/dht11-ir-hdmi/SENSOR' 'DHT11_Temperature' 'DHT11_Humidity' 'stol-dht11-t-h'
+#influx_tele	'tele/ir/SENSOR' 'AM2301_Temperature' 'AM2301_Humidity' 'ir-dht22-t-h'
+#influx_tele	'tele/dht11-ir-hdmi/SENSOR' 'DHT11_Temperature' 'DHT11_Humidity' 'stol-dht11-t-h'
 
 influx_mqtt	'stat/boiler/d'				'boiler-d'