diff --git a/fhem/TODO b/fhem/TODO
index 19e5d9312..3e4e83b1c 100644
--- a/fhem/TODO
+++ b/fhem/TODO
@@ -1,6 +1,5 @@
FHEM:
- uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot)
-- HomeMatic signing
- HomeMatic set log 2
- mergelog
@@ -14,8 +13,3 @@ Webpgm2
- integrate weblink details in the SVG
- autocreate: multiple plots
- fancy webkit tranformations
-
-=============
-5.1
-- .deb
-- examples
diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index d493bed49..89e91e3f4 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -539,8 +539,8 @@ A line ending with \ will be concatenated with the next one, so long lines
timestamps of the local files with the filelist on the server, and
downloads the files changed on the server. For all downloaded modules a
reload will be scheduled if the corresponding module is loaded.
- If an explicit filename is given, then this file will be downloaded
- unconditionally.
+ If an explicit filename is given, then only this file will be downloaded.
+
Note: if the main program (fhem.pl) is changed, a manual restart of fhem
will be necessary to apply the changes.
diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html
index c7dde021d..4d9e44734 100644
--- a/fhem/docs/fhem.html
+++ b/fhem/docs/fhem.html
@@ -12,6 +12,8 @@
body>div#left { position:fixed; }
h3 { color:#52865D; line-height:1.3;
margin-top:1.5em; font-family:Arial,Sans-serif; }
+ 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; }
@@ -69,10 +71,10 @@
See the CHANGED file for current changes.
- Nightly CVS version:
+ Nightly CVS version: a
- http://www.dhs-computertechnik.de/downloads/fhem-cvs.tgz
-
+ tarball, or from the fhem commandline via updatefhem.
Please fill out our survey,
@@ -119,12 +121,14 @@
Features
- support for a lot of protocols used in house automation like FS20,
- FHT, HMS, OneWire, X10, S300, EM. See the Hardware section for more.
- - autocreating devices/logs when receiving data from a new device
+ - autocreating devices/logs when receiving data from a new device:
+ start fhem and watch how the plots of your sensors are appearing
+ automatically.
- logging events to files or databases, with regexp filters
- - notifying external programs or internal modules when receiving certain
+
- notifying external programs or scripts when receiving certain
events
- timed commands (e.g. switching a lamp on from sunset till midnight)
@@ -201,6 +205,16 @@
devices.
+ - Via the eibd or a TUL (see www.busware.de) access to the EIB/KNX
+ protocol.
+
+
+
+
+ A detailed description is to be found in the fhem reference.
+
@@ -214,17 +228,17 @@
-
-
+
+
contrib/README describes
some loosely coupled useful modules / scripts which can be used with
fhem.
@@ -265,6 +279,16 @@
Device/OS Specific installation guides:
@@ -312,25 +328,32 @@
Installation
+ Fritz!Box 7390
+
+ - Install a current Lab version first, then this image, and
+ connect to http://localhost:8083/fhem. Follow the HOWTO for adding devices.
+
- Debian/Ubuntu
+ Debian/Ubuntu
- Install
this package, and connect to http://localhost:8083/fhem. Follow
the HOWTO for adding devices.
- Unix / OSX
+ Unix / OSX
- Make sure you have perl. Install the module Device::SerialPort with
- "sudo cpan Device::SerialPort"
+ "sudo cpan Device::SerialPort" (OSX user can skip this part).
- Check the Makefile for the installation path, then type make
install-pgm2.
- Check the installed configuration file and start fhem as advised.
- Follow the HOWTO for adding devices.
- Windows
+ Windows
Note:If you are using cygwin for your perl installation you can
follow the guidelines for Unix.
@@ -361,17 +384,14 @@
programs are needed. It has support for grouping devices into rooms,
manipulating devices, direct fhem commands, displaying logfiles as text
or plot (SVG builtin or PNG by gnuplot), navigating/zooming in the
- plots, HTTP basicAuth, HTTPS and IPV6
+ plots, HTTP basicAuth, HTTPS and IPV6 (with the IO::Socket::SSL and
+ IO::Socket:INET6 perl modules)
+
Screenshots: overview, detail, SVG-plots.
- Installation: make install-pgm2
- Start fhem as advised in the make output.
- This will start fhem.pl with a minimalistic configuration.
- Connect to fhem via http://localhost:8083/fhem. See the
- Howto there on how to continue.
+ It installed by default, but it can be deconfigured.
Web frontend 3 (webfrontend/pgm3)
diff --git a/fhem/docs/fritzbox7390.html b/fhem/docs/fritzbox7390.html
index 0ed1740b0..9800442c5 100644
--- a/fhem/docs/fritzbox7390.html
+++ b/fhem/docs/fritzbox7390.html
@@ -29,32 +29,33 @@
FHEM on the Fritz!Box 7390
-(as of 2011-06-18)
+(as of 2011-07-08)
+
-Description for the Fritzbox 7390
-
AVM released after the CeBIT 2011 an image for the Fritz!Box7390 containing
- fhem, see this
- link. This image is to be installed in addition to the normal firmware. In
- order to use the image, you have to install a Lab version of the
- normal firmware first, because fhem needs 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.
+ fhem, see this link. This image is to be installed in addition 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.
- Version 19798 of this fhem-image 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.
+ 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.
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.
- This fhem-image contains a stripped
- down version of the perl package from the AVM fhem-image, a CVS version of
- fhem, and a modified installation script. The main difference is starting
- fhem in a normal (non-chroot) environment, and enabling autocreate.
+
+
+ This 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.
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
@@ -66,9 +67,9 @@
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.
Alternatively you can use devices
- attached via network, like the CUN.
-
+ currently panics the FritzBox. If I am informed correctly, then this
+ problem will be solved in the near future.
+ Of course you can always use devices attached via network, like the CUN.
