diff --git a/fhem/demolog/predicted.log b/fhem/demolog/predicted.log new file mode 100644 index 000000000..aa6a3f965 --- /dev/null +++ b/fhem/demolog/predicted.log @@ -0,0 +1,72 @@ +2013-08-11_00:00:00 predicted T: 16 +2013-08-11_01:00:00 predicted T: 12 +2013-08-11_02:00:00 predicted T: 10 +2013-08-11_03:00:00 predicted T: 8 +2013-08-11_04:00:00 predicted T: 8 +2013-08-11_05:00:00 predicted T: 10 +2013-08-11_06:00:00 predicted T: 12 +2013-08-11_07:00:00 predicted T: 13 +2013-08-11_08:00:00 predicted T: 14 +2013-08-11_09:00:00 predicted T: 16 +2013-08-11_10:00:00 predicted T: 18 +2013-08-11_11:00:00 predicted T: 20 +2013-08-11_12:00:00 predicted T: 22 +2013-08-11_13:00:00 predicted T: 24 +2013-08-11_14:00:00 predicted T: 24 +2013-08-11_15:00:00 predicted T: 24 +2013-08-11_16:00:00 predicted T: 24 +2013-08-11_17:00:00 predicted T: 23 +2013-08-11_18:00:00 predicted T: 22 +2013-08-11_19:00:00 predicted T: 21 +2013-08-11_20:00:00 predicted T: 20 +2013-08-11_21:00:00 predicted T: 19 +2013-08-11_22:00:00 predicted T: 18 +2013-08-11_23:00:00 predicted T: 17 +2013-08-12_00:00:00 predicted T: 17 +2013-08-12_01:00:00 predicted T: 17 +2013-08-12_02:00:00 predicted T: 17 +2013-08-12_03:00:00 predicted T: 17 +2013-08-12_04:00:00 predicted T: 17 +2013-08-12_05:00:00 predicted T: 17 +2013-08-12_06:00:00 predicted T: 17 +2013-08-12_07:00:00 predicted T: 18 +2013-08-12_08:00:00 predicted T: 19 +2013-08-12_09:00:00 predicted T: 20 +2013-08-12_10:00:00 predicted T: 21 +2013-08-12_11:00:00 predicted T: 22 +2013-08-12_12:00:00 predicted T: 22 +2013-08-12_13:00:00 predicted T: 23 +2013-08-12_14:00:00 predicted T: 24 +2013-08-12_15:00:00 predicted T: 24 +2013-08-12_16:00:00 predicted T: 24 +2013-08-12_17:00:00 predicted T: 22 +2013-08-12_18:00:00 predicted T: 20 +2013-08-12_19:00:00 predicted T: 18 +2013-08-12_20:00:00 predicted T: 16 +2013-08-12_21:00:00 predicted T: 14 +2013-08-12_22:00:00 predicted T: 12 +2013-08-12_23:00:00 predicted T: 10 +2013-08-13_00:00:00 predicted T: 11 +2013-08-13_01:00:00 predicted T: 11 +2013-08-13_02:00:00 predicted T: 12 +2013-08-13_03:00:00 predicted T: 12 +2013-08-13_04:00:00 predicted T: 13 +2013-08-13_05:00:00 predicted T: 14 +2013-08-13_06:00:00 predicted T: 15 +2013-08-13_07:00:00 predicted T: 16 +2013-08-13_08:00:00 predicted T: 19 +2013-08-13_09:00:00 predicted T: 20 +2013-08-13_10:00:00 predicted T: 20 +2013-08-13_11:00:00 predicted T: 21 +2013-08-13_12:00:00 predicted T: 21 +2013-08-13_13:00:00 predicted T: 21 +2013-08-13_14:00:00 predicted T: 18 +2013-08-13_15:00:00 predicted T: 17 +2013-08-13_16:00:00 predicted T: 17 +2013-08-13_17:00:00 predicted T: 16 +2013-08-13_18:00:00 predicted T: 16 +2013-08-13_19:00:00 predicted T: 16 +2013-08-13_20:00:00 predicted T: 16 +2013-08-13_21:00:00 predicted T: 15 +2013-08-13_22:00:00 predicted T: 15 +2013-08-13_23:00:00 predicted T: 14 diff --git a/fhem/fhem.cfg.demo b/fhem/fhem.cfg.demo index 3c81ffd68..522c26992 100644 --- a/fhem/fhem.cfg.demo +++ b/fhem/fhem.cfg.demo @@ -94,6 +94,8 @@ attr Garden group Sensors attr Garden room Sensors define Log.Garden FileLog demolog/garden.log Sens.Out:T:.* attr Log.Garden room Sensors +define Log.Predicted FileLog demolog/predicted.log predicted:T:.* +attr Log.Predicted room Sensors define Cellar CUL_WS 1 -1 -3.5 attr Cellar group Sensors attr Cellar room Sensors @@ -115,6 +117,16 @@ attr dew_all room Sensors define SVG_03_Dewpoint SVG Log.Dewpoint:SVG_03_Dewpoint:CURRENT attr SVG_03_Dewpoint room Sensors attr SVG_03_Dewpoint startDate 2013-08-13 +define logProxy logProxy +attr logProxy room System +define SVG_04_Sun SVG logProxy:SVG_04_Sun:CURRENT +attr SVG_04_Sun room Sensors +attr SVG_04_Sun fixedrange year +attr SVG_04_Sun title {"".logProxy_dec2hms($data{min1})." - ".logProxy_dec2hms($data{max1})." - ".logProxy_dec2hms($data{min2})." - ".logProxy_dec2hms($data{max2})} +define SVG_05_Polar SVG logProxy:SVG_05_Polar:CURRENT +attr SVG_05_Polar room Sensors +attr SVG_05_Polar plotsize 340,300 + define sunRise at *{sunrise()} set Office on attr sunRise group Timer attr sunRise icon weather_sunrise diff --git a/fhem/www/gplot/SVG_01_Garden.gplot b/fhem/www/gplot/SVG_01_Garden.gplot index 1105764bc..db750ef46 100644 --- a/fhem/www/gplot/SVG_01_Garden.gplot +++ b/fhem/www/gplot/SVG_01_Garden.gplot @@ -1,4 +1,4 @@ -# Created by FHEM/98_SVG.pm, 2015-01-23 07:33:37 +# Created by FHEM/98_SVG.pm, 2015-01-24 09:25:23 set terminal png transparent size crop set output '.png' set xdata time @@ -14,7 +14,9 @@ set y2label "Temperature" #Log.Garden 4:Garden.T\x3a:15: #Log.Garden 10:Garden.T\x3a:0:delta-h #Log.Garden 10:Garden.T\x3a:0:delta-d +#Log.Predicted 4:predicted.*:15: plot "" using 1:2 axes x1y2 title 'Temperature' ls l0 lw 1 with lines,\ "" using 1:2 axes x1y1 title 'Rain/hour' ls l1fill lw 1 with histeps,\ - "" using 1:2 axes x1y1 title 'Rain/day' ls l2 lw 1 with histeps + "" using 1:2 axes x1y1 title 'Rain/day' ls l2 lw 1 with histeps,\ + "" using 1:2 axes x1y2 title 'Predicted Temp' ls l3 lw 1 with quadratic diff --git a/fhem/www/gplot/SVG_02_Cellar.gplot b/fhem/www/gplot/SVG_02_Cellar.gplot index ce4c14f2a..f804ce1ed 100644 --- a/fhem/www/gplot/SVG_02_Cellar.gplot +++ b/fhem/www/gplot/SVG_02_Cellar.gplot @@ -1,4 +1,4 @@ -# Created by FHEM/98_SVG.pm, 2013-08-22 22:27:58 +# Created by FHEM/98_SVG.pm, 2015-01-24 09:05:00 set terminal png transparent size crop set output '.png' set xdata time @@ -11,8 +11,8 @@ set grid set ylabel "Humidity" set y2label "Temperature" -#FileLog 4:Cellar.T\x3a:10 -#FileLog 6:Cellar.T\x3a:10 +#Log.Cellar 4:Cellar.T\x3a:10: +#Log.Cellar 6:Cellar.T\x3a:10: plot "" using 1:2 axes x1y2 title 'Temperature' ls l0 lw 1 with lines,\ "" using 1:2 axes x1y1 title 'Humidity' ls l2fill lw 1 with lines diff --git a/fhem/www/gplot/SVG_03_Dewpoint.gplot b/fhem/www/gplot/SVG_03_Dewpoint.gplot index 09ade100b..ad1228fd0 100644 --- a/fhem/www/gplot/SVG_03_Dewpoint.gplot +++ b/fhem/www/gplot/SVG_03_Dewpoint.gplot @@ -1,4 +1,4 @@ -# Created by FHEM/98_SVG.pm, 2013-08-22 22:35:46 +# Created by FHEM/98_SVG.pm, 2015-01-24 09:06:50 set terminal png transparent size crop set output '.png' set xdata time @@ -11,8 +11,8 @@ set grid y2tics set ylabel "Temperature" set y2label "Temperature" -#FileLog 4:Cellar.dewpoint\x3a:10 -#FileLog 4:Garden.dewpoint\x3a:10 +#Log.Dewpoint 4:Cellar.dewpoint\x3a:10: +#Log.Dewpoint 4:Garden.dewpoint\x3a:10: plot "" using 1:2 axes x1y2 title 'Cellar' ls l0 lw 1 with lines,\ - "" using 1:2 axes x1y2 title 'Garden' ls l1 lw 1 with lines + "" using 1:2 axes x1y2 title 'Garden' ls l1 lw 1 with quadratic diff --git a/fhem/www/gplot/SVG_04_Sun.gplot b/fhem/www/gplot/SVG_04_Sun.gplot new file mode 100644 index 000000000..347519142 --- /dev/null +++ b/fhem/www/gplot/SVG_04_Sun.gplot @@ -0,0 +1,22 @@ +set terminal png transparent size crop +set output '.png' +set xdata time +set timefmt "%Y-%m-%d_%H:%M:%S" +set xlabel " " +set title '' +set ytics +set y2tics +set grid +set ylabel "Sonnenaufgang" +set y2label "Somnnenuntergang" + +set yrange [4:10] +set y2range [16:23] + +#logProxy Func:logProxy_Func2Plot($from,$to,'{logProxy_hms2dec(sunrise_abs_dat($sec))}') +#logProxy Func:logProxy_Func2Plot($from,$to,'{logProxy_hms2dec(sunset_abs_dat($sec))}') +#logProxy ConstX:TimeNow(),4,10 + +plot "" using 1:2 axes x1y1 title 'Sunrise' ls l2 lw 1 with steps,\ +plot "" using 1:2 axes x1y2 title 'Sunset' ls l0 lw 1 with steps,\ +plot "" using 1:2 axes x1y1 title notitle ls l5 lw 1 with steps,\ diff --git a/fhem/www/gplot/SVG_05_Polar.gplot b/fhem/www/gplot/SVG_05_Polar.gplot new file mode 100644 index 000000000..ecc2bb701 --- /dev/null +++ b/fhem/www/gplot/SVG_05_Polar.gplot @@ -0,0 +1,25 @@ +set terminal png transparent size crop +set output '.png' +set xdata time +set timefmt "%Y-%m-%d_%H:%M:%S" +set xlabel " " +set title 'Web' +set ytics () +set y2tics () +set grid + +#set xtics ( 10 10, 20 20) +set xtics () + +set xrange [-40:40] +set yrange [-40:40] + +#logProxy Polar::[11,15,21,14,16] +#logProxy Polar::[11,15,21,14,16] +#logProxy Polar::[14,16,23,24,21] +#logProxy Polar::["Livingroom","Bath","Children","Kitchen","Floor"] + +plot "" using 1:2 axes x1y1 title 'Measured' ls l0 lw 1 with lines,\ +plot "" using 1:2 axes x1y1 notitle ls l0 lw 1 with points,\ +plot "" using 1:2 axes x1y1 title 'Desired' ls l1fill lw 1 with lines,\ +plot "" using 1:2 axes x1y1 notitle ls l2 lw 1 with lines,\