diff --git a/fhem/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED index c4365f861..6448330d5 100644 --- a/fhem/webfrontend/pgm3/CHANGED +++ b/fhem/webfrontend/pgm3/CHANGED @@ -104,4 +104,3 @@ Changelog -- Bugfix: DEL Button for at-Jobs now works -- Now you can use php4 OR php5 (php5 is recommended) -- Feature: php-Pictures of FHT now inclusive "desired-temp" - diff --git a/fhem/webfrontend/pgm3/config.php b/fhem/webfrontend/pgm3/config.php index babb0f983..61d885ce5 100644 --- a/fhem/webfrontend/pgm3/config.php +++ b/fhem/webfrontend/pgm3/config.php @@ -27,7 +27,7 @@ # this is only possible, if the webserver (e.g.wwwrun) has the rights ro write the # files from fh1000.pl. If you want that then run fhz1000.pl as wwwrun too. # if 'yes' then only the needed lines are in the logfiles, the rest will be deleted. - $logrotate='no'; # yes/no default='no' + $logrotate='yes'; # yes/no default='no' ## Kioskmode. Only show but don't switch anything. Values: on/off @@ -70,6 +70,8 @@ $imgmaxxfht=450; #Size of the pictures Default: 450 for faster systems else 380 $imgmaxyfht=52; $show_desiredtemp=1; # show the desired_temp as a graphic (0/1) + $FHTyrange='15:31'; # Temperature in gnuplot. Default 15 to 31 (Celsius) + $FHTy2range='0:70'; # Actuator in gnuplot. Default 0 to 70 (Percent) $logrotateFHTlines=4300; # automatic Logrotate; $logrotate must be 'yes'. # Default:4300 # read docs/logrotate if you want adjust it manually! diff --git a/fhem/webfrontend/pgm3/include/gnuplot.php b/fhem/webfrontend/pgm3/include/gnuplot.php index 82095f482..256e574a7 100644 --- a/fhem/webfrontend/pgm3/include/gnuplot.php +++ b/fhem/webfrontend/pgm3/include/gnuplot.php @@ -6,7 +6,7 @@ ################ -function drawgnuplot($gnudraw,$gnutyp,$gnuplot,$pictype,$logpath) +function drawgnuplot($gnudraw,$gnutyp,$gnuplot,$pictype,$logpath,$FHTyrange,$FHTy2range) { $IN="$gnudraw ($gnutyp)"; @@ -55,10 +55,10 @@ EOD; Case FHT: ############################################ $gplotmain=" set ylabel 'Temperature (Celsius)' - set yrange [15:31] + set yrange [$FHTyrange] set grid ytics set y2label 'Actuator (%)' - set y2range [0:70] + set y2range [$FHTy2range] "; $gplotmaintmp = <<
@@ -622,7 +622,7 @@ xml_parser_free($xml_parser); "; if ($showhmsgnu == $HMSdev and $showgnuplot == 1) - { drawgnuplot($HMSdev,$type,$gnuplot,$pictype,$logpath); + { drawgnuplot($HMSdev,$type,$gnuplot,$pictype,$logpath,0,0); $HMSdev1=$HMSdev.'1'; echo "
@@ -689,8 +689,8 @@ xml_parser_free($xml_parser); echo ""; if (($showks == $KSdev) and $showgnuplot=='1') { - if ($kstyp=="1")drawgnuplot($KSdev,"KS300_t1",$gnuplot,$pictype,$logpath); - else drawgnuplot($KSdev,"KS300_t2",$gnuplot,$pictype,$logpath); + if ($kstyp=="1")drawgnuplot($KSdev,"KS300_t1",$gnuplot,$pictype,$logpath,0,0); + else drawgnuplot($KSdev,"KS300_t2",$gnuplot,$pictype,$logpath,0,0); $KSdev1=$KSdev.'1'; echo "