X-Git-Url: http://git.rot13.org/?p=vaillant-thermostat;a=blobdiff_plain;f=temp3.sh;h=5770a92a5a55d0c77f0551dc47aff7977fad6df3;hp=1498c8b6f3ba30dc10b27acde27d343f71f1cc4d;hb=HEAD;hpb=3d3b89419d1779891fd4cd4701ceeafff6a22c44

diff --git a/temp3.sh b/temp3.sh
index 1498c8b..5673c1a 100755
--- a/temp3.sh
+++ b/temp3.sh
@@ -54,25 +54,34 @@ 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' 238 126 # sunce
-rename_ids	'kutija-t-h' 162 237 # hlad
-rename_ids	'kupaona-t-h' 247 78
-rename_ids	'kuhinja-t-h' 44 154
-rename_ids	'soba-t-h' 115 235
-rename_ids	'hodnik-t-h' 99 145
+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'