From 22ff15d55b020d4e2cceff7638d0de7183fb2887 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sat, 3 Sep 2011 11:30:27 +0000
Subject: [PATCH] FB7270 added

git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@991 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 CHANGED                   |  1 +
 contrib/FB7270/fhemcmd.sh | 14 ++++++++
 contrib/FB7270/makeimage  | 44 +++++++++++++++++++++++++
 contrib/FB7270/startfhem  | 21 ++++++++++++
 docs/fhem.html            | 28 ++++++++--------
 docs/fritzbox.html        | 63 ++++++++++++++++++++++++++++++++---
 docs/fritzbox7390.html    | 69 ---------------------------------------
 7 files changed, 152 insertions(+), 88 deletions(-)
 create mode 100644 contrib/FB7270/fhemcmd.sh
 create mode 100755 contrib/FB7270/makeimage
 create mode 100755 contrib/FB7270/startfhem
 delete mode 100644 docs/fritzbox7390.html

diff --git a/CHANGED b/CHANGED
index 055aded7b..aa3ec1353 100644
--- a/CHANGED
+++ b/CHANGED
@@ -8,6 +8,7 @@
   - bugfix:  FS20 on-for-timer error reporting only in the logfile
   - bugfix:  FHEM2FHEM should work with CUL again, after syntax change
   - feature: CUL directio mode (No Device::SerialPort needed)
+  - feature: FritzBox 7270 ZIP file
 
 - 2011-07-08 (5.1)
   - feature: smallscreen optimizations for iPhone
diff --git a/contrib/FB7270/fhemcmd.sh b/contrib/FB7270/fhemcmd.sh
new file mode 100644
index 000000000..cd45db2d3
--- /dev/null
+++ b/contrib/FB7270/fhemcmd.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+## FritzBox 7390
+## Beispiel fuer das Senden von FHEM Kommandos ueber den Telefoncode
+## #95*x* wobei x hier 1 bzw 2 entspricht.
+
+case $1 in
+1) echo "set Steckdose on" | /sbin/socat -  TCP:127.0.0.1:7072
+   ;;
+2) echo "set Steckdose off" | /sbin/socat - TCP:127.0.0.1:7072
+   ;;
+esac
+
+
diff --git a/contrib/FB7270/makeimage b/contrib/FB7270/makeimage
new file mode 100755
index 000000000..7120a8118
--- /dev/null
+++ b/contrib/FB7270/makeimage
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+fw=$1
+if test ! -f ../../$fw.tar.gz; then
+  echo "usage: makeimage <fhem-VERSION>"
+  echo "../../<fhem-VERSION>.tar.gz must exist"
+  exit 1
+fi
+
+rm -rf var
+echo Extracting the fritzbox template
+unzip -qo ../../priv/fritzbox7270_template.zip
+
+cp fhemcmd.sh fhem/FHEM
+cp startfhem fhem
+
+echo Extracting $fw
+rm -rf $fw
+tar zxf ../../$fw.tar.gz
+cd $fw
+cp fhem.pl ../fhem
+cp FHEM/*\
+        webfrontend/pgm2/*\
+        docs/*.html\
+        docs/fhem.png\
+        docs/*.jpg\
+        ../fhem/FHEM
+
+cd examples
+for i in *; do
+   cp -r $i ../../fhem/FHEM/example.$i
+done
+cd ../..
+rm -rf $fw
+
+
+echo Packing again
+cd fhem
+cp FHEM/example.sample_pgm2 fhem.cfg
+perl -pi -e 's,/tmp,./log,g' fhem.cfg
+
+cd ..
+zip -qr $fw-fb7270.zip fhem
+rm -rf fhem
diff --git a/contrib/FB7270/startfhem b/contrib/FB7270/startfhem
new file mode 100755
index 000000000..96e8dfe17
--- /dev/null
+++ b/contrib/FB7270/startfhem
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+root=`df | sed -n -e '/ftp\//s/.*ftp\///p'`
+home=/var/InternerSpeicher/$root/fhem
+
+cd $home
+
+trap "" SIGHUP
+modprobe kernel/cdc_acm
+modprobe ftdi_sio
+sleep 2
+
+ln -sf $home/FHEM/fhemcmd.sh /var/fhemcmd
+
+PATH=$home:$PATH
+export PATH
+
+export LD_LIBRARY_PATH=$home/lib
+export PERL5LIB=$home/lib/perl5/5.10
+
+perl fhem.pl fhem.cfg
diff --git a/docs/fhem.html b/docs/fhem.html
index 0af417d23..5b948dff6 100644
--- a/docs/fhem.html
+++ b/docs/fhem.html
@@ -71,8 +71,9 @@
     <ul>
       Current Version: (as of =DATE=): 
       <a href="http://fhem.de/fhem-=VERS=.tar.gz">fhem-=VERS=.tar.gz</a>,
-      <a href="http://fhem.de/fhem-=VERS=.deb">fhem-=VERS=.deb</a> or
-      <a href="http://fhem.de/fhem-=VERS=-fb7390.image">fhem-=VERS=-fb7390.image</a>
+      <a href="http://fhem.de/fhem-=VERS=.deb">fhem-=VERS=.deb</a>,
+      <a href="http://fhem.de/fhem-=VERS=-fb7390.image">fhem-=VERS=-fb7390.image</a>,
+      <a href="http://fhem.de/fhem-=VERS=-fb7390.image">fhem-=VERS=-fb7270.zip</a>
       <br>
       See the <a href="CHANGED">CHANGED</a> file for current changes.
       <br>
@@ -159,9 +160,11 @@
         La Crosse TX2/TX3.</li>
         <div id="dist"></div>
       <li>Via an attached FHZ1000 or FHZ1300 access to the following protocols:
-        FS20 (all devices), FHT80b, HMS, KS300. <b>Note:</b> The FHZ1350 WLAN
-        works with fhem if you replace the standard (avisario) WLAN module with
-        one that won't encrypt the data.</li>
+        FS20 (all devices), FHT80b, HMS, KS300. <b>Note:</b> For the WLAN
+        version of the FHZ1300 see this <a
+        href="http://www.thinkwiki.org/wiki/User:Akw/FHZ">
+        link</a>.
+        </li>
         <div id="dist"></div>
 
       <li>reading and sending X10 events via the CM11 module (with access
@@ -221,7 +224,8 @@
           protocol.
         <div id="dist"></div>
 
-      <li>Via a TCM120 (e.g. the BSC BOR) access to the EnOcean protocol.
+      <li>Via a TCM120 (e.g. the BSC BOR) or a TCM310 (e.g. busware EUL) access
+      to the EnOcean protocol.
         <div id="dist"></div>
         <div id="dist"></div>
         <div id="dist"></div>
@@ -296,10 +300,7 @@
 
       Device/OS Specific installation guides:<br>
       <ul>
-        <li>Instructions for the Fritz!Box:
-          <a href="fritzbox7390.html">7390</a>, <a
-          href="http://fhemwiki.de/index.php/AVM_Fritz!Box">7170@fhemwiki</a>
-          and <a href="fritzbox.html">7170/7270</a></li>
+        <li>Instructions for the <a href="fritzbox.html">Fritz!Box</a></li>
         <li>Instructions for Nas/Routers (NSLU2):
           <a href="http://www.martin-haas.de/fhz/nslu2fhz">
           http://www.martin-haas.de/fhz/nslu2fhz</a></li>
@@ -345,11 +346,10 @@
     <a name="Installation"></a>
     <h3>Installation</h3>
     <ul>
-    <h4>Fritz!Box 7390</h4>
+    <h4>Fritz!Box</h4>
     <ul>
-      <li>Install a current Lab version first, then <a
-          href="http://fhem.de/fhem-=VERS=-fb7390.image">this</a> image, and
-          connect to http://localhost:8083/fhem. Follow the <a
+      <li>See the detailed documentation <a href="fritzbox.html">here</a>, and
+          after installation connect to http://localhost:8083/fhem. Follow the <a
           href="HOWTO.html">HOWTO</a> for adding devices.
      </ul>
 
diff --git a/docs/fritzbox.html b/docs/fritzbox.html
index 3a6ea6c49..2ef551574 100644
--- a/docs/fritzbox.html
+++ b/docs/fritzbox.html
@@ -27,11 +27,64 @@
 
   <div id="right">
 
-<h1><a href="fhem.html">FHEM</a> on the Fritz!Box</h1>
+<h2><a href="fhem.html">FHEM</a> on the Fritz!Box</h2>
 
-(as of 2009-10-19)
 
-<h3>Description for the Fritzbox 7170 from Achim</h3>
+<h3>Fritz!Box 7390 (as of 2011-09-03)</h3>
+    <ul>
+    After the CeBIT 2011 AVM released an image for the Fritz!Box7390 containing
+    fhem, see <a href="http://www.avm.de/de/Service/Service-Portale/Labor/index.php"
+    >this</a> link. This image is to be installed in <i>addition</i> to the
+    normal firmware.
+    Version 19798 of this fhem-image (not the Lab firmware) configures 2 CUL
+    devices, the first one talking FS20 ("SlowRF"), 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 fhem-image is, that it will start fhem in a chroot
+    environment, i.e. you will not be able to trigger arbitrary FritzBox
+    functions out of fhem, e.g. sending mail, enabling WLAN, etc.
+    <br><br>
+
+    <a href="fhem-=VERS=-fb7390.image">This</a> fhem-image contains a stripped
+    down version of the perl package from the AVM fhem-image, a newer version
+    of fhem, and a modified installation script. The main difference is
+    starting fhem in a normal (non-chroot) environment, and enabling
+    autocreate.  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. Autocreate
+    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. 
+    </ul>
+
+<h3>Fritz!Box 7270 (as of 2011-09-03)</h3>
+    <ul>
+    Thank to Eyk's work there is also a <a
+    href="fhem-=VERS=-fb7270.zip">ZIP</a> file for the Fritz!Box7270. To install it:
+    <ul>
+      <li>First unzip the .ZIP file in the root directory of the USB-disk/USB-stick.
+      <li>Attach the stick to the FB
+      <li>open a telnet window, connect to the FB.
+      <li>With the command df check the name of the stick on the FB.
+      <li>Execute the following command in the FB telnet window to start fhem
+          when the FB reboots:<br>
+          echo "&lt;name-of-the-stick&gt;/fhem/startfhem" >> /var/flash/debug.cfg
+      <li>Start fhem manually with "&lt;name-of-the-stick&gt;/fhem/startfhem"
+    </ul>
+    Note: As the perl in this package does <b>not</b> contain the
+    Device::SerialPort module, currently only the CUL and devices connected via
+    TCP/IP are supported. To define the CUL, the following command should be used:<br>
+      <ul>
+        define MyCUL CUL /dev/ttyACM0@directio 1234
+      </ul>
+    for details see the <a href="commandref.html#CUL">CUL</a> documentation.
+    </ul>
+
+<h3>Fritzbox 7170 in <a href="http://fhemwiki.de/index.php/AVM_Fritz!Box">fhemwiki</a></h3>
+
+<h3>Fritzbox 7170 (from Achim, as of 2009-10-19)</h3>
 <ul>
     <li>Flash the FritzBox with the Freetz firmware using the Fritzbox
     web-frontend.  As we are not allowed to offer a FritzBox binary image for
@@ -103,10 +156,10 @@
     <li>Restart the box
 </ul>
 
-<h3>Description for the Fritzbox 7270 from Volker</h3>
+<h3>Fritzbox 7270 (from Volker, as of 2009-10-19)</h3>
 <ul>
   <li>Unpack <a href="fb7270/fhem45-on-fritzbox.tgz">fhem45-on-fritzbox.tgz</a>
-    to the USB-Stick.<br><br>
+    to the USB-stick.<br><br>
   <li>Attach the USB storage (stick) to the Fritz!Box. The Fritz!Box should
     recognize it. Now we have to modify usr/fhem/rc.fhem.<br><br>
   <li>Login (via telnet) to the Fritz!Box with the WEB-Password<pre>
diff --git a/docs/fritzbox7390.html b/docs/fritzbox7390.html
deleted file mode 100644
index f8879fc00..000000000
--- a/docs/fritzbox7390.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!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-07-08)
-<br><br>
-
-    AVM released after the CeBIT 2011 an image for the Fritz!Box7390 containing
-    fhem, see <a href="http://www.avm.de/de/Service/Service-Portale/Labor/index.php"
-    >this</a> link. This image is to be installed in <i>addition</i> to the
-    normal firmware.  In order to use the image, you have to install a Lab
-    version of the normal firmware before, because fhem needs the USB-Serial
-    kernel modules in order to talk to the CUL, and these are not yet part of
-    the "normal" firmware.<br>
-
-    Version 19798 of this fhem-image (not the Lab 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 fhem-image is, that it will start fhem in a chroot
-    environment, i.e. you will not be able to trigger arbitrary FritzBox
-    functions out of fhem, e.g. sending mail, enabling WLAN, etc.<br><br>
-
-    <br><br>
-
-    <a href="fhem-=VERS=-fb7390.image">This</a> fhem-image contains a stripped
-    down version of the perl package from the AVM fhem-image, a current version
-    of fhem, and a modified installation script. The main difference is
-    starting fhem in a normal (non-chroot) environment, and enabling
-    autocreate.<br><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. Autocreate 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>
-</div>
-</body>
-
-</html>