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=)
-
+ - doc: linux.html (private udev-rules, not 50-..., ATTRS)
+
- bugfix: setting devices with "-" in their name did not work
+
- doc: fhem.pl and commandref.html (notifyon -> notify, correction
+ of examples)
+
- feature: modify command added
+
- feature: The "-" in the name is not allowed any more
+
- bugfix: disabled notify causes "uninitialized value" (STefan, 1.5)
+
- bugfix: deleted FS20 items are still logging (zombie) (Gerhard, 16.5)
+
- bugfix: added FS20S8, removed stty_parmrk (Martin, 24.5)
+
- feature: added archivedir/archivecmd to the FileLog
+
- feature: added EM1010PC/EM1000WZ/EM1000EM support
+
- bugfix: undefined messages for unknown HMS devs (Peter, 8.6)
+
- bugfix: em1010 and %oldvalue bugs (Peter, 9.6)
+
- bugfix: SCIVT solar controller (peterp, 1.7)
+
- bugfix: WS300 loglevel change (from 2 to 5 or device specific loglevel)
+
- feature: First steps for a Fritz!Box port. See the fritzbox.html
+
@@ -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
+
+ This document describes how to install FHEM on the
+ fritzbox. The document and the port itself is in a very beginning stage.
+
+ What works:
+
+ - The basic fhem.pl server with at commands, notify, logging (tested)
+ - FHZ1000 and FHZ1300 (both tested)
+ - FS20, FHT and KS300-2 (tested)
+ - HMS (untested, but should work)
+
+
+
+ What does not work right now:
+
+ - Automatic startup after reboot of the fritzbox
+ - SunSet/SunRise modules (planning a lightweight alternative).
+ - HTML Frontend. Planning a webfrontend/pgm2 "fhem" module, as do not
+ know how to start CGI programs from the builtin web browser.
+
- Gnuplot. No idea how to replace it, perhaps we compile a fritzbox
+ version
+ - EM1010PC. I tried it without batteries, and I think the USB interface
+ cannot power an USB hub, an FHZ1300 and an EM1010PC together. The fritzbox
+ resets when trying to initialize the devices. More experiments needed.
+ - WS300PC. Untested, don't have one.
+
+
+
+Howto
+
+ Tested on the fritzbox 7170, with Firmware 29.04.33.
+ Note:The kernel modules are for kernel 2.16.13.1, and perl is compiled
+ for uCLibc 0.9.28.
+
+ Prerequisites:
+
+ - you need a fritzbox with an USB host port. Check your kernel version.
+ If it won't match the version above, see the "Compile tips" in this
+ document.
+ - an USB hub (a small passive one is enough).
+ - an FHZ1000 or FHZ1300
+ - an USB stick, at least 64MB. As the fritzbox is USB 1.1 only,
+ the slowest is fast enough.
+ - telnet access for the fritzbox. See the links on how to enable it.
+
- the complete fhem package from the links section.
+
+
+ Installation:
+
+ - Connect the USB stick to a PC, and unpack the content of the
+ fb_fhem_x.y.tar.gz in the root directory of the USB stick. You'll
+ get a perl 5.6.2 installation with just those modules wich are needed
+ by fhem, an empty 32MB swapfile with a swapon/swapoff command,
+ the fhem server with an empty configuration file, and an rc.fhem
+ script which should start everything.
+ - Connect the USB stick and the FHZ1x00 via the USB hub to the
+ fritzbox.
+ - Log in via telnet to the fritzbox.
+ - Change into the directory /var/media/ftp/*Partition*/usr/fhem .
+ - Execute the command rc.fhem.
+ - Now you can login from your PC to this fhem server via:
+
+ telnet fritz.box 7072
+
+ and configure it.
+
+
+
+Compile tips
+
+ Note: You don't need to compile anything if you have the correct
+ kernel and uclibc version.
+
+ I compiled the ftdi_sio module with the help of the ds26-15.1 packages, see
+ the links.
+ The ftdi_sio module had to be modified, as 2.16.13 does not contain the USB
+ ID's of the ELV devices.
+ Compiling a working perl for the fritzbox was a nightmare. After compiling
+ 5.8.8 I dicovered it has a strange bug: Appending numbers to strings won't
+ work on the fritzbox. This is why I compiled an "old" (5.6.2) one, which
+ seems to work perfectly.
+
+Links
+