sunce, soba battery change

[vaillant-thermostat] / temp3.sh

diff --git a/temp3.sh b/temp3.sh
index 8e5be2b..f3c2d83 100755 (executable)
--- a/temp3.sh
+++ b/temp3.sh
@@ -1,29 +1,5 @@
 #!/bin/sh
 
-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\"" -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 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
-
-
 # sudo apt-get install jq
 # ln -s `pwd`/temp3.sh /var/www/html/temp3.sh 
 # ln -s /dev/shm/temp3.png /var/www/html/temp3.png 
@@ -48,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__
 }
 
@@ -59,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__
 }
 
@@ -70,16 +46,41 @@ 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' 211 59 # 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' 230 37
+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'