fix boiler graph and tweak sensor ids

diff --git a/temp3.gnuplot b/temp3.gnuplot
index 32914ba..f4df1dc 100644 (file)
--- a/temp3.gnuplot
+++ b/temp3.gnuplot
@@ -62,7 +62,7 @@ plot \
 ,"/dev/shm/data.soba-t-h" using ($1+tz_secs):($2) with dots title "soba" lt rgb "#ffcc00" \
 ,"/dev/shm/data.vani-t-h" using ($1+tz_secs):($2) with dots title "vani" lt rgb "#00cc00" \
 ,"/dev/shm/data.kutija-t-h" using ($1+tz_secs):($2) with dots title "kutija" lt rgb "#0088cc" \
-,"/dev/shm/boiler.d" using ($1+tz_secs):($2 > 0 ? 48 : 2) axes x1y2 with dots title "boiler on/off" lt rgb "#000000"
+,"/dev/shm/data.boiler.d" using ($1+tz_secs):($2 > 0 ? 48 : 2) axes x1y2 with dots title "boiler on/off" lt rgb "#000000"
 
 
 if ( exists("lines") && lines == 1 ) {
@@ -74,7 +74,7 @@ plot \
 ,"/dev/shm/data.soba-t-h" using ($1+tz_secs):($2) with lines title "soba" lt rgb "#ffcc00" \
 ,"/dev/shm/data.vani-t-h" using ($1+tz_secs):($2) with lines title "vani" lt rgb "#00cc00" \
 ,"/dev/shm/data.kutija-t-h" using ($1+tz_secs):($2) with lines title "kutija" lt rgb "#0088cc"  \
-,"/dev/shm/boiler.d" using ($1+tz_secs):($2 > 0 ? 48 : 2) axes x1y2 with dots title "boiler on/off" lt rgb "#000000"
+,"/dev/shm/data.boiler.d" using ($1+tz_secs):($2 > 0 ? 48 : 2) axes x1y2 with dots title "boiler on/off" lt rgb "#000000"
 }
 
 if ( gray == 1 ) {

diff --git a/temp3.sh b/temp3.sh
index e58ce0d..9f38b52 100755 (executable)
--- a/temp3.sh
+++ b/temp3.sh
@@ -46,10 +46,10 @@ influx_mqtt 'stat/boiler/DHT22/humidity'            'DHT22-h'
 influx_mqtt    'stat/boiler/d'                         'boiler-d'
 
 influx_rtl     'vani-t-h' 108 40
-influx_rtl     'kutija-t-h' 55
+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' 125 184
+influx_rtl     'soba-t-h' 95
 
 cat /dev/shm/curl | parallel
 
@@ -68,7 +68,7 @@ else
        GRAY=""
 fi
 
-#set > /dev/shm/temp3.cgi.vars
+set > /dev/shm/temp3.cgi.vars
 
 lines_checked=""
 test "$LINES" = 1 && lines_checked="checked"