FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-15 22:26:04 +00:00
Code Issues Releases Wiki Activity

HMConfig: add sign to OU

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8766 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-06-17 18:38:36 +00:00
parent bbb4f02191
commit c046317730
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/10_CUL_HM.pm
View File

@ -1039,17 +1039,27 @@ sub CUL_HM_Parse($$) {#########################################################
)){ )){
my $ioId = AttrVal($dstH->{IODev}{NAME},"hmId","-"); my $ioId = AttrVal($dstH->{IODev}{NAME},"hmId","-");
if($ioId ne $src){ 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"); CUL_HM_eventP($dstH,"ErrIoId_$src");
my ($evntCnt,undef) = split(' last_at:',$dstH->{"prot"."ErrIoId_$src"},2); 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); my $tm = substr($msg,8);
if( defined $dstH->{helper}{cSnd} && if( defined $dstH->{helper}{cSnd} &&
$dstH->{helper}{cSnd} !~ m/$tm/){ $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; Log3 $dname,2,"CUL_HM $dname attack:$dstH->{helper}{cSnd}:".$tm;
CUL_HM_eventP($dstH,"ErrIoAttack"); CUL_HM_eventP($dstH,"ErrIoAttack");
my ($evntCnt,undef) = split(' last_at:',$dstH->{"prot"."ErrIoAttack"},2); 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"];
} }
} }
########### ###########

3
fhem/FHEM/98_HMinfo.pm
View File

@ -535,7 +535,8 @@ sub HMinfo_paramCheck(@) { ####################################################
elsif (AttrVal($eName,"aesCommReq",0) && $IoDev->{TYPE} ne "HMLAN") elsif (AttrVal($eName,"aesCommReq",0) && $IoDev->{TYPE} ne "HMLAN")
{ push @aesInval,"$eName ";} { 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;} if ($pairId eq "undefined") { push @noID,$eName;}
elsif ($pairId !~ m /$ioHmId/ elsif ($pairId !~ m /$ioHmId/
&& $IoDev ) { push @idMismatch,"$eName paired:$pairId IO attr: ${ioHmId}.";} && $IoDev ) { push @idMismatch,"$eName paired:$pairId IO attr: ${ioHmId}.";}

2
fhem/FHEM/HMConfig.pm
View File

@ -811,7 +811,7 @@ my $K_actDetID = '000000'; # id of actionDetector
,sensRain =>{ transmDevTryMax =>1,localResDis =>1} ,sensRain =>{ transmDevTryMax =>1,localResDis =>1}
,tipTronic =>{ cyclicInfoMsg =>1,cyclicInfoMsgDis=>1,localResDis =>1,RS485IdleTime =>1} ,tipTronic =>{ cyclicInfoMsg =>1,cyclicInfoMsgDis=>1,localResDis =>1,RS485IdleTime =>1}
,powerMeter =>{ intKeyVisib =>1,localResDis =>1} ,powerMeter =>{ intKeyVisib =>1,localResDis =>1}
,outputUnit =>{ intKeyVisib =>1} ,outputUnit =>{ intKeyVisib =>1,sign =>1}
,powerSensor =>{ transmitTryMax =>1,transmDevTryMax =>1 ,powerSensor =>{ transmitTryMax =>1,transmDevTryMax =>1
,mtrType =>1,mtrConstIr =>1,mtrConstGas =>1,mtrConstLed =>1 ,mtrType =>1,mtrConstIr =>1,mtrConstGas =>1,mtrConstLed =>1
,mtrSensIr =>1 ,mtrSensIr =>1