diff --git a/fhem/CHANGED b/fhem/CHANGED index 6a7036745..d1b1c7136 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -381,6 +381,9 @@ - feature: global attr allowfrom, as wished by Holger (8.1.2008) - feature: FHT: multiple commands, softbuffer changes, cmd rename, doc - feature: EM1010PC: automatic reset + - feature: contrib/00_LIRC.pm (25.3, by Bernhard) + - bugfix : 00_FHZ: additional stty settings for strange Linux versions + - bugfix : pgm2 wrong temp summary for FHT's (reported by O.D., 16.4.2008) - TODO emem -2.5kW / getDevData for emwz -1 diff --git a/fhem/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm index fe6cdb526..612c5bfdc 100755 --- a/fhem/FHEM/00_FHZ.pm +++ b/fhem/FHEM/00_FHZ.pm @@ -245,6 +245,14 @@ FHZ_Define($$) $po->stty_echok(0); $po->stty_echoctl(0); + # Needed for some strange distros + $po->stty_echo(0); + $po->stty_icanon(0); + $po->stty_isig(0); + $po->stty_opost(0); + $po->stty_icrnl(0); + + $hash->{PortObj} = $po; $hash->{FD} = $po->FILENO; $hash->{DeviceName} = $dev; diff --git a/fhem/FHEM/60_EM.pm b/fhem/FHEM/60_EM.pm index a9318be2d..9be1696dd 100755 --- a/fhem/FHEM/60_EM.pm +++ b/fhem/FHEM/60_EM.pm @@ -121,7 +121,7 @@ EM_Set($@) my $d = EmGetData($name, "4545"); # Reset return "Read error" if(!defined($d)); - sleep(5); + sleep(10); EM_Set($hash, ($a[0], "time")); # Set the time sleep(1); $d = EmGetData($name, "67"); # "Push the button", we don't want usesr interaction diff --git a/fhem/FHEM/98_dummy.pm b/fhem/FHEM/98_dummy.pm index 63df8727f..e3e9b037d 100644 --- a/fhem/FHEM/98_dummy.pm +++ b/fhem/FHEM/98_dummy.pm @@ -20,6 +20,8 @@ dummy_Set($@) my ($hash, @a) = @_; return "no set value specified" if(int(@a) != 2); + return "Unknown argument $a[1], choose one of *" if($a[1] eq "?"); + my $v = $a[1]; $hash->{CHANGED}[0] = $v; $hash->{STATE} = $v; diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html index 4194b7ebd..9b3abdd2a 100644 --- a/fhem/docs/fhem.html +++ b/fhem/docs/fhem.html @@ -97,6 +97,7 @@ 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
+ Another Martins Web frontend (myHCE): http://www.fischer-net.de/projekte/haustechnik/myhce.html
CVS@berlios: http://developer.berlios.de/projects/fhem
LinViex (home automation frontend): diff --git a/fhem/fhem.pl b/fhem/fhem.pl index a31638021..9efb52f49 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -138,7 +138,7 @@ my %intAt; # Internal at timer hash. my $intAtCnt=0; my $reread_active = 0; my $AttrList = "room comment"; -my $cvsid = '$Id: fhem.pl,v 1.38 2008-01-19 19:02:30 rudolfkoenig Exp $'; +my $cvsid = '$Id: fhem.pl,v 1.39 2008-04-16 16:26:25 rudolfkoenig Exp $'; $init_done = 0; @@ -191,7 +191,7 @@ my %cmds = ( "shutdown"=> { Fn=>"CommandShutdown", Hlp=>",terminate the server" }, "sleep" => { Fn=>"CommandSleep", - Hlp=>",sleep for sec, 3 decimal places are interpreted" }, + Hlp=>",sleep for sec, 3 decimal places" }, "trigger" => { Fn=>"CommandTrigger", Hlp=>" ,trigger notify command" }, "xmllist" => { Fn=>"CommandXmlList", @@ -1178,6 +1178,7 @@ CommandXmlList($$) my $str = "\n"; my $lt = ""; + delete($modules{""}) if(defined($modules{""})); for my $d (sort { my $x = $modules{$defs{$a}{TYPE}}{ORDER} cmp $modules{$defs{$b}{TYPE}}{ORDER}; $x = ($a cmp $b) if($x == 0); $x; } keys %defs) { diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm index 08f9ae387..132bfbe7b 100755 --- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm +++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm @@ -235,6 +235,8 @@ FHEMWEB_AnswerCall($) open(FH, "$FHEMWEB_absicondir$1") || return; pO join("", ); close(FH); + } else { + Log 5, "Unknown document $arg requested"; } return; } @@ -657,7 +659,9 @@ FHEMWEB_showRoom() } elsif($type eq "FHT") { - $v =~ s/^[^0-9]*([.0-9]+).*$/$1/g; + $v = $__devs{$d}{STATE}{"measured-temp"}{VAL}; + + $v =~ s/ .*//; pO "$d"; pO "$v°";