Merge remote branch 'origin/master' into enocean

CHANGED

@@ -10,7 +10,7 @@
   - bugfix:  FHEM2FHEM should work with CUL again, after syntax change
   - feature: CUL directio mode (No Device::SerialPort needed)
   - feature: FritzBox 7270 ZIP file
-  - buxgfix: prevent fhem from stalling if telnet times out in 66_ECMD.pm
+  - bugfix:  prevent fhem from stalling if telnet times out in 66_ECMD.pm
   - feature: added postproc ability to classdef in 66_ECMD.pm (Boris, Heinz)
   - feature: FHEMWEB longpoll mode, small fixes, tuned smallscreen mode
   - feature: average module added
@@ -27,6 +27,7 @@
   - feature: FHEMWEB save button, smallscreen first screen fix
   - feature: FHEMWEB encoding is now UTF-8, alias attribute is respected
   - change:  HTTPS certs directory moved from cwd into modpath
+  - feature: shutdwown parameter restart added
 
   
 - 2011-07-08 (5.1)

FHEM/99_updatefhem.pm

@@ -35,8 +35,7 @@ CommandUpdatefhem($$)
   my ($cl, $param) = @_;
   my $lt = "";
   my $ret = "";
-  my $moddir = "$attr{global}{modpath}/FHEM";
-  #my $moddir = "XXX";
+  my $moddir = (-d "FHEM.X" ? "FHEM.X" : "$attr{global}{modpath}/FHEM");
 
   ## backup by RueBe
   my @commandchain = split(/ +/,$param);

TODO

@@ -1,14 +1,12 @@
 FHEM:
-- uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot)
+- FHEM2FHEM reconnect
 - HomeMatic set log 2
-- mergelog
 
 - autodetect physical hardware
 - RFR: Error message for uncomplete last message
 - implement wiki decisions
 
 Webpgm2
-- setting the dummy state via dropdown is not possible
 - click on the graph only correct for the day zoom
 - integrate weblink details in the SVG
 - autocreate: multiple plots

docs/commandref.html

@@ -962,14 +962,16 @@ A line ending with \ will be concatenated with the next one, so long lines
 <a name="shutdown"></a>
 <h3>shutdown</h3>
 <ul>
-  <code>shutdown</code>
+  <code>shutdown [restart]</code>
   <br><br>
   Shut down the server (after saving the <a href="#statefile">state information
-  </a>). It triggers the global:SHUTDOWN event.
+  </a>). It triggers the global:SHUTDOWN event.  If the optional restart
+  parameter is specified, fhem tries to restart itself.
   <br><br>
   Example:
   <ul>
-    <code>shutdown</code>
+    <code>shutdown</code><br>
+    <code>shutdown restart</code>
   </ul>
 </ul>
 

examples/sample_pgm2

@@ -7,9 +7,6 @@ attr global port 7072 global           # our TCP/IP port
 attr global statefile /tmp/fhem.save   # where to save the state of the devices
 attr global verbose 3                  # "normal" verbosity (min 1, max 5)
 
-#define CUL CUL /dev/ttyACM0 1234
-#define FHZ FHZ /dev/USB0
-
 define WEB FHEMWEB 8083 global
 
 define WEBphone FHEMWEB 8084 global
@@ -18,7 +15,7 @@ attr WEBphone smallscreen
 define WEBtablet FHEMWEB 8085 global
 attr WEBtablet touchpad
 
-# Fake logfile, to access the global log
+# Fake FileLog entry, to access the fhem log from FHEMWEB 
 define Logfile FileLog /tmp/fhem-%Y-%m.log fakelog
 
 define autocreate autocreate
@@ -27,3 +24,15 @@ attr autocreate device_room %TYPE
 attr autocreate filelog /tmp/%NAME-%Y.log
 attr autocreate weblink
 attr autocreate weblink_room Plots
+
+
+# You probably have to enable some of the following lines.
+# Verify first that /dev/xxx ist correct.
+
+#define FHZ FHZ /dev/USB0
+#define CUL CUL /dev/ttyACM0@9600 1234
+#attr CUL rfmode HomeMatic
+
+#define EUL TCM 310 /dev/ttyACM0@57600
+#define BscBor TCM 120 /dev/ttyUSB0@9600
+#define BscSmartConnect TCM 310 /dev/ttyUSB0@57600

fhem.pl

@@ -233,7 +233,7 @@ my $commonAttr = "eventMap";
   "setdefaultattr" => { Fn=>"CommandDefaultAttr",
 	    Hlp=>"<attrname> <attrvalue>,set attr for following definitions" },
   "shutdown"=> { Fn=>"CommandShutdown",
-	    Hlp=>",terminate the server" },
+	    Hlp=>"[restart],terminate the server" },
   "sleep"  => { Fn=>"CommandSleep",
             Hlp=>"<sec>,sleep for sec, 3 decimal places" },
   "trigger" => { Fn=>"CommandTrigger",
@@ -1042,6 +1042,9 @@ CommandShutdown($$)
 
   WriteStatefile();
   unlink($attr{global}{pidfilename}) if($attr{global}{pidfilename});
+  if($param && $param eq "restart") {
+    system("(sleep 2; exec perl $0 $attr{global}{configfile})&");
+  }
   exit(0);
 }
 

webfrontend/pgm2/01_FHEMWEB.pm

@@ -1868,6 +1868,8 @@ FW_devState($$)
   }
 
   if($link) {
+    my $room = AttrVal($d, "room", undef);
+    $link .= "&room=$room" if($room);
     if($FW_longpoll) {
       $txt = "<a onClick=\"cmd('$FW_ME?XHR=1&$link')\">$txt</a>";