diff --git a/fhem/CHANGED b/fhem/CHANGED index 225bdb0eb..f49b7085c 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,8 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugix: 14_Hideki: fixed wrong return in ParseFn (msg533900) + 14_SD_WS: fixed wrong return in ParseFn (msg533900) + 90_SIGNALduino_un: fixed wrong return in ParseFn (msg533900) - change: 93_DbRep: change of day aggregation - bugfix: 93_DbRep: Syntaxerror due to Forum #msg529312 - bugfix: 74_AMAD: 74_AMADautomagicFlowset_2.6.7.xml fix Problems with zero diff --git a/fhem/FHEM/14_Hideki.pm b/fhem/FHEM/14_Hideki.pm index 183188681..c594c54a5 100644 --- a/fhem/FHEM/14_Hideki.pm +++ b/fhem/FHEM/14_Hideki.pm @@ -124,7 +124,7 @@ Hideki_Parse($$) } else{ Log3 $iohash, 4, "$name Sensor Typ $sensorTyp not supported, please report sensor information!"; - return "$name Sensor Typ $sensorTyp not supported, please report sensor information!"; + return ""; } my $longids = AttrVal($iohash->{NAME},'longids',0); if ( ($longids ne "0") && ($longids eq "1" || $longids eq "ALL" || (",$longids," =~ m/,$model,/))) diff --git a/fhem/FHEM/14_SD_WS.pm b/fhem/FHEM/14_SD_WS.pm index aff34c95e..218e61dfc 100644 --- a/fhem/FHEM/14_SD_WS.pm +++ b/fhem/FHEM/14_SD_WS.pm @@ -175,8 +175,8 @@ sub SD_WS_Parse($$) $SensorTyp=$decodingSubs{$protocol}{sensortype}; - return "Prematch Error" && Log3 $iohash, 4, "$name decoded protocolid: $protocol ($SensorTyp) prematch error" if (!$decodingSubs{$protocol}{prematch}->( $rawData )); - return "crc Error" && Log3 $iohash, 4, "$name decoded protocolid: $protocol ($SensorTyp) crc error" if (!$decodingSubs{$protocol}{crcok}->( $rawData )); + return "" && Log3 $iohash, 4, "$name decoded protocolid: $protocol ($SensorTyp) prematch error" if (!$decodingSubs{$protocol}{prematch}->( $rawData )); + return "" && Log3 $iohash, 4, "$name decoded protocolid: $protocol ($SensorTyp) crc error" if (!$decodingSubs{$protocol}{crcok}->( $rawData )); $id=$decodingSubs{$protocol}{id}->( $rawData,$bitData ); #my $temphex=$decodingSubs{$protocol}{temphex}->( $rawData,$bitData ); @@ -191,13 +191,13 @@ sub SD_WS_Parse($$) } else { - Log3 $iohash, 4, "SD_WS_Parse_unknown: converted to bits: $bitData"; - return $dummyreturnvalue; + Log3 $iohash, 4, "SD_WS_Parse: unknown message, please report. converted to bits: $bitData"; + return undef; } if (!defined($model)) { - return $dummyreturnvalue; + return undef; } my $deviceCode; diff --git a/fhem/FHEM/90_SIGNALduino_un.pm b/fhem/FHEM/90_SIGNALduino_un.pm index 6799e4ff8..23c3c3d98 100644 --- a/fhem/FHEM/90_SIGNALduino_un.pm +++ b/fhem/FHEM/90_SIGNALduino_un.pm @@ -308,11 +308,13 @@ SIGNALduino_un_Parse($$) } else { - return $dummyreturnvalue; + Log3 $hash, 4, $dummyreturnvalue; + + return undef; } - - return $dummyreturnvalue; # This prevents unkown code Messages in our log + Log3 $hash, 4, $dummyreturnvalue; + return undef; }