diff --git a/docs/HOWTO.html b/docs/HOWTO.html index 35fe895d3..e714efaf0 100644 --- a/docs/HOWTO.html +++ b/docs/HOWTO.html @@ -36,15 +36,22 @@

Starting fhem

-

Attaching the USB device for the PC (CUL / FHZ1x00PC / EM1010PC)

+

Attaching the USB device for the PC (CUL / FHZ1x00PC / etc)

-

Configuring transmitter devices

+

Configuring transmitter devices (sensors)

-

Configuring FS20 receivers

+

Configuring FS20 receivers (actors)

@@ -194,7 +205,13 @@ notifies/watchdogs do. You can even simulate events by using the trigger command:
       trigger lamp1 on
- + + For a more complex automation you can either control fhem by an external + program via telnet or HTTP, or (the usual way) do this via the fhem at + and notify commands. at and notify takes either simple fhem commands, + shell skripts or "perl oneliners" as argument. For details and tips on + the perl oneliners read the Perl + specials section in the commandref.html

FHEMWEB (pgm2) look and feel

@@ -203,12 +220,21 @@ attribute. FHEMWEB puts devices without a room attribute into the "Unsorted" room. Devices in the room "hidden" will not be shown.

+ You can also define a stripped down FHEMWEB instance, by defining the + Menu entries to be hidden in the + hiddenroom FHEMWEB attribute. +

- Set the title of the webpage by setting the title attribute of the global - device ("All together" -> global)

+ + Set the title of the webpage by setting the title attribute + of the global device ("All together" -> global)

Edit the colors / fonts by changing the style.css ("Edit files" -> - style.css)

+ style.css), or create you own style (see stylesheetPrefix , so it + won't be overwritten by the next updatefhem command. +

Further FHEMWEB attributes: webname, @@ -245,7 +271,8 @@

Plotting logs

@@ -313,7 +339,11 @@ - To display "foreign" (non fhem) files as a plot or a just as plain text, + To display "foreign" (non fhem) files as a plot or just as plain text, configure a fake logfile with the correct filename and an unused regexp, e.g.
       define messages FileLog /var/log/messages fakelog
diff --git a/docs/commandref.html b/docs/commandref.html index 7ece0c811..ec2c66663 100644 --- a/docs/commandref.html +++ b/docs/commandref.html @@ -31,6 +31,7 @@ attr   CULflash   + createlog   define   delete   deleteattr   @@ -542,7 +543,8 @@ A line ending with \ will be concatenated with the next one, so long lines jsonlist [<devspec>|<typespec>|ROOMS]

Returns an JSON tree of all definitions, all notify settings and all at - entries if no parameter is given. + entries if no parameter is given. Can also be called via HTTP by + http://fhemhost:8083/fhem?cmd=jsonlist&XHR=1

Example: 
  fhem> jsonlist
@@ -732,7 +734,9 @@ A line ending with \ will be concatenated with the next one, so long lines
     Download the CUL firmware from a nightly SVN chekout and flash the
     hardware. Currently only the CUL is supported with its versions:
     CUL_V2, CUL_V2_HM, CUL_V3, CUL_V4.

-    Note: dfu-programmer has to be installed in the path.

+    Note: dfu-programmer has to be installed in the path, this is
+    already the case with the Fritz!Box 7390 image from fhem.de

+
     If the CUL is not yet flashed, then first define a CUL
     device (even if fhem won't be able to open the device), insert it with the
     button pressed (this will set the device into flash-mode), then issue the
@@ -8093,13 +8097,7 @@ isday
  • 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 that this functionality is easier to achieve with:
    - define a13 at +*{sunrise_rel(0,"07:00",undef)} set lamp1 on
    +
  • abstime2rel("HH:MM:SS") converts an absolute time to a relative one
    • @@ -8136,10 +8134,8 @@ isday By using the 99_SUNRISE_EL.pm module, you have access to the following functions:
    offset is in seconds, and the format of min/max is "HH:MM" or "HH:MM:SS". diff --git a/docs/fhem.html b/docs/fhem.html index 33d5fde39..e15cc8565 100644 --- a/docs/fhem.html +++ b/docs/fhem.html @@ -81,8 +81,9 @@ Builtin pgm2 / external pgm5 web frontend: overview, the same rendered for smartphones, - detail, SVG-plots. + detail, + SVG-plots, + dark style.

    pgm3 web frontend:
    + functions out of fhem, e.g. sending mail, enabling WLAN, etc., it relies + only on the commands provided by a busybox copied to the chroot + environment.

    + +     This image from fhem.de contains a + stripped down version of the perl package from the AVM fhem-image, the fhem + package, a dfu-programmer for flashing the CUL, 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. - This 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. -

    Fritz!Box 7270 (as of 2011-09-03)

    +

    Fritz!Box 7170/7270 (as of 2011-09-03)

    diff --git a/docs/pgm2-5.png b/docs/pgm2-5.png new file mode 100644 index 000000000..6692da62e Binary files /dev/null and b/docs/pgm2-5.png differ