From 7464aa311ff60456f7f7755e0f0ad3bfc1b15add Mon Sep 17 00:00:00 2001
From: martinhaas <martinhaas@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Thu, 26 Mar 2009 22:10:04 +0000
Subject: [PATCH] fhem.html relating pgm3 updated. pgm3: HMS100CO added, small
 optical changes in userdefs.php

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@359 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 CHANGED                               |  1 +
 HISTORY                               |  1 +
 docs/fhem.html                        | 13 +++++--------
 webfrontend/pgm3/CHANGED              |  3 ++-
 webfrontend/pgm3/HISTORY              |  5 +++--
 webfrontend/pgm3/include/hms100.php   |  9 +++++++--
 webfrontend/pgm3/include/userdefs.php |  3 ++-
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/CHANGED b/CHANGED
index 3daba6582..45ba419ff 100644
--- a/CHANGED
+++ b/CHANGED
@@ -493,3 +493,4 @@
   - feature: Cost Control in 15_CUL_EM (CostPerUnit, BasisFeePerMonth)
   - feature: add counter differential per time in 81_M232Counter.pm
   - feature: added USB compendium to documentation
+  - feature: pgm3: Documentation for pgm3 updated, HMS100CO added (and small Bugfixes)
diff --git a/HISTORY b/HISTORY
index 973ff854c..744b1f573 100644
--- a/HISTORY
+++ b/HISTORY
@@ -395,5 +395,6 @@
 - Thu Mar 29 2009 (MartinH)
   - pgm3: bugfix, format table for userdef
   - pgm3: feature X10_support, taillogorder optional with date
+  - pgm3: HMS100CO added, fhem.html relating pgm3 updated
   
 
diff --git a/docs/fhem.html b/docs/fhem.html
index 14f50483d..4fd39a6fb 100644
--- a/docs/fhem.html
+++ b/docs/fhem.html
@@ -207,13 +207,13 @@ If you are using cygwin for your perl installation you can follow the guidelines
   <ul>
   This frontend is PHP based and was contributed by Martin Haas.
   Look at the webfrontends/pgm3/docs for more documentation or at
-  <a href="pgm3-0.5.1.png">this screenshot</a>. A lot more details can be
+  <a href="pgm3-0.5.1.png">this screenshot</a>. A lot more details <a href="http://www.martin-haas.de/fhz/screenshots.html">and screenshots</a> can be
   found on Martins page: <a href="http://www.martin-haas.de/fhz">
   http://www.martin-haas.de/fhz</a>
   <br><br>
 
   <ul>
-     <li>Install PHP and enable it by commenting in the "LoadModule
+     <li>Install PHP5 and enable it by commenting in the "LoadModule
      phpX_module ..." directive in httpd.conf (perhaps it is already
      done by your distro). Restart/reload httpd.</li>
 
@@ -221,17 +221,14 @@ If you are using cygwin for your perl installation you can follow the guidelines
      files from the webfrontend/pgm3 to this directory.<br>Make sure that this
      directory is writeable by the webserver!</li>
 
-     <li>Edit index.php (/home/httpd/html/pgm3/index.php), and check the
+     <li>Make sure that php-gd is installed.</li>
+
+     <li>Edit config.php (/home/httpd/html/pgm3/config.php), and check the
      required settings section</li>
 
      <li>If you want to have access to the FHT temperature logs, then:
      <ul>
        <li>Make sure gnuplot is installed</li>
-       <li>check the showgnuplot section in index.php</li>
-       <li>For each FHT device copy the file docs/gnuplot/gnuplot.wz to
-	   gnuplot.fhtdevicename (to the /home/httpd/html/pgm3 directory) and
-	   replace fht.log in this file with the absolute name of the current
-	   logfile.</li>
      </ul>
      <li>Call &lt;your-site&gt;/pgm3/index.php</li>
   </ul>
diff --git a/webfrontend/pgm3/CHANGED b/webfrontend/pgm3/CHANGED
index 74ad77339..e98419837 100644
--- a/webfrontend/pgm3/CHANGED
+++ b/webfrontend/pgm3/CHANGED
@@ -181,4 +181,5 @@ It is not necessary to tell fhem that there are other logs.
    -- Bugfix: FHT: lime-protection not more in the field of actuator: Small Changes in fht.php
 
 2009-03-26
-   -- Bugfix: table-format for userdefs changed
+   -- Bugfix: table-format for userdefs changed, small optical changes for userdef
+   -- Feature: HMS100CO added
diff --git a/webfrontend/pgm3/HISTORY b/webfrontend/pgm3/HISTORY
index a1944bbe1..770fc3e0b 100644
--- a/webfrontend/pgm3/HISTORY
+++ b/webfrontend/pgm3/HISTORY
@@ -79,6 +79,7 @@
 - Martin 2008-14-13
  -- Bugfix: FHT: lime-protection not more in the field of actuator
 
-- Martin 2009-03-2
+- Martin 2009-03-26
   -- Bugfix: table-format for userdefs changed
-  -- Feature: taillogor der optional with date (config.php)
+  -- Feature: taillogorder optional with date (config.php)
+  -- Feature: HMS100CO added
diff --git a/webfrontend/pgm3/include/hms100.php b/webfrontend/pgm3/include/hms100.php
index d169009f7..c4210a26d 100755
--- a/webfrontend/pgm3/include/hms100.php
+++ b/webfrontend/pgm3/include/hms100.php
@@ -14,7 +14,7 @@ include "functions.php";
 $drawhms=$_GET['drawhms'];
 $room=$_GET['room'];
 $type=$_GET['type'];
-$supported_HMS= array('HMS100T','HMS100TF','HMS100WD','HMS100MG','HMS100TFK','HMS100W','RM100-2');
+$supported_HMS= array('HMS100T','HMS100TF','HMS100WD','HMS100MG','HMS100TFK','HMS100W','RM100-2','HMS100CO');
 
 
 
@@ -248,7 +248,7 @@ if ( $type == "HMS100TF" and $showdewpoint=='yes' )
 
 #############################################################################
 if ( $type == "HMS100WD" or $type == "HMS100MG" or $type == "HMS100W" 
-	or $type == "HMS100TFK" or $type=="RM100-2")
+	or $type == "HMS100TFK" or $type=="RM100-2" or $type=="HMS100CO")
 {
   for ($x = 0; $x < $counter; $x++)
         {
@@ -295,6 +295,7 @@ if ( $type == "HMS100WD" or $type == "HMS100MG" or $type == "HMS100W"
        
 	 if ($type=='HMS100WD' or $type=='HMS100W'){$text="Water detected:";}
 	elseif ($type=='HMS100MG'){$text="Gas detected:";}
+ 	elseif ($type=='HMS100CO'){$text="CO detected:";}
 	elseif ($type=='RM100-2'){$text="Smoke detected:";}
 	else {$text="Switch open:";}
  	$fontsize=7;
@@ -361,6 +362,10 @@ function show_error($file,$drawhms,$imgmaxx,$imgmaxy,$type)
 	{
 		$text="define $logname FileLog $file $drawhms:.*Gas.*";
 	}
+	elseif ($type=='HMS100CO')
+        {
+                $text="define $logname FileLog $file $drawhms:.*CO.*";
+        }
 	elseif ($type=='HMS100TFK')
 	{
 		$text="define $logname FileLog $file $drawhms:.*Switch.*";
diff --git a/webfrontend/pgm3/include/userdefs.php b/webfrontend/pgm3/include/userdefs.php
index df84d2ca6..9382e2a64 100755
--- a/webfrontend/pgm3/include/userdefs.php
+++ b/webfrontend/pgm3/include/userdefs.php
@@ -204,8 +204,9 @@ EOD;
                         fclose($f1);
 
 
+			#plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 0.8 : $3==\"dimdown\"? 0.2 : $3==\"off\"? 0 : 0.5;}' \
 			$messageB=<<<EOD
-			plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 0.8 : $3==\"dimdown\"? 0.2 : $3==\"off\"? 0 : 0.5;}' \
+			plot "< awk '{print $1, $3==\"on\"? 1 : $3==\"dimup\"? 1 : $3==\"dimdown\"? 0 : $3==\"off\"? 0 : 0.5;}' \
 			$filename" using 1:2 title '' with steps
 
 EOD;