X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=temp2.gnuplot;h=3112a1bc0844b0874bd5794d4ba8cd483e77f280;hb=f30a807318b14053167e46544d2350fdfe6b1e87;hp=4b3fd0dc98dea763083a9fd3e8d23c80670de904;hpb=7ec574f0b4df35ef042d22dad76f221c88f8f7be;p=vaillant-thermostat

diff --git a/temp2.gnuplot b/temp2.gnuplot
index 4b3fd0d..3112a1b 100644
--- a/temp2.gnuplot
+++ b/temp2.gnuplot
@@ -8,7 +8,11 @@ if ( gray == 1 ) {
 set xdata time
 set timefmt "%s"
 
-set xtics format "%H"
+if (strlen(interval) > 2) {
+	set xtics format "%H"
+} else {
+	set xtics format "%H:%M"
+}
 
 set pointsize 0.2
 
@@ -34,7 +38,7 @@ t_mean=25
 t_spread=25
 
 h_mean = 50
-h_spread = 30
+h_spread = 50
 
 print "using default mean and spread"
 }
@@ -42,24 +46,30 @@ print "using default mean and spread"
 min_t = t_mean - ( t_spread / 2 )
 max_t = t_mean + ( t_spread / 2 )
 
+if ( ! exists("tz_secs") ) {
+	tz_secs=7200
+}
+
 set ytics nomirror
 set y2tics
 
 plot \
- "/dev/shm/DHT22-temperature" using ($1+7200):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DHT22 unutra" \
-,"/dev/shm/rtl_433-9-172-temperature" using ($1+7200):($2) with dots title "vani" \
-,"/dev/shm/rtl_433-9-75-temperature"  using ($1+7200):($2) with dots title "kupaona" \
-,"/dev/shm/rtl_433-9-141-temperature" using ($1+7200):($2) with dots title "kuhinja" \
-,"/dev/shm/DS18B20-temperature" using ($1+7200):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DS18B20 unutra"
+ "/dev/shm/DHT22-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DHT22 unutra" \
+,"/dev/shm/rtl_433-9-172-temperature" using ($1+tz_secs):($2) with dots title "vani" \
+,"/dev/shm/rtl_433-9-75-temperature"  using ($1+tz_secs):($2) with dots title "kupaona" \
+,"/dev/shm/rtl_433-9-141-temperature" using ($1+tz_secs):($2) with dots title "kuhinja" \
+,"/dev/shm/DS18B20-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with dots title "DS18B20 unutra" \
+,"/dev/shm/rtl_433-183-temperature" using ($1+tz_secs):($2) with dots title "soba" lt rgb "#808000"
 
 
 if ( exists("lines") && lines == 1 ) {
 plot \
- "/dev/shm/DHT22-temperature" using ($1+7200):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DHT22 unutra" \
-,"/dev/shm/rtl_433-9-172-temperature" using ($1+7200):($2) with lines title "vani" \
-,"/dev/shm/rtl_433-9-75-temperature"  using ($1+7200):($2) with lines title "kupaona" \
-,"/dev/shm/rtl_433-9-141-temperature" using ($1+7200):($2) with lines title "kuhinja" \
-,"/dev/shm/DS18B20-temperature" using ($1+7200):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DS18B20 unutra"
+ "/dev/shm/DHT22-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DHT22 unutra" \
+,"/dev/shm/rtl_433-9-172-temperature" using ($1+tz_secs):($2) with lines title "vani" \
+,"/dev/shm/rtl_433-9-75-temperature"  using ($1+tz_secs):($2) with lines title "kupaona" \
+,"/dev/shm/rtl_433-9-141-temperature" using ($1+tz_secs):($2) with lines title "kuhinja" \
+,"/dev/shm/DS18B20-temperature" using ($1+tz_secs):($2 > min_t && $2 < max_t ? $2 : '') with lines title "DS18B20 unutra" \
+,"/dev/shm/rtl_433-183-temperature" using ($1+tz_secs):($2) with lines title "soba" lt rgb "#808000"
 }
 
 if ( gray == 1 ) {
@@ -72,9 +82,9 @@ min_h = h_mean - h_spread
 max_h = h_mean + h_spread
 
 plot \
- "/dev/shm/DHT22-humidity" using ($1+7200):($2 > min_h && $2 < max_h ? $2 : '') with dots title "DHT22 unutra" \
-,"/dev/shm/rtl_433-9-172-humidity" using ($1+7200):($2) with lines title "vani" \
-,"/dev/shm/rtl_433-9-75-humidity"  using ($1+7200):($2) with lines title "kupaona" \
-,"/dev/shm/rtl_433-9-141-humidity" using ($1+7200):($2) with lines title "kuhunja"
+ "/dev/shm/DHT22-humidity" using ($1+tz_secs):($2 > min_h && $2 < max_h ? $2 : '') with dots title "DHT22 unutra" \
+,"/dev/shm/rtl_433-9-172-humidity" using ($1+tz_secs):($2) with lines title "vani" \
+,"/dev/shm/rtl_433-9-75-humidity"  using ($1+tz_secs):($2) with lines title "kupaona" \
+,"/dev/shm/rtl_433-9-141-humidity" using ($1+tz_secs):($2) with lines title "kuhunja"
 
 unset multiplot