diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index 561638f3c..d6042c874 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -148,6 +148,7 @@ CUL_Initialize($) hmId maxid longids hmProtocolEvents:0_off,1_dump,2_dumpFull,3_dumpTrigger model:CUL,CUN,CUNO,SCC,nanoCUL + noRawReadLog:1,0 rfmode:SlowRF,HomeMatic,MAX,WMBus_T,WMBus_S,WMBus_C,KOPP_FC sendpool showtime:1,0 @@ -549,6 +550,7 @@ CUL_ReadAnswer($$$$) $mculdata = $hash->{PARTIAL} if(defined($hash->{PARTIAL})); $to = $ohash->{RA_Timeout} if($ohash->{RA_Timeout}); # ...or less + my $name = $ohash->{NAME}; for(;;) { if($^O =~ m/Win/ && $hash->{USBDev}) { @@ -568,7 +570,7 @@ CUL_ReadAnswer($$$$) next if ($! == EAGAIN() || $! == EINTR() || $! == 0); my $err = $!; DevIo_Disconnected($hash); - return("CUL_ReadAnswer $arg: $err", undef); + return("CUL_ReadAnswer $name $arg: $err", undef); } return ("Timeout reading answer for get $arg", undef) if($nfound == 0); @@ -578,7 +580,7 @@ CUL_ReadAnswer($$$$) } if(defined($buf)) { - Log3 $ohash->{NAME}, 5, "CUL/RAW (ReadAnswer): $buf"; + Log3 $name, 5, "CUL_ReadAnswer $name: $buf" if(!$hash->{".noRawReadLog"}); $mculdata .= $buf; } @@ -590,7 +592,7 @@ CUL_ReadAnswer($$$$) (undef, $line) = CUL_prefix(0, $ohash, $line); # Delete prefix if($regexp && $line !~ m/$regexp/) { $line =~ s/[\n\r]+//g; - CUL_Parse($ohash, $hash, $ohash->{NAME}, $line) if($init_done); + CUL_Parse($ohash, $hash, $name, $line) if($init_done); $mculdata = $hash->{PARTIAL}; } else { return (undef, $line); @@ -822,7 +824,7 @@ CUL_Read($) my $name = $hash->{NAME}; my $culdata = $hash->{PARTIAL}; - Log3 $name, 5, "CUL/RAW: $culdata/$buf"; + Log3 $name, 5, "CUL_Read: $name $culdata/$buf" if(!$hash->{".noRawReadLog"}); $culdata .= $buf; while($culdata =~ m/\n/) { @@ -1001,8 +1003,6 @@ CUL_Attr(@) my $hash = $defs{$name}; if($aName eq "rfmode") { - - $aVal = "SlowRF" if(!$aVal || ($aVal ne "HomeMatic" && $aVal ne "MAX" @@ -1112,6 +1112,13 @@ CUL_Attr(@) } elsif($aName eq "connectCommand"){ CUL_SimpleWrite($hash, $aVal) if($cmd eq "set"); + } elsif($aName eq "noRawReadLog"){ + if($cmd eq "set" && $aVal) { + $hash->{".noRawReadLog"} = 1 + } else { + delete($hash->{".noRawReadLog"}); + } + } return undef; @@ -1136,7 +1143,7 @@ CUL_prefix($$$) =item summary_DE Anbindung von Geraeten mit dem culfw Firmware, z.Bsp. Busware CUL =begin html - +

CUL

- + Get - + Attributes
-
  • longids
    + +
  • longids
    Comma separated list of device-types for CUL that should be handled using long IDs. This additional ID allows it to differentiate some weather sensors, if they are sending on the same channel. @@ -1372,8 +1398,16 @@ CUL_prefix($$$)

    • -
  • model (CUL,CUN,etc)
    • -
  • sendpool
    +
  • model (CUL,CUN,etc)

    • + + +
  • noRawReadLog
    + Do not log RAW read events at verbose 5, as sometimes makes this the + log unreadable (Forum #122160). +

    • + + +
  • sendpool
    If using more than one CUL for covering a large area, sending different events by the different CUL's might disturb each other. This phenomenon is also known as the Palm-Beach-Resort effect. @@ -1384,7 +1418,8 @@ CUL_prefix($$$) attr CUN2 sendpool CUN1,CUN2,CUN3
    attr CUN3 sendpool CUN1,CUN2,CUN3

    • -
  • rfmode
    + +
  • rfmode
    Configure the RF Transceiver of the CUL (the CC1101). Available arguments are: