FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

Fritzbox changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@915 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-06-19 06:17:27 +00:00
parent 75d0b40703
commit b502997904
4 changed files with 102 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/docs/fhem.html
View File

@ -282,8 +282,7 @@
<a href="http://www.martin-haas.de/fhz/nslu2fhz"> <a href="http://www.martin-haas.de/fhz/nslu2fhz">
http://www.martin-haas.de/fhz/nslu2fhz</a></li> http://www.martin-haas.de/fhz/nslu2fhz</a></li>
<li>Instructions for the Fritz!Box: <li>Instructions for the Fritz!Box:
<a href="fritzbox.html"> <a href="fritzbox7390.html">7390</a> and <a href="fritzbox.html">7170/7270</a></li>
http://fhem.de/fritzbox.html</a></li>
<li>Instructions for the Allnet all6250: <li>Instructions for the Allnet all6250:
<a href="http://wiki.dungeon.de/all6250_opennas_mit_fhem"> <a href="http://wiki.dungeon.de/all6250_opennas_mit_fhem">
http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li> http://wiki.dungeon.de/all6250_opennas_mit_fhem</a></li>

34
fhem/docs/fritzbox.html
View File

@ -1,13 +1,31 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>FHEM on the Fritz!Box</title> <title>fhem on the Fritz!Box 7170 and 7270</title>
<style type="text/css">
body { background-color: #FFFFE7;}
#left { position:absolute; top:20px; left:20px; width:140px; }
#right { position:absolute; top:20px; left:180px; bottom:20px; right:10px; }
body>div#left { position:fixed; }
h2,h3,h4 { color:#52865D; line-height:1.3;
margin-top:1.5em; font-family:Arial,Sans-serif; }
div#block { border:1px solid gray; background: #F8F8E0; padding:0.7em; }
div#dist { padding-top:0.3em; }
a { color: #278727; }
</style>
</head> </head>
<body style="background-color: white">
<body>
<div id="left">
<img src="fhem.png">
<h3>Fhem on the Fritzbox 7270 and 7170</h3>
</div>
<div id="right">
<h1><a href="fhem.html">FHEM</a> on the Fritz!Box</h1> <h1><a href="fhem.html">FHEM</a> on the Fritz!Box</h1>
@ -107,13 +125,7 @@
</ul> </ul>
<h3>Links</h3> </div>
<ul>
<li>
My own, outdated description: <a href="fritzbox_old.html">fritzbox_old.html
</a>
</ul>
My
</body> </body>
</html> </html>

76
fhem/docs/fritzbox7390.html Normal file
View File

@ -0,0 +1,76 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>fhem on the Fritz!Box 7390</title>
<style type="text/css">
body { background-color: #FFFFE7;}
#left { position:absolute; top:20px; left:20px; width:140px; }
#right { position:absolute; top:20px; left:180px; bottom:20px; right:10px; }
body>div#left { position:fixed; }
h2,h3,h4 { color:#52865D; line-height:1.3;
margin-top:1.5em; font-family:Arial,Sans-serif; }
div#block { border:1px solid gray; background: #F8F8E0; padding:0.7em; }
div#dist { padding-top:0.3em; }
a { color: #278727; }
</style>
</head>
<body>
<div id="left">
<img src="fhem.png">
<h3>Fhem on the Fritzbox 7390</h3>
</div>
<div id="right">
<h1><a href="fhem.html">FHEM</a> on the Fritz!Box 7390</h1>
(as of 2011-06-18)
<h3>Description for the Fritzbox 7390</h3>
<ul>
AVM released after the CeBIT 2011 a "firmware" image containing fhem, see <a
href="http://www.avm.de/de/Service/Service-Portale/Labor/7390_hausautomation/labor_start_hausautomation.php">this</a>
link. This is to be installed in addition to the normal firmware. In order
to use this version, you have to install a Lab version of the "normal"
firmware first, because we need the USB-Serial kernel modules in order to
talk to the CUL and the "Lab" firmware also contains a hook in order to
start fhem.
<br>
Version 19798 of this firmware configures 2 CUL devices, the first one
talking FS20, the second preconfigured for HomeMatic. Autoconfigure is not
enabled by default, so you'll either have to enable it or to enter the
devices by hand.
<br><br>
The bad news with this version is, that it will start fhem in a chroot
environment, i.e. you will not be able to use arbitrary FritzBox functions
out of fhem.
<br><br>
<a href="fhem-5.1.rc1.fb7390.image">This</a> firmware image is a modified
version of the AVM original firmware, as it will not start fhem in a chroot
jail. I also cleaned up the perl distribution, so it is some 30
uncompressed MB smaller than the original.
<br>
When installing it, you have to confirm with an extra click that it does
not have a valid AVM signature. It will reuse your old logfiles and
configuration, unlike the "original" AVM firmware. Autoconfigure is on, and
there are NO CUL devices defined in the initial configuration, you'll have
to do this manually, e.g. by following the HOWTO or the command reference.
<br><br>
Further bad news for both versions: Currently the only working serial
kernel driver is the cdc_acm, which means only the CUL can be attached
directly to the FritzBox. The FHZ1x00 needs the ftdi_sio driver, which
currently panics the FritzBox.<br> Alternatively you can use devices
attached via network, like the CUN.
</ul>
</div>
</body>
</html>

4
fhem/fhem.pl
View File

@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.143 2011-06-12 10:51:57 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.144 2011-06-19 06:17:27 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -691,7 +691,7 @@ AnalyzeCommand($$)
if($cmd =~ m/^"(.*)"$/s) { # Shell code in bg, to be able to call us from it if($cmd =~ m/^"(.*)"$/s) { # Shell code in bg, to be able to call us from it
my $out = ""; my $out = "";
$out = "> $currlogfile 2>&1" if($currlogfile ne "-"); $out = ">> $currlogfile 2>&1" if($currlogfile ne "-");
system("$1 $out &"); system("$1 $out &");
return undef; return undef;
} }