X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=temp3.sh;h=054a94c315a32adb31cdf06ab9003b9be68e6305;hb=cdac63d722919de63ac5cd83dd4a48aea791c33c;hp=c3b3e9ae6aa4db2f3a252269800ad7b38920014f;hpb=258b3f3bb2e2953fc21b300d00f8eea732f4d2d8;p=vaillant-thermostat

diff --git a/temp3.sh b/temp3.sh
index c3b3e9a..054a94c 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,29 +46,52 @@ 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__
 }
 
+curl -G 'http://10.60.0.92:8086/query' --data-urlencode "db=rtl_433" --data-urlencode "q=SELECT time,id,temperature_C,humidity FROM \"Prologue-TH\" WHERE time > now() - $INTERVAL" -H "Accept: application/csv" --data-urlencode "epoch=s" \
+	| tee /dev/shm/rtl_433.th \
+	| awk -F, '{print $3" "$5" "$6 > "/dev/shm/id."$4 }'
+
+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
+		fi
+		shift
+	done
+}
+
+rename_ids	'vani-t-h' 84 211 # sunce
+rename_ids	'kutija-t-h' 5 215 # hlad
+rename_ids	'kupaona-t-h' 202 6
+rename_ids	'kuhinja-t-h' 183 111
+rename_ids	'soba-t-h' 80 230
+rename_ids	'hodnik-t-h' 167 99
+
+
 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'
 
-influx_rtl	'vani-t-h' 0 165 
-influx_rtl	'kutija-t-h' 82 104 228
-influx_rtl	'kupaona-t-h' 205 122
-influx_rtl	'kuhinja-t-h' 154 199
-influx_rtl	'soba-t-h' 59 252
+#influx_rtl	'vani-t-h' 0 165 234
+#influx_rtl	'kutija-t-h' 104 228 241 # hlad
+#influx_rtl	'kupaona-t-h' 114 98
+#influx_rtl	'kuhinja-t-h' 199 27
+#influx_rtl	'soba-t-h' 59 252
 
 cat /dev/shm/curl | parallel
 
-echo "parallel over" >/dev/stderr
-
 GRAY=`echo $QUERY_STRING | grep -i gray | wc -l`
 
 tz_secs=`date +%:z | cut -d: -f1 | sed -e 's/^+//' -e 's/$/ * 3600/' | bc`