X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=temp3.sh;h=68012f71a42efd5bfaf9320fba45ef086c54bc92;hb=417fcb7419d73b645580041e0667a65f77590b6e;hp=9f38b523d500da2bedbe7711970a3f7a08b6177f;hpb=a8214d8d0455f80671fc508a5a4216a0de330e28;p=vaillant-thermostat

diff --git a/temp3.sh b/temp3.sh
index 9f38b52..68012f7 100755
--- a/temp3.sh
+++ b/temp3.sh
@@ -24,36 +24,74 @@ 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_consumer\" WHERE time > now() - $INTERVAL AND \"topic\"='$topic' $rids" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+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
 __SHELL__
 }
 
 influx_rtl() {
 	file=$1
 	shift;
-	rids=`echo $* | sed -e 's/\([0-9][0-9]*\)/ or "rid" = '"'"'\1'"'"'/g' -e 's/^ or/ AND /'`
+	rids=`echo $* | sed -e 's/\([0-9][0-9]*\)/ or id = '"'"'\1'"'"'/g' -e 's/^ or//'`
 
 #	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 \"rtl_433\" WHERE time > now() - $INTERVAL $rids" | sed -e 's/^.*"values":\[\[//' -e 's/\],\[/\n/g' -e 's/,/ /g' -e 's/]].*$//' > /dev/shm/data.$file
+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
 __SHELL__
 }
 
+influx_tele() {
+	topic=$1
+	t_col=$2
+	h_col=$3
+	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
+__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' 0 234 84
+rename_ids	'kutija-t-h' 241 249 # hlad
+rename_ids	'kupaona-t-h' 98 82
+rename_ids	'kuhinja-t-h' 181 183
+rename_ids	'soba-t-h' 252 4
+rename_ids	'hodnik-t-h' 167
+
+
 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_mqtt	'stat/boiler/d'				'boiler-d'
 
-influx_rtl	'vani-t-h' 108 40
-influx_rtl	'kutija-t-h' 59
-influx_rtl	'kupaona-t-h' 125 148
-influx_rtl	'kuhinja-t-h' 175 239
-influx_rtl	'soba-t-h' 95
+#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
 
-
 GRAY=`echo $QUERY_STRING | grep -i gray | wc -l`
 
 tz_secs=`date +%:z | cut -d: -f1 | sed -e 's/^+//' -e 's/$/ * 3600/' | bc`