diff --git a/fhem/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED index e7c7d4545..620f14edf 100644 --- a/fhem/webfrontend/pgm3/CHANGED +++ b/fhem/webfrontend/pgm3/CHANGED @@ -105,7 +105,7 @@ Changelog -- Now you can use php4 OR php5 (php5 is recommended) -- Feature: php-Pictures of FHT now inclusive "desired-temp" -==DATE== (0.8.0) +2007-03-29 (0.8.0) -- Feature: Now you can adjust the range of the Gnuplot-pictures of FHT in the config.php -- Feature: WS300 is now supported -- Internal: Adjusted to the new internal structure of FHEM. YOU MUST HAVE FHEM >=4.0 diff --git a/fhem/webfrontend/pgm3/HISTORY b/fhem/webfrontend/pgm3/HISTORY index da8db15af..40b511858 100644 --- a/fhem/webfrontend/pgm3/HISTORY +++ b/fhem/webfrontend/pgm3/HISTORY @@ -10,3 +10,6 @@ - Better support for WS300 - FHT-Pulldown will now be called by the button "adjust" - FHT-PHP-Grafics now with temperature, desired-temp and actuator + +- Martin 2007-03-29 + - release pgm3 for fhem 4.0, pgm3 has now the verson 0.8.0 diff --git a/fhem/webfrontend/pgm3/config.php b/fhem/webfrontend/pgm3/config.php index 3dbeb66ba..7abadecdb 100644 --- a/fhem/webfrontend/pgm3/config.php +++ b/fhem/webfrontend/pgm3/config.php @@ -5,7 +5,7 @@ ###### required settings - $fhz1000="fhz"; #only php5 ! On which machine is fhz1000 runnning?? + $fhz1000="localhost"; #only php5 ! On which machine is fhz1000 runnning?? # if it is not localhost then the fhz1000.cfg must # run global: "port global" $fhz1000port="7072"; # port of fhz1000.pl @@ -66,58 +66,57 @@ $roommaxiconperline=$fs20maxiconperline; # default=$fs20maxiconperline ############################################################################################## + ## FHT-Devices - $imgmaxxfht=685; #Size of the pictures Default: 685 + $imgmaxxfht=725; #Size of the pictures Default: 725 $imgmaxyfht=52; - $show_desiredtemp=1; # show the desired_temp as a graphic (0/1) - $desR='255'; $desG='255'; $desB='255'; # Color of desired-temp-line Red/Green/Blue (Default: 255/255/255) - $show_actuator=1; # show the actuator-value as a graphic (0/1) - $actR='255'; $actG='247'; $actB='200'; # Color of Actuator-line Red/Green/Blue (Default: 255/247/200) - $FHTyrange='15:31'; # Temperature in gnuplot. Default 15 to 31 (Celsius) - $FHTy2range='0:70'; # Actuator in gnuplot. Default 0 to 70 (Percent) - $maxcount='460'; # Maximum count of pixel (from right to left) (Default:460) - $XcorrectDate=325; # Text of e.g. Date from the right side (Default:325) - $XcorrectMainText=35; # Text of main text from the right side (Default: 35) - $logrotateFHTlines=4300; # automatic Logrotate; $logrotate must be 'yes'. - # Default:4300 - # read docs/logrotate if you want adjust it manually! - # otherwise the system will slow down - # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) + $show_desiredtemp=1; # show the desired_temp as a graphic (0/1) + $desR='255'; $desG='255'; $desB='255'; # Color of desired-temp-line Red/Green/Blue (Default: 255/255/255) + $show_actuator=1; # show the actuator-value as a graphic (0/1) + $actR='255'; $actG='247'; $actB='200'; # Color of Actuator-line Red/Green/Blue (Default: 255/247/200) + $FHTyrange='15:31'; # Temperature in gnuplot. Default 15 to 31 (Celsius) + $FHTy2range='0:70'; # Actuator in gnuplot. Default 0 to 70 (Percent) + $maxcount='510'; # Maximum count of pixel (from right to left) (Default:460) + $XcorrectDate=380; # Text of e.g. Date from the right side (Default:380) + $XcorrectMainText=32; # Text of main text from the right side (Default: 32) + $logrotateFHTlines=4800; # automatic Logrotate; $logrotate must be 'yes'. + # Default:4800 + # read docs/logrotate if you want adjust it manually! + # otherwise the system will slow down + # pgm3 (user www-data) needs the rights to write the logs + # from fhz1000.pl (user = ???) + ############################################################################################## ## HMS-Devices - $imgmaxxhms=685; #Size of the pictures. Default: 685 + $imgmaxxhms=725; #Size of the pictures. Default: 725 $imgmaxyhms=52; - $maxcountHMS='525'; # Maximum count of pixel (from right to left) (Default:525) - $XcorrectMainTextHMS=25; # Text of main text from the right side (Default:) - $logrotateHMSlines=1200; # automatic Logrotate; $logrotate must be 'yes'. - # Default:1200 - # read docs/logrotate if you want adjust it manually! - # otherwise the system will slow down - # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) + $maxcountHMS='575'; # Maximum count of pixel (from right to left) (Default:575) + $XcorrectMainTextHMS=25; # Text of main text from the right side (Default:) + $logrotateHMSlines=1200; # automatic Logrotate; $logrotate must be 'yes'. + # Default:1200 + # read docs/logrotate if you want adjust it manually! + # otherwise the system will slow down + # pgm3 (user www-data) needs the rights to write the logs + # from fhz1000.pl (user = ???) ############################################################################################## ## KS300-Device - $imgmaxxks=685; #Size of the pictures Default: 685 + $imgmaxxks=725; #Size of the pictures Default: 725 $imgmaxyks=52; - $showbft=1; # Display values additionaly in Beafort. Values: 0 /1 Default:1 - $maxcountKS='525'; # Maximum count of pixel (from right to left) (Default:525) - $XcorrectMainTextKS=35; # Text of main text from the right side (Default: 35) - - $logrotateKS300lines=2000; # automatic Logrotate; $logrotate must be 'yes'. - # Default:2000 - # read docs/logrotate if you want adjust it manually - # otherwise the system will slow down - # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) - - + $showbft=1; # Display values additionaly in Beafort. Values: 0 /1 Default:1 + $maxcountKS='575'; # Maximum count of pixel (from right to left) (Default:575) + $XcorrectMainTextKS=45; # Text of main text from the right side (Default: 35) + $logrotateKS300lines=1900; # automatic Logrotate; $logrotate must be 'yes'. + # Default:1900 + # read docs/logrotate if you want adjust it manually + # otherwise the system will slow down + # pgm3 (user www-data) needs the rights to write the logs + # from fhz1000.pl (user = ???) ############################################################################################## diff --git a/fhem/webfrontend/pgm3/include/fht.php b/fhem/webfrontend/pgm3/include/fht.php index 6fbb0df75..a578f0043 100755 --- a/fhem/webfrontend/pgm3/include/fht.php +++ b/fhem/webfrontend/pgm3/include/fht.php @@ -154,13 +154,14 @@ setlocale (LC_ALL, 'de_DE.utf8'); $text=$txtroom.$room; ImageTTFText ($im, $fontsize, 0, 3, 49, $txtcolor, $fontttf, $text); - $text="desired-temp: $desired_temp"; + $text="desired: $desired_temp ".substr($desired_date,11,5); + ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 23, $txtcolor, $fontttf, $text); #$text=$desired_date; #ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-127-$XcorrectDate, 23, $txtcolor, $fontttf, $text); - $text="Actuator [%]: $actuator"; + $text="Actuator: $actuator"; ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-230-$XcorrectDate, 33, $txtcolor, $fontttf, $text); #$text=$actuator_date; diff --git a/fhem/webfrontend/pgm3/include/ks300.php b/fhem/webfrontend/pgm3/include/ks300.php index e7e7c739e..d93b20199 100755 --- a/fhem/webfrontend/pgm3/include/ks300.php +++ b/fhem/webfrontend/pgm3/include/ks300.php @@ -59,6 +59,7 @@ $avgmonth=$_GET['avgmonth']; (($array[$x][14] != $oldmin) or ($array[$x][12] != $oldhour) or ($x==$counter-1)) + and ($t!="avg_day") and ($date!="NEWLOGS")) { $oldmin=$array[$x][14]; diff --git a/fhem/webfrontend/pgm3/index.php b/fhem/webfrontend/pgm3/index.php index eb4ef2aeb..662d601cd 100644 --- a/fhem/webfrontend/pgm3/index.php +++ b/fhem/webfrontend/pgm3/index.php @@ -40,7 +40,7 @@ include "include/gnuplot.php"; include "include/functions.php"; -$pgm3version='0.8.0cvs'; +$pgm3version='0.8.0'; $Action = $_POST['Action']; @@ -475,7 +475,7 @@ xml_parser_free($xml_parser); ##################################################################################################################### ##### Check Version of FHEM - if (! ($stack[0][children][0][name]=='Internal_LIST')) ##older FHZ100 have no Internal_LIST + if (! ($stack[0][children][0][name]=='_internal__LIST')) ##older FHZ100 have no Internal_LIST {echo "Error!! You need at least FHEM-4.0 to run this pgm3!!";}