From 0cf5b0a61b48fa1c8d82443dd4413cb3a87a7360 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 29 Sep 2013 08:23:28 +0000 Subject: [PATCH] fhem.html/Makefile: preparing 5.5 git-svn-id: https://svn.fhem.de/fhem/trunk@3972 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/Makefile | 4 +- fhem/demolog/eventTypes.txt | 4 +- fhem/demolog/fhem.save | 7 +- fhem/docs/fhem.html | 223 ++++++++++++--------------------- fhem/docs/fhem_DE.html | 226 ++++++++++++---------------------- fhem/docs/fritzbox.html | 2 +- fhem/docs/pgm2-1.png | Bin 73524 -> 95474 bytes fhem/docs/pgm2-2.png | Bin 78709 -> 224786 bytes fhem/docs/pgm2-3.png | Bin 252787 -> 79105 bytes fhem/docs/pgm2-4.png | Bin 48226 -> 0 bytes fhem/docs/pgm2-5.png | Bin 86133 -> 0 bytes fhem/www/pgm2/brightstyle.css | 4 +- 12 files changed, 173 insertions(+), 297 deletions(-) delete mode 100644 fhem/docs/pgm2-4.png delete mode 100644 fhem/docs/pgm2-5.png diff --git a/fhem/Makefile b/fhem/Makefile index 658cb482d..6690bad25 100644 --- a/fhem/Makefile +++ b/fhem/Makefile @@ -1,5 +1,5 @@ VERS=5.5 -DATE=2013-09-22 +DATE=2013-09-29 RELATIVE_PATH=YES BINDIR=/opt/fhem @@ -100,7 +100,7 @@ dist: xargs perl -pi -e 's/=VERS=/$(VERS)/g;s/=DATE=/$(DATE)/g' rm -rf .f/www/SVGcache mv .f $(DESTDIR) - tar cf - $(DESTDIR) | gzip > $(DESTDIR).tar.gz + tar cf - $(DESTDIR) | gzip -9 > $(DESTDIR).tar.gz rm -rf $(DESTDIR) dist-clean: diff --git a/fhem/demolog/eventTypes.txt b/fhem/demolog/eventTypes.txt index 05f37bcfb..d03f3459d 100644 --- a/fhem/demolog/eventTypes.txt +++ b/fhem/demolog/eventTypes.txt @@ -83,7 +83,7 @@ 1 global DELETED SVG_Log.Dewpoint_1 1 global DELETED alarmToggler 741 global DELETED minuteTimer -29 global INITIALIZED +31 global INITIALIZED 1 global RENAMED Lamp1 Outdoor 1 global RENAMED Lamp2 Office 1 global RENAMED Lamp3 Livingroom @@ -98,7 +98,7 @@ 1 global RENAMED Sens.Out Garden 1 global RENAMED outdoorNotify outdoorNotifier 42 global SAVE -29 global SHUTDOWN +31 global SHUTDOWN 15 lcCinema scene AllOff 19 lcCinema scene Break 16 lcCinema scene Cinema diff --git a/fhem/demolog/fhem.save b/fhem/demolog/fhem.save index 2e6ee935d..60acca981 100644 --- a/fhem/demolog/fhem.save +++ b/fhem/demolog/fhem.save @@ -1,4 +1,4 @@ -#Mon Aug 26 18:01:39 2013 +#Thu Sep 26 12:28:55 2013 setstate Alarm on setstate Alarm 2013-08-23 07:42:48 state on setstate AllLights on @@ -57,8 +57,7 @@ setstate autocreate active setstate dew_all active setstate et active setstate global -setstate lcCinema WatchTV setstate outdoorNotifier active -setstate sunRise Next: 05:55:41 -setstate sunSet Next: 20:59:15 +setstate sunRise Next: 06:44:33 +setstate sunSet Next: 19:49:35 setstate wlCinema initialized diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html index ab6e29715..dc4f67fc5 100644 --- a/fhem/docs/fhem.html +++ b/fhem/docs/fhem.html @@ -33,7 +33,7 @@ Features - Hardware + Protocols Documentation @@ -62,7 +62,7 @@ The program runs as a server, you can control it via web or smartphone frontends, telnet or TCP/IP directly.

- In order to use fhem you'll need a 24/7 server (Fritz!Box, NAS, RPi, PC, + In order to use FHEM you'll need a 24/7 server (Fritz!Box, NAS, RPi, PC, MacMini, etc) with a perl interpreter and some attached hardware like the CUL, FHZ1300PC, etc. to access the actors and sensors. See the "Supported hardware" section below. @@ -98,57 +98,60 @@

Frontend screenshots

@@ -156,16 +159,15 @@

Features

- -

Supported hardware

+ +

Supported protocols

@@ -294,7 +239,7 @@
contrib/README describes some loosely coupled useful modules / scripts which can be used with - fhem.
+ FHEM.
@@ -321,6 +266,7 @@
  • Instructions for the Allnet all6250: http://wiki.dungeon.de/all6250_opennas_mit_fhem
    • +
  • Raspberry PI with EnOcean
  • Linux driver installation: linux.html
  • Misc USB problems: @@ -360,21 +306,21 @@

      Fritz!Box

        -
      • On the FB7390 install this image. Note: it - is needed additionally to the OS image from AVM.
        +
      • On the FB7390 or FB7490 install this image. Note: it + is needed additionally to the OS image from AVM.
      • On the FB7270 unpack this zip file to a USB-Disk, - attach the disk to the FritzBox, log in, and start fhem from there. + href="http://fhem.de/fhem-=VERS=-fb7270.zip">this zip file to a USB-Disk, + attach the disk to the FritzBox, log in, and start FHEM from there.
      • See also the detailed documentation here.

      Debian/Ubuntu

      • Install this package. - Note: For upgrading it is necessary to purge the old package (dpkg - -P fhem), as the directory structure has changed to be the same as with - .tar.gz or fritzbox. + Note: For upgrading from 5.2 or earlier it is necessary to purge + the old package (dpkg -P fhem), as the directory structure has changed to + be the same as with .tar.gz or fritzbox.

      Unix / OSX

      @@ -385,25 +331,20 @@
    • Download the .tar.gz package, unpack it, and change to the unpacked directory. -
    • start fhem directly from this directory (perl fhem.pl fhem.cfg). +
    • start FHEM directly from this directory (perl fhem.pl fhem.cfg).

    Windows

      - Note: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%), and the module - Win32::SerialPort is installed.
      • -
    • Make sure that you can access your device (CUL/FHZ/etc) via virtual - COM-Port or via socket (e.g. COMX or xport:10001).
      • -
    • Download the - .tar.gz package, unpack it, and change to the unpacked directory. -
    • Start the server with perl fhem.pl fhem.cfg
      • +
    • See the HOWTO_Windows.html for a + detailed description.
      • +
    • If you are using cygwin for your perl installation you can + follow the guidelines for Unix.
    -

    - After installation follow the HOWTO for adding devices. + + After the installation follow the HOWTO for adding + devices. @@ -416,7 +357,7 @@ instead)
  • Martin Haas (webfrontends/pgm3)
  • Olaf Droegehorn (webfrontends/pgm5)
    • -
  • Numerous other people with their fhem modules
    • +
  • Numerous other people with their FHEM modules
    • License: GPL (v2)
    Thanks to TOSTi for inspiration and numerous other people for help.
    diff --git a/fhem/docs/fhem_DE.html b/fhem/docs/fhem_DE.html index f668a73c6..841178a62 100644 --- a/fhem/docs/fhem_DE.html +++ b/fhem/docs/fhem_DE.html @@ -32,7 +32,7 @@ Features - Hardware + Protokolle Dokumentation @@ -66,10 +66,11 @@ XML existieren ebenfalls.

    - Um es zu verwenden benötigt man einen 24/7 Rechner (Fritz!Box, NAS, RPi, - PC, MacMini, etc) mit einem perl Interpreter und angeschlossene - Hardware-Komponenten wie CUL, FHZ1300PC, etc. für einen Zugang zu den - Aktoren und Sensoren. Siehe den Hardware Abschnitt für mehr. + Um es zu verwenden benötigt man einen 24/7 Rechner (Fritz!Box, NAS, + RPi, PC, MacMini, etc) mit einem perl Interpreter und angeschlossene + Hardware-Komponenten wie CUL, FHZ1300PC, etc. für einen Zugang zu + den Aktoren und Sensoren. Siehe den Hardware Abschnitt für mehr. + @@ -100,59 +101,60 @@

    Frontend Screenshots

    @@ -161,120 +163,62 @@

    Features

    - -

    Unterstützte hardware

    + +

    Unterstützte Protokolle (Auszug)

    @@ -340,6 +284,8 @@ http://wiki.dungeon.de/all6250_opennas_mit_fhem
    +
  • Raspberry PI mit EnOcean
    • +
  • Linux Treiber Installation : http://fhem.de/linux.html(nur im Problemfall, english)
    • @@ -384,7 +330,7 @@