diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index f7d4d294a..29da299b8 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -2365,9 +2365,9 @@ A line ending with \ will be concatenated with the next one, so long lines
Define a WS2000 series raw receiver device sold by ELV. Details see here.
- Unlike 86_FS10.pm it will handle the complete device communication itself and
- doesnt require an external program.
- For this reason you can now use this also on windows.
+ Unlike 86_FS10.pm it will handle the complete device communication itself
+ and doesnt require an external program. For this reason you can now use
+ this also on windows.
This Device will be usually connect to a serial port, but you can also
define a raw network redirector like lantronix XPORT(TM).
@@ -3302,13 +3302,16 @@ isday, sunrise_coord
refresh
- This defines the time-interval in which a new rendering of the defined WebLinks will be done.
+ This defines the time-interval in which a new rendering of the defined
+ WebLinks will be done.
tmpfile
- This gives the path and a possible prefix for the rendered filenames.
- You can specify a path to which the files will be rendered. If you also specify a prefix, this will be used to build the resulting filename.
+ This gives the path and a possible prefix for the rendered
+ filenames.
You can specify a path to which the files will be
+ rendered. If you also specify a prefix, this will be used to build the
+ resulting filename.
@@ -3320,32 +3323,46 @@ isday, sunrise_coord
Perl specials
- To use fhem commands from the perl expression, use the function "fhem",
- which takes a string argument, this string will be evaluated as an fhem
- command chain.
- Example:
-
- define n1 notify piri:on { fhem "set light on" }
-
-
- -
- To make date and time handling easier, before evaluating a perl expression
- the variables $sec, $min, $hour, $mday, $month, $year, $wday, $yday, $isdst
- are set (see perldoc -f localtime), with the exception that $month is in the
- range of 1 to 12, and $year is also corrected by 1900 (as one would normally
- expect). Additionally $we is 1 if it is weekend (i.e $wday == 0 ||
- $wday == 6), and 0 otherwise.
- Example:
-
- define n2 notify piri:on { if($hour > 18 || $hour < 5) { fhem "set light on" } }
-
+ which takes a string argument, this string will be evaluated as a fhem
+ command chain.
+ Example:
+
+ define n1 notify piri:on { fhem "set light on" }
+
-
+ - To make date and time handling easier, before evaluating a perl
+ expression the variables $sec, $min, $hour, $mday, $month, $year, $wday,
+ $yday, $isdst are set (see perldoc -f localtime), with the exception that
+ $month is in the range of 1 to 12, and $year is also corrected by 1900 (as
+ one would normally expect). Additionally $we is 1 if it is weekend (i.e
+ $wday == 0 || $wday == 6), and 0 otherwise. Example:
+
+
+ define n2 notify piri:on { if($hour > 18 || $hour < 5) { fhem "set
+ light on" } }
+
+
+ -
+ The following small helper functions are defined in 99_Util.pm (which will
+ be loaded automatically):
+
+ - min(a,b), max(a,b)
+ - time_str2num("YYYY-MM-DD HH:MM:SS") returns a numerical value,
+ which makes computation of time differences easier
+ - abstime2rel("HH:MM:SS") converts an absolute time to a relative one,
+ to compare it with the sunrise commands in the following example:
+ # Switch lamp1 on at sunrise, but not before 07:00
+ define a13 at +*{max(abstime2rel("07:00"),sunrise_rel())} set lamp1
+ on
+
+
+
-
Note: do not forget to escape the semicolon (;) with two semicolons
(;;), else your perl code will be interpreted as an fhem command and you
most certainly get syntax errors.
-
+
-
The current value (the string you see in paranthesis in the output of the
@@ -3354,12 +3371,12 @@ isday, sunrise_coord
If you need the old value (and time) of the currently triggered device,
then you can access it with
$oldvalue{$dev}{TIME}
and
$oldvalue{$dev}{VAL}
.
-
+
-
To access the numerical value of an FS20 command (e.g. toggle), use the
hash
fs20_c2b
. E.g. { Log 2, $fs20_c2b{"toggle"} }
-
+
-
By using the 99_SUNRISE_EL.pm module, you have access to the following
@@ -3374,7 +3391,7 @@ isday, sunrise_coord
The _rel functions should be used as "at" spec, and the _abs functions as
argument to the on-till argument of the set command.
isday returns 1 if the sun is visible, and 0 else.
-
+
diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html
index 8714e1c93..1b6ab30e6 100644
--- a/fhem/docs/fhem.html
+++ b/fhem/docs/fhem.html
@@ -10,8 +10,7 @@
FHEM
-GPL'd server to access devices like FHZ1000/FHZ1300,EM1010PC,WS300,SCIVT,X10.
-Formerly known as fhz1000.pl
+GPL'd server for house automation. Formerly known as fhz1000.pl
Current Version: (as of =DATE=) is =VERS=
@@ -21,37 +20,40 @@ href="#webfrontends"/>webfrontends section for screenshots.
Description
-This program makes the FHZ1000/FHZ1300/WS300 and other USB devices sold by ELV,
-Conrad and others as well as X10 devices sold by Marmitek, Powerhouse and
-others useable with Linux. In fact, there is nothing Linux special
-in it, there are reports from OS X and Windows. You should be able to use it on
-other platforms as long as you can access the hardware as a serial device.
+fhem is used to automate some common tasks in the household like
+switching lamps/shutters/heating/etc. and to log events like
+temperature/humidity/power consumption.
+
The program runs as a server, you can control it via telnet, command line
program or TCP/IP directly, like the supplied web frontends do.
Currently implemented features:
- Via the FHZ module (with access to one or more FHZ1000/FHZ1300 device):
-
- - reading and sending FS20 events (on/off/dimming, timer
- commands)
- - support of FS20 address features function group, local and global
- master
- - reading and changing FHT80b parameters (temp, actuator, etc).
- The FHT8b seems to work too. Note: the FHT8 wont work.
- Internal software buffer to prevent lost commands.
- - reading HMS data (HMS100-T,-TF,-WD,-MG,-TFK,-CO,-FIT and RM100-2)
- - reading KS300 data
-
+
+ - reading and sending FS20 events (on/off/dimming, timer
+ commands)
+ - support of FS20 address features function group, local and global
+ master
+ - reading and changing FHT80b parameters (temp, actuator, etc).
+ The FHT8b seems to work too. Note: the FHT8 wont work.
+ Internal software buffer to prevent lost commands.
+ - reading HMS data (HMS100-T,-TF,-WD,-MG,-TFK,-CO,-FIT and RM100-2)
+ - reading KS300 data
+
Note: The FHZ1350 WLAN is probably not working due to a prorietary
encryption.
-
+
- Via the CM11 module (with access to a X10 computer interface):
-
- - reading all X10 events
- - sending X10 events (on/off/dimming)
- - timed on/off switching support
-
+
+ - reading all X10 events
+ - sending X10 events (on/off/dimming)
+ - timed on/off switching support
+
+
+ - Via the CUL module (see www.busware.de
+ ) access to the FS20/EM1000/FHT/S300 protocols. Note:due to
+ the incomplete firmware the access is read-only at the moment.
- reading WS300 data, and up to 9 attached devices
- reading EM1000WZ/EM1000EM/EM1000GZ data via an attached EM1010PC
@@ -69,8 +71,8 @@ Currently implemented features:
- different web frontends, choose your favorite
-See HOWTO.html, commandref.html
-and faq.html for more documentation.
+See HOWTO.html,
+commandref.html and faq.html for more documentation, and contrib/README for other extensions.
Links:
@@ -85,14 +87,20 @@ and faq.html for more documentation.
http://groups.google.com/group/FHZ1000-users-on-unix
Martins Web frontend (webpgm3):
http://www.martin-haas.de/fhz
- Another Martins Web frontend (myHCE): http://www.fischer-net.de/projekte/haustechnik/myhce.html
+ Another Martins Web frontend (myHCE):
+
+ http://www.fischer-net.de/projekte/haustechnik/myhce.html
CVS@berlios:
http://developer.berlios.de/projects/fhem
LinViex (home automation frontend):
- CUL
+ http://sourceforge.net/projects/linviex
+ busware.de:
+ CUL,
+ CUL fans google group
+
+
- http://sourceforge.net/projects/linviex
Device/OS Specific installation guides:
- Linux driver installation:
@@ -170,24 +178,23 @@ If you are using cygwin for your perl installation you can follow the guidelines
- You don't have to install all of them, one is probably more than
enough :-)
- - The web server and the fhem server must be on the same host
- Important: Make sure you add some protection (.htaccess, etc)
else everybody will be able to set your devices
- - The list below contains the 2 actively maintained fronteds:
Web frontend 2 (webfrontend/pgm2)
- This frontend is a FHEM module implementing a HTTP server. 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.
+ This frontend is a FHEM module implementing a HTTP server, no further
+ 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.
+
Screenshots: overview, detail, SVG-plots.
Installation: make install-pgm2 && perl fhem.pl
-
+ 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.