diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index 0dbe83792..7e7126403 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -933,7 +933,8 @@ CUL_SimpleWrite(@) syswrite($hash->{TCPDev}, $msg) if($hash->{TCPDev}); syswrite($hash->{DIODev}, $msg) if($hash->{DIODev}); - select(undef, undef, undef, 0.001); + # Some linux installations are broken with 0.001, T01 returns no answer + select(undef, undef, undef, 0.01); } sub diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index ab5c80a2c..21d78e5fd 100755 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -1,10 +1,10 @@ ############################################## # $Id: 00_ZWDongle.pm 1721 2012-07-11 14:48:24Z rudolfkoenig $ # TODO: +# - routing commands # - one command to create a fhem device for all nodeList entries # - inclusion mode active only for a given time (pairForSec) # - use central readings functions -# - add usbscan package main; use strict; @@ -406,7 +406,6 @@ ZWDongle_Read($@) my $ll5 = GetLogLevel($name,5); $buf = unpack('H*', $buf); - # The dongle looses data over USB for some commands(?), and dropping the old # buffer after a timeout is my only idea of solving this problem. my $ts = gettimeofday(); diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 75a0d769e..e0c8e5de4 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -1,12 +1,14 @@ ############################################## # See ZWDongle.pm for inspiration # TODO +# - versioned commands # - use central readings functions # - Generate MISSING ACK # - implement (global?) on-for-timer # - better autocreate integration # - get support in FHEMWEB # - class meter: get +# - class SWITCH_ALL package main; use strict; diff --git a/fhem/FHEM/95_PachLog.pm b/fhem/FHEM/95_PachLog.pm index 4186b5d76..1aa65b365 100644 --- a/fhem/FHEM/95_PachLog.pm +++ b/fhem/FHEM/95_PachLog.pm @@ -73,6 +73,7 @@ sub PachLog_Define($@) my($package, $filename, $line, $subroutine) = caller(3); # Log 0 , "PachLog_Define => $package: $filename LINE: $line SUB: $subroutine \n"; Log 5, Dumper(@_) . "\n"; + Log 1, "Got: ". join(",", @a); return "Unknown argument count " . int(@a) . " , usage set dataset value or set delete dataset" if(int(@a) != 1); return undef; diff --git a/fhem/FHEM/99_XmlList.pm b/fhem/FHEM/99_XmlList.pm index 35cfbc849..02686d21f 100644 --- a/fhem/FHEM/99_XmlList.pm +++ b/fhem/FHEM/99_XmlList.pm @@ -45,13 +45,19 @@ CommandXmlList($$) my ($cl, $param) = @_; my $str = "\n"; my $lt = ""; + my %filter; + + if($param) { + my @arr = devspec2array($param); + map { $filter{$_} = 1 } @arr; + } + delete($modules{""}) if(defined($modules{""})); # ??? - delete($modules{""}) if(defined($modules{""})); for my $d (sort { my $x = $modules{$defs{$a}{TYPE}}{ORDER}.$defs{$a}{TYPE} cmp $modules{$defs{$b}{TYPE}}{ORDER}.$defs{$b}{TYPE}; $x = ($a cmp $b) if($x == 0); $x; } keys %defs) { - next if(IsIgnored($d)); + next if(IsIgnored($d) || (%filter && !$filter{$d})); my $p = $defs{$d}; my $t = $p->{TYPE}; if($t ne $lt) {