X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=temp3.sh;h=07a0a9935fbf41180b543ff6b643b70a6530469f;hb=f5274aaf4610ce48e573992317aa66edd9cf5048;hp=2d21b93bb018ee462139b317e724fb921709bbbd;hpb=5fa1e1ce219cfe7e0796c2957d83f4a6db90e777;p=vaillant-thermostat

diff --git a/temp3.sh b/temp3.sh
index 2d21b93..07a0a99 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__
 }
 
@@ -67,18 +67,19 @@ rename_ids() {
 	done
 }
 
-rename_ids	'vani-t-h' 0 234 84
-rename_ids	'kutija-t-h' 228 241 # hlad
-rename_ids	'kupaona-t-h' 98 82
-rename_ids	'kuhinja-t-h' 181 183
-rename_ids	'soba-t-h' 252 183
+rename_ids	'vani-t-h' 238 126 # sunce
+rename_ids	'kutija-t-h' 162 237 # hlad
+rename_ids	'kupaona-t-h' 78 15
+rename_ids	'kuhinja-t-h' 154 85
+rename_ids	'soba-t-h' 235 234
+rename_ids	'hodnik-t-h' 99 145
 
 
 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/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'