diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html
index ebe5b47f2..9c15c1a5d 100644
--- a/fhem/docs/fhem.html
+++ b/fhem/docs/fhem.html
@@ -12,50 +12,18 @@
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 ELV IPWE-Support via 88_IPWE.pm (thomas 18.05.08)
- - feature: added windows COM-Port support to FHZ, EM,WS2000,WS300 (thomas 12.05.08)
- - feature: added ReadyFn to have an alternate methode to check if data available(thomas 11.05.08)
- - 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)
-
-
-
+
+Current Version: (as of =DATE=) is =VERS=
+See the CHANGED file for current changes.
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.
+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.
+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:
@@ -79,13 +47,12 @@ Currently implemented features:
- reading attached M232 devices
- reading attached WS2000/WS25000 devices, also via raw network converters(xport)
- extract sensor data from IPWE networked weather data receiver
- - 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
+ - modular architecture, easy to add your special device
+ - different web frontends, choose your favorite
See commandref.html for a detailed command
@@ -119,9 +86,7 @@ description and faq.html for the F.A.Q.
- Windows driver installation:
http://fhz4linux.info/tiki-index.php?page=Driver%20installation
- (best:use "Solution B";change only the value PID to the FDTI default. Your supplied software will not harm.)
- At this time, we only support virtual com port on windows. Only COM1..COM9 are known to work
- ->COM10 will result in a "unknown Device" error.
+ (use "Solution B", only COM1..COM9 is supported)
- Instructions for Nas/Routers (NSLU2):
http://www.martin-haas.de/fhz/nslu2fhz
@@ -142,20 +107,13 @@ description and faq.html for the F.A.Q.
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.
+ on Windows Win32::SerialPort (use ActiveState's ActivePerl)
+ module.
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:
@@ -180,7 +138,7 @@ description and faq.html for the F.A.Q.
Server installation on Windows
-( if you are using cygwin for your perl installation you can follow the guidelines for Unix)
+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 choice
@@ -203,19 +161,21 @@ description and faq.html for the F.A.Q.
- 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 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.
-
+ 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.
+ Screenshots: overview, detail,
+ SVG-plots.
+
For installation see the webpgm/pgm2/README file.
+
Web frontend 3 (webfrontend/pgm3)
@@ -251,21 +211,6 @@ description and faq.html for the F.A.Q.
-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:
@@ -274,7 +219,7 @@ description and faq.html for the F.A.Q.
- Raoul Matthiessen (webfrontends/pgm1)
- Martin Haas (webfrontends/pgm3)
- License: GPL (v2)
+ License: GPL (v2)
diff --git a/fhem/docs/pgm2-1.png b/fhem/docs/pgm2-1.png
index 62144a743..a93593b84 100644
Binary files a/fhem/docs/pgm2-1.png and b/fhem/docs/pgm2-1.png differ
diff --git a/fhem/docs/pgm2-2.png b/fhem/docs/pgm2-2.png
index 0735a2745..2116b92fd 100644
Binary files a/fhem/docs/pgm2-2.png and b/fhem/docs/pgm2-2.png differ
