diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index 64a5acdc7..7d09a872e 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -426,6 +426,7 @@ make editing of multiline commands transparent.
KS300: ks300
WS300: ws300pc
EM1010: em1010pc
+ WS2000: ws2000
@@ -889,6 +890,43 @@ make editing of multiline commands transparent.
+
+ Type WS2000
+
+ define <name> WS2000<device_to_connect>
+
+
+ Define a WS2000 series raw receiver device sold by ELV. Details see here.
+ Unlike 86_FS10.pm it will handle the comple 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).
+
Note: Currently this device does not support a "set" function
+
+
+
+
+ Attributes:
+
+ rain: factor for calculating amount of rain in ml/countaltitude: height in meters to calculate pressure for NN(not used yet)
+
+ Example:
+
+ define WS2000 WS2000 /dev/ttyS0
+
+
+ define WS2000 WS2000 xport:10001
+
+
+ attr WS2000 rain 366 : use factor 366 ml/count for rain sensor S2000R
+
+
+
+
Type FileLog
diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html
index 9b3abdd2a..448da06e2 100644
--- a/fhem/docs/fhem.html
+++ b/fhem/docs/fhem.html
@@ -1,258 +1,279 @@
-
-
-
-
-Home of FHEM
-
-
-
-
-
-FHEM
-GPL'd server to access devices like FHZ1000/FHZ1300,EM1010PC,WS300,SCIVT.
-Formerly known as fhz1000.pl
-
-News (as of =DATE=, Version =VERS=)
-
- - feature: added archivedir/archivecmd to the the main logfile
- - feature: 99_Sunrise_EL.pm (does not need any Date modules)
- - bugfix: seldom xmllist error resulting in corrupt xml (Martin/Peter, 4.9)
- - bugfix: FHT mode holiday_short added (9.9, Dirk)
- - bugfix: Modifying a device from its own trigger crashes (Klaus, 10.9)
- - feature: webpgm2 output reformatted
- - feature: webpgm2 displaying multiple plots
- - feature: FHT lime-protection code discovered by Dirk (7.10)
- - feature: softwarebuffer for FHT devices (Dirk 17.10)
- - feature: FHT low temperatur warning and offset (Dirk 17.10)
- - change: change FHT state into warnings (Dirk 17.10)
- NOTE: you'll get an undefined type state & undefined type
- unknown_85 message after upgrade, this will disappear at the
- second start.
- - feature: Softwarebuffer code simplified (Rudi 22.11)
- - bugfix: bug #12327 doppeltes my
- - bugfix: set STATE from trigger
- - bugfix: readings state vs STATE problem (xmllist/trigger)
- - change: SUNRISE doc changed (99_SUNRISE.pm -> 99_SUNRISE_EL.pm)
- - feature: support for the M232 ELV device (Boris, 25.11)
- - feature: alternativ Quad-based numbers for the FS20 (Matthias, 24.11)
- - feature: dummy type added (contrib/99_dummy.pm)
- - feature: added database logging facility (93_DbLog.pm) (Boris, 29.12)
- - feature: support for %NAME, %EVENT, %TYPE parameters in notify definition (Boris, 29.12)
- - bugfix: 62_EMEM.pm: energy_total_kWh renamed to energy_kWh_w, energy_kWh added (Boris, 6.1)
-
-
-
-
-Description
-
-This program makes the FHZ1000/FHZ1300/WS300 and other USB devices sold by ELV,
-Conrad and others useable with Linux. In fact, there is nothing Linux special
-in it, you should be able to use it on other platforms as long as you can
-access the hardware as a serial device.
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 and RM100-2)
- - reading KS300 data
-
- Note:The FHZ1350 WLAN is probably not working due to a prorietary
- encryption.
-
- - reading WS300 data, and up to 9 attached devices
- - reading EM1000WZ/EM1000EM data via an attached EM1010PC
- - reading attached SCIVT devices
- - reading attached M232 devices
- - logging events to files or databases, with regexp filters
- - notifying external programs or internal modules when receiving certain
- events
- - timed commands (e.g. switching a lamp on from sunset till midnight)
- - modular architecture
- - Two different web frontends, choose your favorite
-
-
-See commandref.html for a detailed command
-description and faq.html for the F.A.Q.
-
-
-Links:
-
-Related projects:
-
-
-Installation
-
-
-Linux driver
- See
- http://www.koeniglich.de/fhem/linux.html
- For kernels older then 2.6.x apply the patch from the doc directory to your
- kernel, recompile it and reboot or load/reload the ftdi_sio module.
-
-
-Perl modules
-
- You need perl with the Device::SerialPort (
- http://search.cpan.org/dist/Device-SerialPort/)
- module. All other needed modules were present in my installation.
- If this module reports Can't call method "opened" on an undefined
- value... when starting the server, then you either may ignore
- this message, or replace the mentioned line with:
- $self->{HANDLE}->close if (defined($self->{HANDLE}) &&
- $self->{HANDLE}->opened);
-
-
-Server installation
-
- - Copy the file
fhem.pl into your path (e.g.
- /usr/local/bin), and the FHEM directory e.g. to
- /usr/local/lib.
- - Copy additional modules from the contrib directory
- (like 99_SUNRISE_EL.pm)
- - Make sure that you can access the serial USB
- device (e.g.
/dev/tts/USB0).
- - Create a configuration file (see the examples directory and
- docs/commandref.html), change at least the modpath
- (
/usr/local/lib) and define FHZ FHZ (/dev/tts/USB0)
- parameters.
- - Start the server with
fhem.pl <configfile>
-
-
-General Notes for Webfrontends:
-
- - 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
-
-
-Web frontend 2 (webfrontend/pgm2)
-
- This frontend is a FHEM module realising a primitive HTTP server -> You do
- not even need apache if security (password/HTTPS) is not a concern.
- It has support for grouping devices into rooms, manipulating devices, direct
- fhem commands, diplaying logfiles as text or (if gnuplot is installed) as
- graphs.
- Screenshots: one, two.
-
-
- For installation see the webpgm/pgm2/README file.
-
-Web frontend 3 (webfrontend/pgm3)
-
- This frontend is PHP based and was contributed by Martin Haas.
- Look at the webfrontends/pgm3/docs for more documentation or at
- this screenshot. A lot more details can be
- found on Martins page:
- http://www.martin-haas.de/fhz
-
-
-
- - Install PHP and enable it by commenting in the "LoadModule
- phpX_module ..." directive in httpd.conf (perhaps it is already
- done by your distro). Restart/reload httpd.
-
- - Create a directory (e.g.: /home/httpd/html/pgm3) and copy all the
- files from the webfrontend/pgm3 to this directory.
Make sure that this
- directory is writeable by the webserver!
-
- - Edit index.php (/home/httpd/html/pgm3/index.php), and check the
- required settings section
-
- - If you want to have access to the FHT temperature logs, then:
-
- - Make sure gnuplot is installed
- - check the showgnuplot section in index.php
- - For each FHT device copy the file docs/gnuplot/gnuplot.wz to
- gnuplot.fhtdevicename (to the /home/httpd/html/pgm3 directory) and
- replace fht.log in this file with the absolute name of the current
- logfile.
-
- - Call <your-site>/pgm3/index.php
-
-
-
-Web frontend 4 (webfrontend/pgm4, the template)
-
- This frontend is PHP based and was contributed by Stefan Mayer. It won't work
- for you without modification, it is meant as a template or as an example. See
- the screenshot. To install:
-
- - Copy the directory webfrontend/pgm4 to your html directory.
- - Install/enable PHP (see the description for frontend3)
- - Call the program with http://webserver/pgm4/fs20.php
-
- Now you can go on, and modify it to suit your needs :-)
-
-
-
-
-License:
-
- Copyright:
-
- - Rudolf Koenig (r dot koenig at koeniglich dot de)
- - Raoul Matthiessen (webfrontends/pgm1)
- - Martin Haas (webfrontends/pgm3)
-
- License: GPL (v2)
-
-
-
-
-Misc:
-
- Thanks for Tosti for inspiration and numerous other people for help.
-
-
-
-
-
+
+
+
+
+Home of FHEM
+
+
+
+
+
+FHEM
+GPL'd server to access devices like FHZ1000/FHZ1300,EM1010PC,WS300,SCIVT.
+Formerly known as fhz1000.pl
+
+News (as of =DATE=, Version =VERS=)
+
+ - feature: added ws2000 support via 87_WS2000.pm(thomas 10.05.08)
+ - feature: added archivedir/archivecmd to the the main logfile
+ - feature: 99_Sunrise_EL.pm (does not need any Date modules)
+ - bugfix: seldom xmllist error resulting in corrupt xml (Martin/Peter, 4.9)
+ - bugfix: FHT mode holiday_short added (9.9, Dirk)
+ - bugfix: Modifying a device from its own trigger crashes (Klaus, 10.9)
+ - feature: webpgm2 output reformatted
+ - feature: webpgm2 displaying multiple plots
+ - feature: FHT lime-protection code discovered by Dirk (7.10)
+ - feature: softwarebuffer for FHT devices (Dirk 17.10)
+ - feature: FHT low temperatur warning and offset (Dirk 17.10)
+ - change: change FHT state into warnings (Dirk 17.10)
+ NOTE: you'll get an undefined type state & undefined type
+ unknown_85 message after upgrade, this will disappear at the
+ second start.
+ - feature: Softwarebuffer code simplified (Rudi 22.11)
+ - bugfix: bug #12327 doppeltes my
+ - bugfix: set STATE from trigger
+ - bugfix: readings state vs STATE problem (xmllist/trigger)
+ - change: SUNRISE doc changed (99_SUNRISE.pm -> 99_SUNRISE_EL.pm)
+ - feature: support for the M232 ELV device (Boris, 25.11)
+ - feature: alternativ Quad-based numbers for the FS20 (Matthias, 24.11)
+ - feature: dummy type added (contrib/99_dummy.pm)
+ - feature: added database logging facility (93_DbLog.pm) (Boris, 29.12)
+ - feature: support for %NAME, %EVENT, %TYPE parameters in notify definition (Boris, 29.12)
+ - bugfix: 62_EMEM.pm: energy_total_kWh renamed to energy_kWh_w, energy_kWh added (Boris, 6.1)
+
+
+
+
+Description
+
+This program makes the FHZ1000/FHZ1300/WS300 and other USB devices sold by ELV,
+Conrad and others useable with Linux. In fact, there is nothing Linux special
+in it, you should be able to use it on other platforms as long as you can
+access the hardware as a serial device.
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 and RM100-2)
+ - reading KS300 data
+
+ Note:The FHZ1350 WLAN is probably not working due to a prorietary
+ encryption.
+
+ - reading WS300 data, and up to 9 attached devices
+ - reading EM1000WZ/EM1000EM data via an attached EM1010PC
+ - reading attached SCIVT devices
+ - reading attached M232 devices
+ - reading attached WS2000/WS25000 devices, also via raw network converters(xport)
+ - logging events to files or databases
+
- logging events to files or databases, with regexp filters
+ - notifying external programs or internal modules when receiving certain
+ events
+ - timed commands (e.g. switching a lamp on from sunset till midnight)
+ - modular architecture
+ - Two different web frontends, choose your favorite
+
+
+See commandref.html for a detailed command
+description and faq.html for the F.A.Q.
+
+
+Links:
+
+Related projects:
+
+
+Installation
+
+
+Linux driver
+ See
+ http://www.koeniglich.de/fhem/linux.html
+ For kernels older then 2.6.x apply the patch from the doc directory to your
+ kernel, recompile it and reboot or load/reload the ftdi_sio module.
+
+
+Perl modules
+
+ You need perl >=5.8, on Unix with the Device::SerialPort (
+ http://search.cpan.org/dist/Device-SerialPort/),
+ on Windows Win32::SerialPort (best along ActiveState ActivePerl installation on Windows)
+ module. All other needed modules were present in my installation.
+ If this module reports Can't call method "opened" on an undefined
+ value... when starting the server, then you either may ignore
+ this message, or replace the mentioned line with:
+ $self->{HANDLE}->close if (defined($self->{HANDLE}) &&
+ $self->{HANDLE}->opened);
+
+
+Server installation on Unix
+
+ - Copy the file
fhem.pl into your path (e.g.
+ /usr/local/bin), and the FHEM directory e.g. to
+ /usr/local/lib.
+ - Copy additional modules from the contrib directory
+ (like 99_SUNRISE_EL.pm)
+ - Make sure that you can access the serial USB
+ device (e.g.
/dev/tts/USB0).
+ - Create a configuration file (see the examples directory and
+ docs/commandref.html), change at least the modpath
+ (
/usr/local/lib) and define FHZ FHZ (/dev/tts/USB0)
+ parameters.
+ - Start the server with
fhem.pl <configfile>
+
+
+Server installation on Windows
+( if you are using cygwin for your perl installation you can follow the guidelines for Unix)
+
+ - be sure you have perl.exe in your path (%PATH%)
+ - unpack distribution in a directory of your choise
+ - Copy additional modules from the contrib directory
+ (like 99_SUNRISE_EL.pm)
+ - Make sure that you can access the serial USB
+ device via virtual COM-Port or via socket(e.g.
COMX or xport:10001).
+ - Create a configuration file (see the examples directory and
+ docs/commandref.html), change at least the modpath
+ (
your_install_dir) and define FHZ FHZ (COM10)
+ parameters.
+ - Start the server with
fhem.pl <configfile>
+
+
+
+General Notes for Webfrontends:
+
+ - 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
+
+
+Web frontend 2 (webfrontend/pgm2)
+
+ This frontend is a FHEM module realising a primitive HTTP server -> You do
+ not even need apache if security (password/HTTPS) is not a concern.
+ It has support for grouping devices into rooms, manipulating devices, direct
+ fhem commands, diplaying logfiles as text or (if gnuplot is installed) as
+ graphs.
+ Screenshots: one, two.
+
+
+ For installation see the webpgm/pgm2/README file.
+
+Web frontend 3 (webfrontend/pgm3)
+
+ This frontend is PHP based and was contributed by Martin Haas.
+ Look at the webfrontends/pgm3/docs for more documentation or at
+ this screenshot. A lot more details can be
+ found on Martins page:
+ http://www.martin-haas.de/fhz
+
+
+
+ - Install PHP and enable it by commenting in the "LoadModule
+ phpX_module ..." directive in httpd.conf (perhaps it is already
+ done by your distro). Restart/reload httpd.
+
+ - Create a directory (e.g.: /home/httpd/html/pgm3) and copy all the
+ files from the webfrontend/pgm3 to this directory.
Make sure that this
+ directory is writeable by the webserver!
+
+ - Edit index.php (/home/httpd/html/pgm3/index.php), and check the
+ required settings section
+
+ - If you want to have access to the FHT temperature logs, then:
+
+ - Make sure gnuplot is installed
+ - check the showgnuplot section in index.php
+ - For each FHT device copy the file docs/gnuplot/gnuplot.wz to
+ gnuplot.fhtdevicename (to the /home/httpd/html/pgm3 directory) and
+ replace fht.log in this file with the absolute name of the current
+ logfile.
+
+ - Call <your-site>/pgm3/index.php
+
+
+
+Web frontend 4 (webfrontend/pgm4, the template)
+
+ This frontend is PHP based and was contributed by Stefan Mayer. It won't work
+ for you without modification, it is meant as a template or as an example. See
+ the screenshot. To install:
+
+ - Copy the directory webfrontend/pgm4 to your html directory.
+ - Install/enable PHP (see the description for frontend3)
+ - Call the program with http://webserver/pgm4/fs20.php
+
+ Now you can go on, and modify it to suit your needs :-)
+
+
+
+
+License:
+
+ Copyright:
+
+ - Rudolf Koenig (r dot koenig at koeniglich dot de)
+ - Raoul Matthiessen (webfrontends/pgm1)
+ - Martin Haas (webfrontends/pgm3)
+
+ License: GPL (v2)
+
+
+
+
+Misc:
+
+ Thanks for Tosti for inspiration and numerous other people for help.
+
+
+
+
+
