diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 46cbb6095..d0df89c5a 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1039,17 +1039,27 @@ sub CUL_HM_Parse($$) {######################################################### )){ my $ioId = AttrVal($dstH->{IODev}{NAME},"hmId","-"); if($ioId ne $src){ + if ( !defined $dstH->{"prot"."ErrIoId_$src"} + && ReadingsVal($dname,"sabotageAttackId_ErrIoId_$src:",undef)){ + (undef,$dstH->{"prot"."ErrIoId_$src"}) = + split(":",ReadingsVal($dname,"sabotageAttackId_ErrIoId_$src:",undef)); + } CUL_HM_eventP($dstH,"ErrIoId_$src"); my ($evntCnt,undef) = split(' last_at:',$dstH->{"prot"."ErrIoId_$src"},2); - push @evtEt,[$dstH,1,"sabotageAttackId:ErrIoId_$src cnt:$evntCnt"]; + push @evtEt,[$dstH,1,"sabotageAttackId_ErrIoId_$src: cnt:$evntCnt"]; } my $tm = substr($msg,8); if( defined $dstH->{helper}{cSnd} && $dstH->{helper}{cSnd} !~ m/$tm/){ + if ( !defined $dstH->{"prot"."ErrIoAttack"} + && ReadingsVal($dname,"sabotageAttack_ErrIoAttack cnt:",undef)){ + $dstH->{"prot"."ErrIoAttack"} = + ReadingsVal($dname,"sabotageAttack_ErrIoAttack cnt:",undef); + } Log3 $dname,2,"CUL_HM $dname attack:$dstH->{helper}{cSnd}:".$tm; CUL_HM_eventP($dstH,"ErrIoAttack"); my ($evntCnt,undef) = split(' last_at:',$dstH->{"prot"."ErrIoAttack"},2); - push @evtEt,[$dstH,1,"sabotageAttack:ErrIoAttack cnt:$evntCnt"]; + push @evtEt,[$dstH,1,"sabotageAttack_ErrIoAttack cnt:$evntCnt"]; } } ########### diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index cd5279af7..2f9f01b3a 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -535,7 +535,8 @@ sub HMinfo_paramCheck(@) { #################################################### elsif (AttrVal($eName,"aesCommReq",0) && $IoDev->{TYPE} ne "HMLAN") { push @aesInval,"$eName ";} - if (!$defs{$eName}{helper}{role}{vrt}){ + if ( !$defs{$eName}{helper}{role}{vrt} + && AttrVal($eName,"model","") ne "CCU-FHEM"){ if ($pairId eq "undefined") { push @noID,$eName;} elsif ($pairId !~ m /$ioHmId/ && $IoDev ) { push @idMismatch,"$eName paired:$pairId IO attr: ${ioHmId}.";} diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 9b5ae9d6c..9e0bb5a0a 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -811,7 +811,7 @@ my $K_actDetID = '000000'; # id of actionDetector ,sensRain =>{ transmDevTryMax =>1,localResDis =>1} ,tipTronic =>{ cyclicInfoMsg =>1,cyclicInfoMsgDis=>1,localResDis =>1,RS485IdleTime =>1} ,powerMeter =>{ intKeyVisib =>1,localResDis =>1} - ,outputUnit =>{ intKeyVisib =>1} + ,outputUnit =>{ intKeyVisib =>1,sign =>1} ,powerSensor =>{ transmitTryMax =>1,transmDevTryMax =>1 ,mtrType =>1,mtrConstIr =>1,mtrConstGas =>1,mtrConstLed =>1 ,mtrSensIr =>1