Preparing for 4.3: doc fixes/last changes

git-svn-id: https://svn.fhem.de/fhem/trunk@207 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -407,3 +407,6 @@
   - feature: add simple ELV IPWE1 support (thomas 12.05.08)
   - feature: FileLog get to read logfiles. Used heavily by webpgm2
   - feature: webpgm2: gnuplot-scroll mode to navigate/zoom in logfiles
+  - bugfix:  deleting FS20 device won't result in unknown device (Daniel, 11.7)
+  - feature: webpgm2 generates SVG's from logs: no need for gnuplot
+  - bugfix:  examples corrected to work with current syntax

fhem/FHEM/00_LIRC.pm

@@ -0,0 +1,96 @@
+##############################################
+package main;
+
+use strict;
+use warnings;
+use Time::HiRes qw(gettimeofday);
+use Lirc::Client;
+use IO::Select;
+
+my $def;
+
+#####################################
+# Note: we are a data provider _and_ a consumer at the same time
+sub
+LIRC_Initialize($)
+{
+  my ($hash) = @_;
+  Log 1, "LIRC_Initialize";
+
+# Provider
+  $hash->{ReadFn}  = "LIRC_Read";
+  $hash->{Clients} = ":LIRC:";
+
+# Consumer
+  $hash->{DefFn}   = "LIRC_Define";
+  $hash->{UndefFn} = "LIRC_Undef";
+}
+
+#####################################
+sub
+LIRC_Define($$)
+{
+  my ($hash, $def) = @_;
+  my @a = split("[ \t][ \t]*", $def);
+
+  $hash->{STATE} = "Initialized";
+
+  delete $hash->{LircObj};
+  delete $hash->{FD};
+
+  my $name = $a[0];
+  my $config = $a[2];
+
+  Log 3, "LIRC opening LIRC device $config";
+  my $lirc = Lirc::Client->new({
+        prog    => 'fhem',
+        rcfile  => "$config", 
+        debug   => 0,
+        fake    => 0,
+    });
+  return "Can't open $config: $!\n" if(!$lirc);
+  Log 3, "LIRC opened $name device $config";
+
+  my $select = IO::Select->new();
+  $select->add( $lirc->sock );
+
+  $hash->{LircObj} = $lirc;
+  $hash->{FD} = $lirc->sock;
+  $hash->{SelectObj} = $select;
+  $hash->{DeviceName} = $name;    
+  $hash->{STATE} = "Opened";
+
+  return undef;
+}
+
+#####################################
+sub
+LIRC_Undef($$)
+{
+  my ($hash, $arg) = @_;
+
+  $hash->{LircObj}->close() if($hash->{LircObj});
+  return undef;
+}
+
+#####################################
+sub
+LIRC_Read($)
+{
+  my ($hash) = @_;
+
+  my $lirc= $hash->{LircObj};
+  my $select= $hash->{SelectObj};
+
+  if( my @ready = $select->can_read(0) ){ 
+    # an ir event has been received (if you are tracking other filehandles, you need to make sure it is lirc)
+    my @codes = $lirc->next_codes;    # should not block
+    for my $code (@codes){
+      Log 3, "LIRC code: $code\n";
+      DoTrigger($code, "toggle");
+    }
+  }
+
+}
+
+1;

fhem/FHEM/92_FileLog.pm

@@ -280,7 +280,7 @@ FileLog_Get($@)
 
       my @lda = split("[_:]", $lastdate{$hd});
       my $ts = "12:00:00";                   # middle timestamp
-      $ts = "$lda[1]:30:00" if($hd == 3);
+      $ts = "$lda[1]:30:00" if($hd == 13);
       my $line = sprintf("%s_%s %0.1f\n", $lda[0],$ts, $h->{last2}-$h->{last1});
 
       if($outf eq "-") {

fhem/FHEM/99_SUNRISE_EL.pm

@@ -265,7 +265,7 @@ sub tand($) { tan( ( $_[0] ) * $DEGRAD ); }
 sub atand($) { ( $RADEG * atan( $_[0] ) ); }
 sub asind($) { ( $RADEG * asin( $_[0] ) ); }
 sub acosd($) { ( $RADEG * acos( $_[0] ) ); }
-sub atan2d($) { ( $RADEG * atan2( $_[0], $_[1] ) ); }
+sub atan2d($$) { ( $RADEG * atan2( $_[0], $_[1] ) ); }
 
 sub
 _revolution($)

fhem/Makefile

@@ -1,8 +1,8 @@
 BINDIR=/usr/local/bin
 MODDIR=/usr/local/lib
 
-VERS=4.2
+VERS=4.3
-DATE=2007-12-02
+DATE=2008-07-12
 DIR=fhem-$(VERS)
 
 all:
@@ -14,6 +14,12 @@ install:
 	cp -rp FHEM $(MODDIR)
 	perl -pi -e 's,modpath .,modpath $(MODDIR),' examples/*
 
+install-pgm2:
+	cp fhem.pl $(BINDIR)
+	cp -rp FHEM $(MODDIR)
+	cp -rp webfrontend/pgm2/* $(MODDIR)
+	perl -pi -e 's,modpath .,modpath $(MODDIR),' examples/*
+
 dist:
 	@echo Version is $(VERS), Date is $(DATE)
 	mkdir .f

fhem/contrib/fht.gnuplot

@@ -5,6 +5,7 @@
 #   gnuplot fht.gnuplot
 # (i.e. this file)
 # Note: The webfrontend pgm2 and pgm3 does this for you.
+# More examples can be found in the webfrontend/pgm2 directory.
 
 
 ###########################

fhem/docs/commandref.html

@@ -475,6 +475,37 @@ make editing of multiline commands transparent.<br><br>
         (see fhtbuf).
 
         </li><br>
+
+    <a name="webname"></a>
+    <li>webname<br/>
+        Can be applied to FHEMWEB devices. (webfrontend/pgm2)<br/>
+        Path after the http://hostname:port/ specification. Defaults to fhem,
+        i.e the default http address is http://localhost:8083/fhem
+        </li><br>
+
+    <a name="plotmode"></a>
+    <li>plotmode<br/>
+        Can be applied to FHEMWEB devices. (webfrontend/pgm2)<br/>
+        Specifies ho to generate the plots:
+        <ul>
+          <li>gnuplot<br>
+              Call the gnuplot script with each logfile. The filename
+              specification of the <a href="#FileLog">FileLog</a> device will
+              determine what is in the plot.  The data is converted into an
+              image on the backend with gnuplot.</li>
+          <li>gnuplot-scroll<br>
+              Fhemweb will offer zoom and scroll buttons in order to navigate
+              in the current logfile, i.e. you can select just a part of the
+              data to be displayed. The more data is contained in a single
+              logfile, the easier you can navigate. The recommendation is to
+              store the data for a whole year in one logfile.  The data is
+              converted into an image on the backend with gnuplot.</li>
+          <li>SVG (TODO)<br>
+              The same scrolling as with gnuplot scroll, but the data is sent
+              as an SVG path specification to the frontend, which will compute
+              the image: no need for gnuplot on the backend.</li>
+        </ul>
+        </li><br>
   </li>
   </ul>
 
@@ -1294,6 +1325,7 @@ make editing of multiline commands transparent.<br><br>
   See the <a href="#devspec">Device specification</a> section for details on
   &lt;devspec&gt;.<br>
 
+  <a name="FHZget"></a>
   <h4>Type FHZ:</h4>
   <ul>
     <code>get FHZ &lt;value&gt;</code>
@@ -1325,6 +1357,7 @@ make editing of multiline commands transparent.<br><br>
     </ul>
   </ul>
 
+  <a name="EMget"></a>
   <h4>Type EM:</h4>
   <ul>
     <code>get EM &lt;value&gt;</code>
@@ -1332,6 +1365,7 @@ make editing of multiline commands transparent.<br><br>
     where <code>value</code> is either version or time.
   </ul>
 
+  <a name="EMWZget"></a>
   <h4>Type EMWZ:</h4>
   <ul>
     <code>get EMWZ status</code>
@@ -1339,6 +1373,7 @@ make editing of multiline commands transparent.<br><br>
     This is the same command which is scheduled every 5 minutes internally.
   </ul>
 
+  <a name="M232get"></a>
   <h4>Type M232:</h4>
   <ul>
     <code>get &lt;name&gt; [an0..an5]</code>
@@ -1360,6 +1395,7 @@ make editing of multiline commands transparent.<br><br>
     <br><br>
   </ul>
 
+  <a name="M232Counterget"></a>
   <h4>Type M232Counter:</h4>
   <ul>
     <code>get &lt;name&gt; status</code>
@@ -1371,6 +1407,7 @@ make editing of multiline commands transparent.<br><br>
     <br><br>
   </ul>
   
+  <a name="WS2000get"></a>
   <h4>Type WS2000:</h4>
   <ul>
     <code>get &lt;name&gt; list</code>
@@ -1386,7 +1423,8 @@ make editing of multiline commands transparent.<br><br>
   </ul>
   
  
-<h4>Type IPWE</h4>
+  <a name="IPWEget"></a>
+  <h4>Type IPWE</h4>
   <ul>
     <code>get &lt;name&gt; status</code>
     <br><br>
@@ -1397,6 +1435,68 @@ make editing of multiline commands transparent.<br><br>
     will grep output from device for this sensorname
     <br><br>
   </ul>
+
+  <a name="FileLogget"></a>
+  <h4>Type FileLog</h4>
+  <ul>
+    <code>get &lt;name&gt; &lt;infile&gt; &lt;outfile&gt; &lt;from&gt;
+          &lt;to&gt; &lt;column_spec&gt; </code>
+    <br><br>
+    Read data from the logfile.
+    <ul>
+      <li>&lt;infile&gt;<br>
+        Name of the logfile to grep. "-" is the current logfile, or you can
+        specify an older file (or a file from the archive).</li>
+      <li>&lt;outfile&gt;<br>
+        If it is "-", you get the data back on the current connection, else it
+        is the prefix for the output file. If more than one file is specified,
+        the data is separated by a comment line for "-", else it is written in
+        separate files, numerated from 0.
+        </li>
+      <li>&lt;from&gt; &lt;to&gt;<br>
+        Used to grep the data. The elements should correspond to the
+        timeformat or be an initial substring of it.</li>
+      <li>&lt;column_spec&gt;<br>
+        For each column_spec return a set of data in a separate file or
+        separated by a comment line on the current connection.<br>
+        Syntax: &lt;col&gt;:&lt;regexp&gt;:&lt;default&gt;:&lt;fn&gt;<br>
+        <ul>
+          <li>&lt;col&gt;
+            The column number to return, starting at 1 with the date.
+            If the column is enclosed in double quotes, then it is a fix text,
+            not a column nuber.</li>
+          <li>&lt;regexp&gt;
+            If present, return only lines containing the regexp. Case sensitive.
+            </li>
+          <li>&lt;default&gt;<br>
+            If no values were found and the default value is set, then return
+            one line containing the from value and this default. We need this
+            feature as gnuplot aborts if a dataset has no value at all.
+            </li>
+          <li>&lt;fn&gt;
+            One of the following:
+            <ul>
+              <li>int<br>
+                Extract the  integer at the beginning og the string. Used e.g.
+                for constructs like 10%</li>
+              <li>delta-h or delta-d<br>
+                Return the delta of the values for a given hour or a given day.
+                Used if the column contains a counter, as is the case for the
+                KS300 rain column.</li>
+              <li>everything else<br>
+                The string is evaluated as a perl expression. @fld is the
+                current line splitted by spaces. Note: The string/perl
+                expression cannot contain spaces, as the part after the space
+                will be considered as the next column_spec.</li>
+            </ul></li>
+        </ul></li>
+      </ul>
+    <br><br>
+    Example:
+      <pre>get outlog out-2008.log - 2008-01-01 2008-01-08 4:IR:int: 9:IR::</pre>
+    <br><br>
+  </ul>
+
 </ul>
 
 

fhem/examples/01_fs20

@@ -3,7 +3,7 @@
 # 
 # Define a lamp (which is plugged in via an FS20ST).
 # To program the FS20ST, start the server, plug the FS20ST in pressing its
-# button, and then execute   fhem.pl 7072 "set lamp on" 
+# button (it starts blinking), and then execute   fhem.pl 7072 "set lamp on" 
 #
 
 # Common part

fhem/examples/02_fs20

@@ -25,17 +25,17 @@ setstate roll1 off          # initial state is closed
 # Note: Only one of the methods should be used
 
 # Method 1a: builtin commands. Note the double ;
-notifyon btn3 set roll1 %;; set roll2 %
+define n_1a notify btn3 set roll1 %;; set roll2 %
 
 # Method 1b: shorter:
-notifyon btn3 set roll1,roll2 %
+define n_1b notify btn3 set roll1,roll2 %
 
 # Method 2a: perl.
-notifyon btn3 { fhem "set roll1,roll2 %" }
+define n_2a notify btn3 { fhem "set roll1,roll2 %" }
 
 # Method 2b: perl. open the rollades only to a certain amount if they are
 # closed. Else do the required command.
-notifyon btn3 {\
+define n_2b notify btn3 {\
   if("%" eq "on" && $value{roll1} eq "off") {\
     fhem "set roll1 on-for-timer 10";;\
     fhem "set roll2 on-for-timer 16";;\
@@ -45,7 +45,7 @@ notifyon btn3 {\
 }
 
 # Method 3: shell. The script follows after "quit". Dont forget to chmod u+x it.
-notifyon btn3 "/usr/local/bin/roll.sh %"
+define n_3 notify btn3 "/usr/local/bin/roll.sh %"
 
 quit                        # Ignore the rest of this file
 

fhem/examples/03_fht

@@ -28,3 +28,6 @@ define fhz_timer at *03:30:00 set FHZ time
 # changes, and send measured-temp, actuator and state messages regularly.
 # Be patient: the reply comes in 5-10 minutes.
 define wz_refresh at *04:00:00 set wz report1 255 report2 255
+
+# alias for the above
+define wz_refresh at *04:00:00 set wz refreshvalues

fhem/examples/04_log

@@ -1,7 +1,7 @@
 #
 # fhem.pl configfile
-# Logging FS20/KS300 data
+# Logging FS20/KS300 data into files. For database logging see the
-# See the file fht.gnuplot for displaying the logged data (or webfrontend/pgm2)
+# contrib/91_DbLog.pm
 #
 
 attr global logfile /tmp/fhem-%Y-%m.log
@@ -17,9 +17,11 @@ define ks1 KS300 1234 250   # type KS300, with 250ml rain / counter
 
 #########################
 # Log temperature and actuator changes into a file, its name changes weekly
-define wzlog  FileLog /var/tmp/wz-%Y-%U.log wz:.*(temp|actuator).*
+define wzlog FileLog /var/tmp/wz-%Y-%U.log wz:.*(temp|actuator).*
 
-# Make it accessible from fhemweb.pl (webpgm2)
+# Make it accessible from 01_FHEMWEB.pm (webpgm2)
+# Note: for FHEMWEB large logfiles (one per year) are recommended to be able to
+# navigate
 attr wzlog logtype fht:Temp
 
 # ks300 log

fhem/webfrontend/pgm2/01_FHEMWEB.pm

@@ -56,12 +56,12 @@ my $__detail;                   # durrently selected device for detail view
 my $__title;                    # Page title
 my $__cmdret;                   # Returned data by the fhem call
 my $__scrolledweblinkcount;     # Number of scrolled weblinks
-my %__wlpos;                    # WebLink scroll position
+my %__pos;                      # scroll position
 my $__RET;                      # Returned data (html)
 my $__RETTYPE;                  # image/png or the like
 my $__SF;                       # Short for submit form
 my $__ti;                       # Tabindex for all input fields
-my @__zoom;                     # "day","week","month","year"
+my @__zoom;                     # "qday", "day","week","month","year"
 my %__zoom;                     # the same as @__zoom
 my $__plotmode;                 # Current plotmode
 my $__plotsize;                 # Size for a plot
@@ -110,7 +110,7 @@ FHEMWEB_Define($$)
   ###############
   # Initialize internal structures
   my $n = 0;
-  @__zoom = ("day","week","month","year");
+  @__zoom = ("qday", "day","week","month","year");
   %__zoom = map { $_, $n++ } @__zoom;
 
   return undef;
@@ -212,7 +212,7 @@ FHEMWEB_AnswerCall($)
 {
   my ($arg) = @_;
 
-  %__wlpos = ();
+  %__pos = ();
   $__room = "";
   $__detail = "";
   $__cmdret = "";
@@ -328,7 +328,7 @@ FHEMWEB_digestCgi($)
     if($p =~ m/^val\.(.*)$/) { $val{$1} = $v; }
     if($p =~ m/^dev\.(.*)$/) { $dev{$1} = $v; }
     if($p =~ m/^cmd\.(.*)$/) { $cmd = $v; $c= $1; }
-    if($p eq "wlpos")        { %__wlpos =  split(/[=;]/, $v); }
+    if($p eq "pos")          { %__pos =  split(/[=;]/, $v); }
     if($p eq "data")         { $__data = $v; }
 
   }
@@ -579,8 +579,8 @@ FHEMWEB_roomOverview($)
         pO "  ";
         FHEMWEB_zoomLink("zoom=-1", "Zoom-in.png", "zoom in", 0);
         FHEMWEB_zoomLink("zoom=1",  "Zoom-out.png","zoom out", 0);
-        FHEMWEB_zoomLink("all=-1",  "Prev.png",    "prev", 0);
+        FHEMWEB_zoomLink("off=-1",  "Prev.png",    "prev", 0);
-        FHEMWEB_zoomLink("all=1",   "Next.png",    "next", 0);
+        FHEMWEB_zoomLink("off=1",   "Next.png",    "next", 0);
       }
     }
   }
@@ -606,7 +606,7 @@ FHEMWEB_roomOverview($)
   pO "      <tr><td><a href=\"$__ME/HOWTO.html\">Howto</a></td></tr>\n";
   pO "      <tr><td><a href=\"$__ME/commandref.html\">Details</a></td></tr>\n";
   my $sel = ($cmd =~ m/^style/) ? " class=\"sel\"" : "";
-  pO "      <tr$sel><td><a href=\"$__ME?cmd=style list\">Misc. files</a></td></tr>\n";
+  pO "      <tr$sel><td><a href=\"$__ME?cmd=style list\">Edit files</a></td></tr>\n";
   pO "    </table>\n";
   pO "  </td></tr>\n";
   pO "  </table>\n";
@@ -791,10 +791,7 @@ FHEMWEB_showRoom()
             }
             pO "<table><tr><td>";
 
-            $__wlpos{$va[0]} = $__wlpos{$d} if($__wlpos{$d});
+            my $wl = "&amp;pos=" . join(";", map {"$_=$__pos{$_}"} keys %__pos);
-
-            my $wl = "&amp;wlpos=" . join(";", map { "$_=$__wlpos{$_}" }
-                                grep { /(zoom|all|$va[0])/ } keys %__wlpos);
 
             my $arg="$__ME?cmd=showlog $d $va[0] $va[1] $va[2]$wl";
             if($__plotmode eq "SVG") {
@@ -806,9 +803,6 @@ FHEMWEB_showRoom()
             }
 
             pO "</td><td>";
-            
-            FHEMWEB_zoomLink("$d=-1", "Prev.png", "prev", 1);
-            FHEMWEB_zoomLink("$d=1",  "Next.png", "next", 1);
             pO "<a href=\"$__ME?detail=$d\">$d</a>";
             pO "</td></tr></table>";
 
@@ -1107,13 +1101,13 @@ FHEMWEB_zoomLink($$$$)
 
   my ($d,$off) = split("=", $cmd, 2);
 
-  return if($__plotmode eq "gnuplot");
+  return if($__plotmode eq "gnuplot");                    # No scrolling
   return if($__devs{$d} && $__devs{$d}{ATTR}{fixedrange});
   return if($__devs{$d} && $__devs{$d}{ATTR}{noscroll});
 
-  my $val = $__wlpos{$d};
+  my $val = $__pos{$d};
 
-  $cmd = "room=$__room&amp;wlpos=";
+  $cmd = "room=$__room&amp;pos=";
   if($d eq "zoom") {
 
     $val = "day" if(!$val);
@@ -1121,21 +1115,34 @@ FHEMWEB_zoomLink($$$$)
     return if(!defined($val) || $val+$off < 0 || $val+$off >= int(@__zoom) );
     $val = $__zoom[$val+$off];
     return if(!$val);
-    $cmd .= "zoom=$val";
+
+    # Approximation of the next offset.
+    my $w_off = $__pos{off};
+    $w_off = 0 if(!$w_off);
+    if($val eq "qday") {
+      $w_off =              $w_off*4;
+    } elsif($val eq "day") {
+      $w_off = ($off < 0) ? $w_off*7 : int($w_off/4);
+    } elsif($val eq "week") {
+      $w_off = ($off < 0) ? $w_off*4 : int($w_off/7);
+    } elsif($val eq "month") {
+      $w_off = ($off < 0) ? $w_off*12: int($w_off/4);
+    } elsif($val eq "year") {
+      $w_off =                         int($w_off/12);
+    }
+    $cmd .= "zoom=$val;off=$w_off";
 
   } else {
 
     return if((!$val && $off > 0) || ($val && $val+$off > 0)); # no future
-    $__wlpos{$d}=($val ? $val+$off : $off);
+    $off=($val ? $val+$off : $off);
-    $cmd .= join(";", map { "$_=$__wlpos{$_}" } sort keys %__wlpos);
+    my $zoom=$__pos{zoom};
+    $zoom = 0 if(!$zoom);
+    $cmd .= "zoom=$zoom;off=$off";
 
-    if(!defined($val)) {
-      delete $__wlpos{$d};
-    } else {
-      $__wlpos{$d} = $val;
-    }
   }
 
+
   pO "<a href=\"$__ME?$cmd\">";
   pO "<img style=\"border-color:transparent\" alt=\"$alt\" ".
                 "src=\"$__ME/icons/$img\"/></a>";
@@ -1153,7 +1160,7 @@ FHEMWEB_calcWeblink($$)
   return if($__plotmode eq "gnuplot");
   my $now = time();
 
-  my $zoom = $__wlpos{zoom};
+  my $zoom = $__pos{zoom};
   $zoom = "day" if(!$zoom);
 
   if(!$d) {
@@ -1167,6 +1174,7 @@ FHEMWEB_calcWeblink($$)
     return;
   }
 
+
   return if(!$__devs{$wl});
   return if($__devs{$wl} && $__devs{$wl}{ATTR}{noscroll});
 
@@ -1177,11 +1185,21 @@ FHEMWEB_calcWeblink($$)
     return;
   }
 
-  my $off = $__wlpos{$d};
+  my $off = $__pos{$d};
   $off = 0 if(!$off);
-  $off += $__wlpos{all} if($__wlpos{all});
+  $off += $__pos{off} if($__pos{off});
 
-  if($zoom eq "day") {
+  if($zoom eq "qday") {
+
+    my $t = $now + $off*21600;
+    my @l = localtime($t);
+    $l[2] = int($l[2]/6)*6;
+    $__devs{$d}{from}
+        = sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]);
+    $__devs{$d}{to}
+        = sprintf("%04d-%02d-%02d_%02d",$l[5]+1900,$l[4]+1,$l[3],$l[2]+6);
+
+  } elsif($zoom eq "day") {
 
     my $t = $now + $off*86400;
     my @l = localtime($t);

fhem/webfrontend/pgm2/98_SVG.pm

@@ -27,7 +27,7 @@ SVG_render($$$$$$$)
 
   my ($ow,$oh) = split(",", $wh);       # Original width
   my $th = 16;                          # "Font" height
-  my ($x, $y) = (3*$th,  1.5*$th);      # Rect offset
+  my ($x, $y) = (3*$th,  1.2*$th);      # Rect offset
   my ($w, $h) = ($ow-2*$x, $oh-2*$y);   # Rect size
   my %conf;                             # gnuplot file settings
 
@@ -108,7 +108,6 @@ SVG_render($$$$$$$)
       push @{$dyp}, $v;
       $min = $v if($min > $v);
       $max = $v if($max < $v);
-
     }
   }
 
@@ -135,7 +134,9 @@ SVG_render($$$$$$$)
   # Compute & draw vertical tics, grid and labels
   my $ddur = ($tosec-$fromsec)/86400;
   my ($first_tag, $tag, $step, $tstep, $aligntext,  $aligntics);
-  if($ddur <= 1) {
+  if($ddur <= 0.5) {
+    $first_tag=". 2 1"; $tag=": 3 4"; $step = 3600; $tstep = 900;
+  } elsif($ddur <= 1) {
     $first_tag=". 2 1"; $tag=": 3 4"; $step = 4*3600; $tstep = 3600;
   } elsif ($ddur <= 7) {
     $first_tag=". 6";   $tag=". 2 1"; $step = 24*3600; $tstep = 6*3600;
@@ -286,7 +287,6 @@ SVG_render($$$$$$$)
       pO "<polyline points=\"$ret\" class=\"l$idx\"/>\n";
 
     } elsif($type[$idx] eq "histeps" ) {
-
       if(@{$dxp} == 1) {
           my $y1 = $y+$h-($dyp->[0]-$min)*$hmul;
           $ret .=  sprintf(" %d,%d %d,%d %d,%d %d,%d",

fhem/webfrontend/pgm2/fht.gplot

@@ -14,7 +14,7 @@ set y2tics
 set title '<TL>'
 set grid xtics y2tics
 
-set y2label "temperature (Celsius)"
+set y2label "Temperature in C°"
 set ylabel "Actuator (%)"
 
 #FileLog 4:measured:0:

fhem/webfrontend/pgm2/svg_style.css

@@ -1,15 +1,19 @@
-text { font-family:Times; font-size:12px; }
+text { font-family:Times; font-size:12px; }
-text.title { font-size:16px; }
+text.title { font-size:16px; }
-
+
-rect.border { stroke:black; stroke-width:1px; fill:none; }
+rect.border { stroke:black; stroke-width:1px; fill:none; }
-
+
-polyline { stroke:black; stroke-width:1px; fill:none; }
+polyline { stroke:black; stroke-width:1px; fill:none; }
-
+
-.vgrid { stroke-dasharray:2,6; stroke:gray; }
+.vgrid { stroke-dasharray:2,6; stroke:gray; }
-.hgrid { stroke-dasharray:2,6; stroke:gray; }
+.hgrid { stroke-dasharray:2,6; stroke:gray; }
-
+
-.l0 { stroke:red;     } text.l0 { stroke:none; fill:red; } 
+.l0 { stroke:red;     } text.l0 { stroke:none; fill:red; } 
-.l1 { stroke:green;   } text.l1 { stroke:none; fill:green; } 
+.l1 { stroke:green;   } text.l1 { stroke:none; fill:green; } 
-.l2 { stroke:blue;    } text.l2 { stroke:none; fill:blue; }
+.l2 { stroke:blue;    } text.l2 { stroke:none; fill:blue; }
-.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; }
+.l3 { stroke:magenta; } text.l3 { stroke:none; fill:magenta; }
-.l4 { stroke:cyan;    } text.l4 { stroke:none; fill:cyan; }
+.l4 { stroke:cyan;    } text.l4 { stroke:none; fill:cyan; }
+.l5 { stroke:black;   } text.l5 { stroke:none; fill:black; }
+.l6 { stroke:olive;   } text.l6 { stroke:none; fill:olive; }
+.l7 { stroke:gray;    } text.l7 { stroke:none; fill:gray; }
+.l8 { stroke:yellow;  } text.l8 { stroke:none; fill:yellow; }