From 45cd4c4aab1f2b64eeb9963e4f2b93b36160a964 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 8 Jun 2007 06:38:49 +0000 Subject: [PATCH] Undefined messages for unknown HMS devices git-svn-id: https://svn.fhem.de/fhem/trunk@71 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/00_FHZ.pm | 4 +++- fhem/fhem.pl | 2 +- fhem/test/fhem.save | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index ce0573c7b..0fb498c41 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -333,3 +333,4 @@ - 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) diff --git a/fhem/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm index ab19199b9..25282deee 100755 --- a/fhem/FHEM/00_FHZ.pm +++ b/fhem/FHEM/00_FHZ.pm @@ -528,6 +528,7 @@ FHZ_Read($) my @found; + my $last_module; foreach my $m (sort { $modules{$a}{ORDER} cmp $modules{$b}{ORDER} } keys %modules) { next if($iohash->{Clients} !~ m/:$m:/); @@ -535,6 +536,7 @@ FHZ_Read($) no strict "refs"; @found = &{$modules{$m}{ParseFn}}($hash,$dmsg); use strict "refs"; + $last_module = $m; last if(int(@found)); } if(!int(@found)) { @@ -547,7 +549,7 @@ FHZ_Read($) if($found[0] =~ m/^(UNDEFINED) ([^ ]*) (.*)$/) { my $d = $1; $defs{$d}{NAME} = $1; - $defs{$d}{TYPE} = $2; + $defs{$d}{TYPE} = $last_module; DoTrigger($d, "$2 $3"); delete $defs{$d}; goto NEXTMSG; diff --git a/fhem/fhem.pl b/fhem/fhem.pl index c31f2566a..d5d5507c6 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -186,7 +186,7 @@ my %cmds = ( "shutdown"=> { Fn=>"CommandShutdown", Hlp=>",terminate the server" }, "sleep" => { Fn=>"CommandSleep", - Hlp=>",sleep for usecs" }, + Hlp=>",sleep for sec, 3 decimal places are interpreted" }, "trigger" => { Fn=>"CommandTrigger", Hlp=>" ,trigger notify command" }, "xmllist" => { Fn=>"CommandXmlList", diff --git a/fhem/test/fhem.save b/fhem/test/fhem.save index 56969b2ff..4507b5003 100644 --- a/fhem/test/fhem.save +++ b/fhem/test/fhem.save @@ -1,4 +1,4 @@ -#Sun May 27 13:57:55 2007 +#Fri Jun 8 08:37:17 2007 setstate FHZ fhtbuf: 1c setstate FHZ 2006-02-12 14:03:39 fhtbuf 23 setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe