From 61c2427130a1bd090df82e32256c5e4658ec5418 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 5 Aug 2007 11:15:34 +0000 Subject: [PATCH] Fritzbox documentation added git-svn-id: https://svn.fhem.de/fhem/trunk@81 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/61_EMWZ.pm | 4 +- fhem/FHEM/62_EMEM.pm | 2 +- fhem/HISTORY | 3 ++ fhem/docs/fhem.html | 24 ++++++++- fhem/docs/fritzbox.html | 109 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+), 5 deletions(-) create mode 100644 fhem/docs/fritzbox.html diff --git a/fhem/FHEM/61_EMWZ.pm b/fhem/FHEM/61_EMWZ.pm index 6c539f522..9b39cb705 100755 --- a/fhem/FHEM/61_EMWZ.pm +++ b/fhem/FHEM/61_EMWZ.pm @@ -88,8 +88,8 @@ EMWZ_GetStatus($) DoTrigger($name, undef) if($init_done); } - $hash->{STATE} = "$cur_power kWh"; - Log GetLogLevel($name,4), "EMWZ $name: $cur_power kWh / $vals{energy}"; + $hash->{STATE} = "$cur_power kW"; + Log GetLogLevel($name,4), "EMWZ $name: $cur_power kW / $vals{energy}"; return $hash->{STATE}; } diff --git a/fhem/FHEM/62_EMEM.pm b/fhem/FHEM/62_EMEM.pm index 3d45a3977..90841c804 100755 --- a/fhem/FHEM/62_EMEM.pm +++ b/fhem/FHEM/62_EMEM.pm @@ -82,7 +82,7 @@ EMEM_GetStatus($) DoTrigger($name, undef) if($init_done); } - $hash->{STATE} = "$cur_power kWh"; + $hash->{STATE} = "$cur_power kW"; Log GetLogLevel($name,4), "EMEM $name: $cur_power kW / $vals{energy_kWh_h} kWh/h"; return $hash->{STATE}; diff --git a/fhem/HISTORY b/fhem/HISTORY index 6b48e5844..1cb96fb54 100644 --- a/fhem/HISTORY +++ b/fhem/HISTORY @@ -124,3 +124,6 @@ - WS300 Loglevel changed for KS300 device (from 2 to GetLogLevel or 5) - First version of the FritzBox port: - Perl binary/ftdi_sio module + - EM: added setTime, reset + - docs/fritzbox.html. Note: The fb_fhem_0.1.tar.gz won't be part of CVS + as it contains largee binaries (swapfile, perl mipsel executable, etc). diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html index 291fc0914..961ad3cde 100644 --- a/fhem/docs/fhem.html +++ b/fhem/docs/fhem.html @@ -14,8 +14,24 @@ GPL'd server to access devices like FHZ1000/FHZ1300,EM1010PC,WS300,SCIVT. Formerly known as fhz1000.pl

News (as of =DATE=, Version =VERS=)

- @@ -69,8 +85,12 @@ description and faq.html for the F.A.Q. http://groups.google.com/group/FHZ1000-users-on-unix
Martins Web frontend (webpgm3): http://www.martin-haas.de/fhz
- fhz1000 on Nas/Routers: + Instructions for Nas/Routers (NSLU2): + http://www.martin-haas.de/fhz/nslu2fhz
+ Instructions for the Fritz!Box: + + http://www.koeniglich.de/fhem/fritzbox.html
CVS@berlios: http://developer.berlios.de/projects/fhem
diff --git a/fhem/docs/fritzbox.html b/fhem/docs/fritzbox.html new file mode 100644 index 000000000..71fa26f69 --- /dev/null +++ b/fhem/docs/fritzbox.html @@ -0,0 +1,109 @@ + + + + +Home of FHEM + + + + + +

FHEM on the Fritz!Box

+ +

Description

+ + +

Howto

+ + +

Compile tips

+ + +

Links

+